diff options
-rw-r--r-- | binutils-textdomain.patch | 66 | ||||
-rw-r--r-- | cygwin-binutils.spec | 54 | ||||
-rw-r--r-- | ld-parallel-make.patch | 30 | ||||
-rw-r--r-- | sources | 2 | ||||
-rw-r--r-- | w32api-sysroot.patch | 12 | ||||
-rw-r--r-- | x86-64-pc32-relocs.patch | 51 |
6 files changed, 144 insertions, 71 deletions
diff --git a/binutils-textdomain.patch b/binutils-textdomain.patch new file mode 100644 index 0000000..26268b3 --- /dev/null +++ b/binutils-textdomain.patch @@ -0,0 +1,66 @@ +--- a/bfd/configure ++++ b/bfd/configure +@@ -3987,7 +3987,7 @@ fi + + + # Define the identity of the package. +- PACKAGE='bfd' ++ PACKAGE='cygwin-bfd' + VERSION='2.24.51' + + +--- a/binutils/configure 2011-06-27 02:39:09.000000000 -0500 ++++ b/binutils/configure 2013-11-15 01:12:39.388101400 -0600 +@@ -3732,7 +3732,7 @@ fi + + + # Define the identity of the package. +- PACKAGE=binutils ++ PACKAGE=cygwin-binutils + VERSION=${BFD_VERSION} + + +--- a/gas/configure 2010-11-05 05:33:36.000000000 -0500 ++++ b/gas/configure 2013-11-15 01:12:49.186661900 -0600 +@@ -3721,7 +3721,7 @@ fi + + + # Define the identity of the package. +- PACKAGE=gas ++ PACKAGE=cygwin-gas + VERSION=${BFD_VERSION} + + +--- a/gprof/configure 2010-11-05 05:34:01.000000000 -0500 ++++ b/gprof/configure 2013-11-15 01:13:14.459107400 -0600 +@@ -3647,7 +3647,7 @@ fi + + + # Define the identity of the package. +- PACKAGE=gprof ++ PACKAGE=cygwin-gprof + VERSION=${BFD_VERSION} + + +--- a/ld/configure 2011-03-16 03:37:31.000000000 -0500 ++++ b/ld/configure 2013-11-15 01:13:20.435449200 -0600 +@@ -4049,7 +4049,7 @@ fi + + + # Define the identity of the package. +- PACKAGE=ld ++ PACKAGE=cygwin-ld + VERSION=${BFD_VERSION} + + +--- a/opcodes/configure 2010-11-05 05:32:32.000000000 -0500 ++++ b/opcodes/configure 2013-11-15 01:13:27.740867100 -0600 +@@ -3716,7 +3716,7 @@ fi + + + # Define the identity of the package. +- PACKAGE=opcodes ++ PACKAGE=cygwin-opcodes + VERSION=${BFD_VERSION} + + diff --git a/cygwin-binutils.spec b/cygwin-binutils.spec index 81de125..4eb52b8 100644 --- a/cygwin-binutils.spec +++ b/cygwin-binutils.spec @@ -1,7 +1,7 @@ %global run_testsuite 0 Name: cygwin-binutils -Version: 2.23.52 +Version: 2.24.51 Release: 1%{?dist} Summary: Cross-compiled version of binutils for Cygwin environments @@ -9,9 +9,10 @@ License: GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+ Group: Development/Libraries URL: http://www.gnu.org/software/binutils/ -Source0: ftp://sourceware.org/pub/binutils/snapshots/binutils-%{version}.tar.bz2 +Source0: ftp://ftp.cygwin.com/pub/cygwin/x86_64/release/binutils/binutils-%{version}-2-src.tar.xz Patch0: w32api-sysroot.patch -Patch1: x86-64-pc32-relocs.patch +Patch1: binutils-textdomain.patch +Patch2: ld-parallel-make.patch BuildRequires: flex @@ -59,9 +60,10 @@ understand Cygwin executables and DLLs. %prep -%setup -q -n binutils-%{version} +%setup -q -n binutils-%{version}-2 %patch0 -p1 -%patch1 -p0 +%patch1 -p1 +%patch2 -p1 %build @@ -71,14 +73,17 @@ CFLAGS="$RPM_OPT_FLAGS" \ ../configure \ --build=%_build --host=%_host \ --target=%{cygwin32_target} \ - --disable-nls \ --with-sysroot=%{cygwin32_sysroot} \ --prefix=%{_prefix} \ --bindir=%{_bindir} \ --includedir=%{_includedir} \ --libdir=%{_libdir} \ --mandir=%{_mandir} \ - --infodir=%{_infodir} + --infodir=%{_infodir} \ + --disable-gdb \ + --disable-libdecnumber \ + --disable-readline \ + --disable-sim make all %{?_smp_mflags} popd @@ -89,14 +94,17 @@ CFLAGS="$RPM_OPT_FLAGS" \ ../configure \ --build=%_build --host=%_host \ --target=%{cygwin64_target} \ - --disable-nls \ --with-sysroot=%{cygwin64_sysroot} \ --prefix=%{_prefix} \ --bindir=%{_bindir} \ --includedir=%{_includedir} \ --libdir=%{_libdir} \ --mandir=%{_mandir} \ - --infodir=%{_infodir} + --infodir=%{_infodir} \ + --disable-gdb \ + --disable-libdecnumber \ + --disable-readline \ + --disable-sim make all %{?_smp_mflags} popd @@ -109,14 +117,17 @@ CFLAGS="$RPM_OPT_FLAGS" \ --build=%_build --host=%_host \ --target=%{cygwin64_target} \ --enable-targets=%{cygwin64_target},%{cygwin32_target} \ - --disable-nls \ --with-sysroot=%{cygwin64_sysroot} \ --prefix=%{_prefix} \ --bindir=%{_bindir} \ --includedir=%{_includedir} \ --libdir=%{_libdir} \ --mandir=%{_mandir} \ - --infodir=%{_infodir} + --infodir=%{_infodir} \ + --disable-gdb \ + --disable-libdecnumber \ + --disable-readline \ + --disable-sim make %{?_smp_mflags} popd @@ -163,7 +174,6 @@ make -C build_multilib install DESTDIR=$RPM_BUILD_ROOT/multilib # These files conflict with ordinary binutils. rm -rf $RPM_BUILD_ROOT%{_infodir} -rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty* # Keep the multilib versions of the strip, objdump and objcopy commands # We need these for the RPM integration as these tools must be able to @@ -173,8 +183,20 @@ mv $RPM_BUILD_ROOT/multilib%{_bindir}/%{cygwin64_objdump} $RPM_BUILD_ROOT%{_bind mv $RPM_BUILD_ROOT/multilib%{_bindir}/%{cygwin64_objcopy} $RPM_BUILD_ROOT%{_bindir}/%{cygwin_objcopy} rm -rf $RPM_BUILD_ROOT/multilib +%find_lang cygwin-binutils +%find_lang cygwin-bfd +%find_lang cygwin-gas +%find_lang cygwin-gprof +%find_lang cygwin-ld +%find_lang cygwin-opcodes +cat cygwin-bfd.lang >> cygwin-binutils.lang +cat cygwin-gas.lang >> cygwin-binutils.lang +cat cygwin-gprof.lang >> cygwin-binutils.lang +cat cygwin-ld.lang >> cygwin-binutils.lang +cat cygwin-opcodes.lang >> cygwin-binutils.lang -%files -n cygwin-binutils-generic + +%files -n cygwin-binutils-generic -f cygwin-binutils.lang %doc COPYING %{_mandir}/man1/* %{_bindir}/%{cygwin_strip} @@ -212,6 +234,7 @@ rm -rf $RPM_BUILD_ROOT/multilib %{_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 @@ -245,10 +268,15 @@ rm -rf $RPM_BUILD_ROOT/multilib %{_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 +* Wed Mar 26 2014 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 2.24.51-1 +- Updated snapshot with default manifest support. +- Enable NLS. + * Wed Jun 26 2013 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 2.23.52-1 - Make package compliant with new Cygwin packaging scheme. - Add Cygwin 64bit support. diff --git a/ld-parallel-make.patch b/ld-parallel-make.patch new file mode 100644 index 0000000..6eff1f9 --- /dev/null +++ b/ld-parallel-make.patch @@ -0,0 +1,30 @@ +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 @@ -1 +1 @@ -fb35fd0dab0cd61e6a4192ee07f7be26 binutils-2.23.52.tar.bz2 +7f198636895e8e17489fc7d86342f148 binutils-2.24.51-2-src.tar.xz diff --git a/w32api-sysroot.patch b/w32api-sysroot.patch index 815da79..3b9a121 100644 --- a/w32api-sysroot.patch +++ b/w32api-sysroot.patch @@ -1,20 +1,20 @@ --- a/ld/configure.tgt +++ b/ld/configure.tgt -@@ -263,7 +263,7 @@ i[3-7]86-*-pe) targ_emul=i386pe ; - targ_extra_ofiles="deffilep.o pe-dll.o" ;; +@@ -310,7 +310,7 @@ i[3-7]86-*-pe) targ_emul=i386pe ; i[3-7]86-*-cygwin*) targ_emul=i386pe ; - targ_extra_ofiles="deffilep.o pe-dll.o" + 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_ofiles="deffilep.o pep-dll.o pe-dll.o" ;; + targ_extra_binaries="default-manifest.o" ; diff --git a/x86-64-pc32-relocs.patch b/x86-64-pc32-relocs.patch deleted file mode 100644 index 53da6aa..0000000 --- a/x86-64-pc32-relocs.patch +++ /dev/null @@ -1,51 +0,0 @@ -Index: bfd/cofflink.c -=================================================================== -RCS file: /cvs/src/src/bfd/cofflink.c,v -retrieving revision 1.84 -diff -c -p -r1.84 cofflink.c -*** bfd/cofflink.c 10 Jan 2013 20:03:52 -0000 1.84 ---- bfd/cofflink.c 4 Jun 2013 12:03:23 -0000 -*************** _bfd_coff_generic_relocate_section (bfd -*** 3060,3065 **** ---- 3060,3070 ---- - else - { - sec = sections[symndx]; -+ -+ /* If the output section has been discarded then ignore this reloc. */ -+ if (sec->output_section->vma == 0) -+ continue; -+ - val = (sec->output_section->vma - + sec->output_offset - + sym->n_value); -*************** _bfd_coff_generic_relocate_section (bfd -*** 3080,3086 **** - + sec->output_section->vma - + sec->output_offset); - } -- - else if (h->root.type == bfd_link_hash_undefweak) - { - if (h->symbol_class == C_NT_WEAK && h->numaux == 1) ---- 3085,3090 ---- -*************** _bfd_coff_generic_relocate_section (bfd -*** 3116,3122 **** - /* This is a GNU extension. */ - val = 0; - } -- - else if (! info->relocatable) - { - if (! ((*info->callbacks->undefined_symbol) ---- 3120,3125 ---- -*************** _bfd_coff_generic_relocate_section (bfd -*** 3183,3189 **** - if (name == NULL) - return FALSE; - } -- - if (! ((*info->callbacks->reloc_overflow) - (info, (h ? &h->root : NULL), name, howto->name, - (bfd_vma) 0, input_bfd, input_section, ---- 3186,3191 ---- |