diff options
| author | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2011-03-14 20:37:59 -0500 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2011-03-14 20:37:59 -0500 |
| commit | 49213c498909b496e90be1bbd21263f596345dd8 (patch) | |
| tree | 8a163fda9ee4d013da1ad9772f747ce4ed7712f9 | |
| parent | 86f5e4614beb9fefdd584305382628364e427950 (diff) | |
| download | cygwin-binutils-49213c498909b496e90be1bbd21263f596345dd8.tar.gz cygwin-binutils-49213c498909b496e90be1bbd21263f596345dd8.tar.xz cygwin-binutils-49213c498909b496e90be1bbd21263f596345dd8.zip | |
Accomodate w32api libs in sys-root/usr/lib/w32api
| -rw-r--r-- | cygwin-binutils.spec | 7 | ||||
| -rw-r--r-- | w32api-sysroot.patch | 11 |
2 files changed, 17 insertions, 1 deletions
diff --git a/cygwin-binutils.spec b/cygwin-binutils.spec index 3cf46e1..c72a8ec 100644 --- a/cygwin-binutils.spec +++ b/cygwin-binutils.spec @@ -1,12 +1,13 @@ Name: cygwin-binutils Version: 2.21 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cygwin binutils License: GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+ Group: Development/Libraries URL: http://www.gnu.org/software/binutils/ Source0: http://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.bz2 +Patch0: w32api-sysroot.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex @@ -25,6 +26,7 @@ understand Cygwin PE executables and DLLs. %prep %setup -q -n binutils-%{version} +%patch0 -p1 %build @@ -70,5 +72,8 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Mar 14 2011 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - 2.21-2 +- Accomodate w32api libs in sys-root/usr/lib/w32api. + * Wed Feb 16 2011 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - 2.21-1 - Initial RPM release, largely based on mingw32-binutils. diff --git a/w32api-sysroot.patch b/w32api-sysroot.patch new file mode 100644 index 0000000..a996aef --- /dev/null +++ b/w32api-sysroot.patch @@ -0,0 +1,11 @@ +--- a/ld/configure.tgt ++++ b/ld/configure.tgt +@@ -271,7 +271,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_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_ofiles="deffilep.o pe-dll.o" ;; + x86_64-*-mingw*) targ_emul=i386pep ; |