Author: sparky                       Date: Wed Apr 22 11:04:55 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 2.19.51.0.4 (sync with binutils.spec)

---- Files affected:
SPECS:
   crossppc-binutils.spec (1.33 -> 1.34) 

---- Diffs:

================================================================
Index: SPECS/crossppc-binutils.spec
diff -u SPECS/crossppc-binutils.spec:1.33 SPECS/crossppc-binutils.spec:1.34
--- SPECS/crossppc-binutils.spec:1.33   Sun Apr 19 15:16:34 2009
+++ SPECS/crossppc-binutils.spec        Wed Apr 22 13:04:50 2009
@@ -1,4 +1,8 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_with    gold            # enable gold (gnu ld successor) on supported 
archs (x86/sparc)
+
 Summary:       Cross PPC GNU binary utility development utilities - binutils
 Summary(es.UTF-8):     Utilitarios para desarrollo de binarios de la GNU - PPC 
binutils
 Summary(fr.UTF-8):     Utilitaires de développement binaire de GNU - PPC 
binutils
@@ -6,12 +10,12 @@
 Summary(pt_BR.UTF-8):  Utilitários para desenvolvimento de binários da GNU - 
PPC binutils
 Summary(tr.UTF-8):     GNU geliştirme araçları - PPC binutils
 Name:          crossppc-binutils
-Version:       2.19.51.0.3
+Version:       2.19.51.0.4
 Release:       1
-License:       GPL
+License:       GPL v3+
 Group:         Development/Tools
 Source0:       
ftp://ftp.kernel.org/pub/linux/devel/binutils/binutils-%{version}.tar.bz2
-# Source0-md5: c55a2b1eadf818d38e963060412fadca
+# Source0-md5: 7b0d5a4fd434237922aeeab0409f146d
 Source1:       
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/binutils-non-english-man-pages.tar.bz2
 # Source1-md5: a717d9707ec77d82acb6ec9078c472d6
 Patch0:                binutils-gasp.patch
@@ -24,16 +28,22 @@
 Patch7:                binutils-absolute-gnu_debuglink-path.patch
 Patch8:                binutils-libtool-m.patch
 Patch9:                binutils-build-id.patch
+Patch10:       binutils-tooldir.patch
 URL:           http://sources.redhat.com/binutils/
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: bash
+BuildRequires: autoconf >= 2.60
+BuildRequires: automake >= 1:1.8.2
 BuildRequires: bison
 BuildRequires: flex
+BuildRequires: gettext-devel
+%if %{with gold}
+BuildRequires: libstdc++-devel >= 6:4.0-1
+%endif
+BuildRequires: perl-tools-pod
 %ifarch sparc sparc32
 BuildRequires: sparc32
 %endif
 BuildRequires: texinfo >= 4.2
+Conflicts:     gcc-c++ < 5:3.3
 ExcludeArch:   ppc
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -76,11 +86,15 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
-# hacks for ac 2.59 only
+# file contains hacks for ac 2.59 only
 rm config/override.m4
 
 %build
+%{__aclocal}
+%{__autoconf}
+
 # non-standard regeneration (needed because of gasp patch)
 # AM_BINUTILS_WARNINGS in bfd/warning.m4, ZW_GNU_GETTEXT_SISTER_DIR in 
config/gettext-sister.m4
 for dir in gas bfd; do
@@ -92,17 +106,14 @@
        cd ..
 done
 
-cp /usr/share/automake/config.sub .
+cp -f /usr/share/automake/config.* .
 
-# ldscripts won't be generated properly if SHELL is not bash...
-CC="%{__cc}" \
-CFLAGS="%{rpmcflags} -fno-strict-aliasing" \
-LDFLAGS="%{rpmldflags}" \
-CONFIG_SHELL="/bin/bash" \
+CFLAGS="%{rpmcflags}"; export CFLAGS
+CC="%{__cc}"; export CC
 %ifarch sparc
 sparc32 \
 %endif
-./configure \
+./configure %{_target_platform} \
        --disable-debug \
        --disable-werror \
        --enable-build-warnings=,-Wno-missing-prototypes \
@@ -110,30 +121,24 @@
        --disable-nls \
        --prefix=%{_prefix} \
        --libdir=%{_libdir} \
-       --mandir=%{_mandir} \
        --infodir=%{_infodir} \
-       --enable-64-bit-bfd \
+       --mandir=%{_mandir} \
+       --with-tooldir=%{arch} \
+       %{?with_gold:--enable-gold} \
        --target=%{target}
 
-%{__make} -j1 configure-bfd
-%{__make} -j1 headers -C bfd
-%{__make} -j1 all info \
-       tooldir=%{_prefix} \
-       EXEEXT=""
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_prefix}
 
 %{__make} install \
-       prefix=$RPM_BUILD_ROOT%{_prefix} \
-       mandir=$RPM_BUILD_ROOT%{_mandir} \
-       infodir=$RPM_BUILD_ROOT%{_infodir} \
-       libdir=$RPM_BUILD_ROOT%{_libdir}
+       DESTDIR=$RPM_BUILD_ROOT
 
 # remove these man pages unless we cross-build for win*/netware platforms.
 # however, this should be done in Makefiles.
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/{*dlltool,*nlmconv,*windres}.1
+rm $RPM_BUILD_ROOT%{_mandir}/man1/{*dlltool,*nlmconv,*windres}.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -145,9 +150,10 @@
 %dir %{arch}
 %dir %{arch}/bin
 %attr(755,root,root) %{arch}/bin/*
+%if %{without gold}
 %dir %{arch}/lib
-%dir %{arch}/lib/*
-%{arch}/lib/ldscripts/*
+%{arch}/lib/ldscripts
+%endif
 %{_mandir}/man?/%{target}-*
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -156,6 +162,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.34  2009/04/22 11:04:50  sparky
+- up to 2.19.51.0.4 (sync with binutils.spec)
+
 Revision 1.33  2009/04/19 13:16:34  sparky
 - up to 2.19.51.0.3 (sync with binutils.spec)
 
@@ -244,7 +253,7 @@
 - fixed BRs, hopefully fixed build on sparc & amd64, unification
 
 Revision 1.4  2004/06/11 22:38:52  ankry
-BR: gettext-devel
+- BR: gettext-devel
 
 Revision 1.3  2004/06/11 21:34:34  ankry
 - removed bogus changelog entry
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/crossppc-binutils.spec?r1=1.33&r2=1.34&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to