summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYaakov Selkowitz <yselkowitz@users.sourceforge.net>2013-03-28 01:52:59 -0500
committerYaakov Selkowitz <yselkowitz@users.sourceforge.net>2013-03-28 01:52:59 -0500
commit359f102527ac8a682a8b811b2938ac942fae3d04 (patch)
tree6ce8bb1902ecd63653e186d1f0f5b5dafcefcc48
parent46c6a6b6868f9577c41a558ef7366416949e4043 (diff)
downloadcygwin-binutils-359f102527ac8a682a8b811b2938ac942fae3d04.tar.gz
cygwin-binutils-359f102527ac8a682a8b811b2938ac942fae3d04.tar.xz
cygwin-binutils-359f102527ac8a682a8b811b2938ac942fae3d04.zip
Fix w32api sysroot patch for 64bit BFD
-rw-r--r--cygwin-binutils.spec6
-rw-r--r--w32api-sysroot.patch9
2 files changed, 14 insertions, 1 deletions
diff --git a/cygwin-binutils.spec b/cygwin-binutils.spec
index bcc32f3..4899ede 100644
--- a/cygwin-binutils.spec
+++ b/cygwin-binutils.spec
@@ -2,7 +2,7 @@
Name: cygwin-binutils
Version: 2.23.51
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Cygwin binutils
License: GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+
@@ -39,6 +39,7 @@ CFLAGS="$RPM_OPT_FLAGS" \
../configure \
--build=%_build --host=%_host \
--target=%{_cygwin_target} \
+ --enable-64-bit-bfd \
--enable-targets=x86_64-pc-cygwin \
--verbose --disable-nls \
--without-included-gettext \
@@ -76,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Mar 28 2013 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - 2.23.51-2
+- Fix w32api sysroot patch for 64bit BFD support.
+
* Sun Mar 10 2013 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - 2.23.51-1
- Version bump.
- Enable pei-x86-64 support so i686 tools can work properly on cyglsa64.dll.
diff --git a/w32api-sysroot.patch b/w32api-sysroot.patch
index a8373c9..815da79 100644
--- a/w32api-sysroot.patch
+++ b/w32api-sysroot.patch
@@ -9,3 +9,12 @@
i[3-7]86-*-mingw32*) targ_emul=i386pe ;
targ_extra_ofiles="deffilep.o pe-dll.o" ;;
x86_64-*-pe | x86_64-*-pep) targ_emul=i386pep ;
+@@ -319,7 +319,7 @@ x86_64-*-pe | x86_64-*-pep) targ_emul=i3
+ x86_64-*-cygwin) targ_emul=i386pep ;
+ targ_extra_emuls=i386pe
+ targ_extra_ofiles="deffilep.o pep-dll.o pe-dll.o"
+- test "$targ" != "$host" && LIB_PATH='${tooldir}/lib/w32api' ;;
++ test "$targ" != "$host" && LIB_PATH='${tooldir}/lib/w32api:=/usr/lib/w32api' ;;
+ x86_64-*-mingw*) targ_emul=i386pep ;
+ targ_extra_emuls=i386pe
+ targ_extra_ofiles="deffilep.o pep-dll.o pe-dll.o" ;;