OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-Sep-2005 21:29:45
Branch: HEAD Handle: 2005092120294500
Modified files:
openpkg-src/binutils binutils.patch binutils.spec
Log:
provide both the binutils related C APIs and the ld(1) ldscripts
(which for unknown reasons are definetely required on x86-solaris10
when building gcc 4.0)
Summary:
Revision Changes Path
1.15 +12 -0 openpkg-src/binutils/binutils.patch
1.66 +6 -5 openpkg-src/binutils/binutils.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/binutils/binutils.patch
============================================================================
$ cvs diff -u -r1.14 -r1.15 binutils.patch
--- openpkg-src/binutils/binutils.patch 13 Sep 2005 19:47:25 -0000
1.14
+++ openpkg-src/binutils/binutils.patch 21 Sep 2005 19:29:45 -0000
1.15
@@ -100,3 +100,15 @@
#ifdef HAVE_LOCALE_H
# include <locale.h>
#endif
+Index: ld/Makefile.in
+--- ld/Makefile.in.orig 2005-01-23 06:36:37 +0100
++++ ld/Makefile.in 2005-09-21 21:06:55 +0200
+@@ -139,7 +139,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+
+ EMUL = @EMUL@
+ EMULATION_OFILES = @EMULATION_OFILES@
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/binutils/binutils.spec
============================================================================
$ cvs diff -u -r1.65 -r1.66 binutils.spec
--- openpkg-src/binutils/binutils.spec 13 Sep 2005 19:47:25 -0000
1.65
+++ openpkg-src/binutils/binutils.spec 21 Sep 2005 19:29:45 -0000
1.66
@@ -33,7 +33,7 @@
Group: Utility
License: GPL
Version: 2.16.1
-Release: 20050913
+Release: 20050921
# list of sources
Source0:
ftp://sources.redhat.com/pub/binutils/releases/binutils-%{version}.tar.bz2
@@ -91,6 +91,8 @@
CONFIG_SHELL="%{l_bash}" \
./configure \
--prefix=%{l_prefix} \
+ --includedir=%{l_prefix}/include/binutils \
+ --libdir=%{l_prefix}/lib/binutils \
--disable-nls
# build package
@@ -102,7 +104,9 @@
# build package
%{l_make} %{l_mflags} install \
prefix=$RPM_BUILD_ROOT%{l_prefix} \
- exec_prefix=$RPM_BUILD_ROOT%{l_prefix}
+ exec_prefix=$RPM_BUILD_ROOT%{l_prefix} \
+ includedir=$RPM_BUILD_ROOT%{l_prefix}/include/binutils \
+ libdir=$RPM_BUILD_ROOT%{l_prefix}/lib/binutils
# strip down installation
rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
@@ -112,9 +116,6 @@
rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/dlltool.1
rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/nlmconv.1
rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/windres.1
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/include
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/share
rm -rf $RPM_BUILD_ROOT%{l_prefix}/*-*-*
rm -rf $RPM_BUILD_ROOT%{l_prefix}/bin/c++filt
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
