From 8907534a9186b214f6f789ee0327bce4b858d1ae Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 10 Jun 2014 13:29:24 -0500 Subject: Fix rsrc section alignment --- cygwin-binutils.spec | 22 +++++++++++++++------- ld-parallel-make.patch | 30 ------------------------------ sources | 2 +- w32api-sysroot.patch | 10 +++++----- 4 files changed, 21 insertions(+), 43 deletions(-) delete mode 100644 ld-parallel-make.patch diff --git a/cygwin-binutils.spec b/cygwin-binutils.spec index 4eb52b8..1a83615 100644 --- a/cygwin-binutils.spec +++ b/cygwin-binutils.spec @@ -1,18 +1,22 @@ +#%%global cygrev 3 %global run_testsuite 0 Name: cygwin-binutils Version: 2.24.51 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cross-compiled version of binutils for Cygwin environments License: GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+ Group: Development/Libraries URL: http://www.gnu.org/software/binutils/ -Source0: ftp://ftp.cygwin.com/pub/cygwin/x86_64/release/binutils/binutils-%{version}-2-src.tar.xz +%if 0%{?cygrev} +Source0: ftp://ftp.cygwin.com/pub/cygwin/x86_64/release/binutils/binutils-%{version}-%{cygrev}-src.tar.xz +%else +Source0: binutils-gdb-%{version}.tar.bz2 +%endif Patch0: w32api-sysroot.patch Patch1: binutils-textdomain.patch -Patch2: ld-parallel-make.patch BuildRequires: flex @@ -60,10 +64,13 @@ understand Cygwin executables and DLLs. %prep -%setup -q -n binutils-%{version}-2 +%if 0%{?cygrev} +%setup -q -n binutils-%{version}-%{cygrev} +%else +%setup -q -n binutils-gdb +%endif %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build @@ -234,7 +241,6 @@ cat cygwin-opcodes.lang >> cygwin-binutils.lang %{_prefix}/%{cygwin32_target}/bin/objdump %{_prefix}/%{cygwin32_target}/bin/ranlib %{_prefix}/%{cygwin32_target}/bin/strip -%{_prefix}/%{cygwin32_target}/lib/default-manifest.o %{_prefix}/%{cygwin32_target}/lib/ldscripts %files -n cygwin64-binutils @@ -268,11 +274,13 @@ cat cygwin-opcodes.lang >> cygwin-binutils.lang %{_prefix}/%{cygwin64_target}/bin/objdump %{_prefix}/%{cygwin64_target}/bin/ranlib %{_prefix}/%{cygwin64_target}/bin/strip -%{_prefix}/%{cygwin64_target}/lib/default-manifest.o %{_prefix}/%{cygwin64_target}/lib/ldscripts %changelog +* Tue Jun 10 2014 Yaakov Selkowitz - 2.24.51-2 +- Updated snapshot to fix resource section alignment. + * Wed Mar 26 2014 Yaakov Selkowitz - 2.24.51-1 - Updated snapshot with default manifest support. - Enable NLS. diff --git a/ld-parallel-make.patch b/ld-parallel-make.patch deleted file mode 100644 index 6eff1f9..0000000 --- a/ld-parallel-make.patch +++ /dev/null @@ -1,30 +0,0 @@ -For cygwin|mingw*, WINDRES_FOR_TARGET must exist before trying to build -default-manifest.o. - ---- a/Makefile.def -+++ b/Makefile.def -@@ -418,6 +418,7 @@ - dependencies = { module=all-ld; on=all-build-flex; }; - dependencies = { module=all-ld; on=all-intl; }; - dependencies = { module=all-ld; on=all-gas; }; -+dependencies = { module=all-ld; on=all-binutils; }; - dependencies = { module=install-ld; on=install-gold; }; - dependencies = { module=install-strip-ld; on=install-strip-gold; }; - dependencies = { module=configure-gold; on=configure-intl; }; ---- a/Makefile.in -+++ b/Makefile.in -@@ -47022,6 +47022,14 @@ - all-stage4-ld: maybe-all-stage4-gas - all-stageprofile-ld: maybe-all-stageprofile-gas - all-stagefeedback-ld: maybe-all-stagefeedback-gas -+all-ld: maybe-all-binutils -+ -+all-stage1-ld: maybe-all-stage1-binutils -+all-stage2-ld: maybe-all-stage2-binutils -+all-stage3-ld: maybe-all-stage3-binutils -+all-stage4-ld: maybe-all-stage4-binutils -+all-stageprofile-ld: maybe-all-stageprofile-binutils -+all-stagefeedback-ld: maybe-all-stagefeedback-binutils - install-ld: maybe-install-gold - install-strip-ld: maybe-install-strip-gold - configure-gold: maybe-configure-intl diff --git a/sources b/sources index 59cfde9..dfd7c11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7f198636895e8e17489fc7d86342f148 binutils-2.24.51-2-src.tar.xz +8d88c2cb19cdf45a7136b3c183ef5e94 binutils-gdb-2.24.51.tar.bz2 diff --git a/w32api-sysroot.patch b/w32api-sysroot.patch index 3b9a121..cdf8d3c 100644 --- a/w32api-sysroot.patch +++ b/w32api-sysroot.patch @@ -1,20 +1,20 @@ --- a/ld/configure.tgt +++ b/ld/configure.tgt -@@ -310,7 +310,7 @@ i[3-7]86-*-pe) targ_emul=i386pe ; +@@ -263,7 +263,7 @@ i[3-7]86-*-pe) targ_emul=i386pe ; + targ_extra_ofiles="deffilep.o pe-dll.o" ;; i[3-7]86-*-cygwin*) targ_emul=i386pe ; - targ_extra_binaries="default-manifest.o" ; targ_extra_ofiles="deffilep.o pe-dll.o" ; - test "$targ" != "$host" && LIB_PATH='${tooldir}/lib/w32api' ;; + test "$targ" != "$host" && LIB_PATH='${tooldir}/lib/w32api:=/usr/lib/w32api' ;; i[3-7]86-*-mingw32*) targ_emul=i386pe ; - targ_extra_binaries="default-manifest.o" ; 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_binaries="default-manifest.o" ; 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_binaries="default-manifest.o" ; + targ_extra_ofiles="deffilep.o pep-dll.o pe-dll.o" ;; -- cgit