From 13e6a4cc747cda3a9d7c9e4565aa3c697dbbf615 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 16 Apr 2002 23:45:01 +0000 Subject: 2001-04-16 Joel Sherrill * .cvsignore: Added missing files. * setup.def: New shot using gcc 3.0.4 RPMs. * sparc-solaris-binutils.spec.in: Switched to bz2 file. * sparc-solaris-gcc.spec.in: Use gcc3 file naming for archive and use find to pick up all files. --- contrib/solaris/.cvsignore | 4 +++ contrib/solaris/ChangeLog | 8 +++++ contrib/solaris/setup.def | 6 ++-- contrib/solaris/sparc-solaris-binutils.spec.in | 2 +- contrib/solaris/sparc-solaris-gcc.spec.in | 46 ++++++-------------------- 5 files changed, 27 insertions(+), 39 deletions(-) diff --git a/contrib/solaris/.cvsignore b/contrib/solaris/.cvsignore index 8e86131514..cf8dda8a62 100644 --- a/contrib/solaris/.cvsignore +++ b/contrib/solaris/.cvsignore @@ -4,3 +4,7 @@ aclocal.m4 autom4te.cache config.* configure +setup.cache +sparc-solaris-binutils.spec +sparc-solaris-gcc.spec +sparc-solaris-libs.spec diff --git a/contrib/solaris/ChangeLog b/contrib/solaris/ChangeLog index 5e69d85595..b3f2d7ead2 100644 --- a/contrib/solaris/ChangeLog +++ b/contrib/solaris/ChangeLog @@ -1,3 +1,11 @@ +2001-04-16 Joel Sherrill + + * .cvsignore: Added missing files. + * setup.def: New shot using gcc 3.0.4 RPMs. + * sparc-solaris-binutils.spec.in: Switched to bz2 file. + * sparc-solaris-gcc.spec.in: Use gcc3 file naming for archive + and use find to pick up all files. + 2002-03-27 Ralf Corsepius * configure.ac: diff --git a/contrib/solaris/setup.def b/contrib/solaris/setup.def index a6e8360af0..51e767eeb1 100644 --- a/contrib/solaris/setup.def +++ b/contrib/solaris/setup.def @@ -3,10 +3,10 @@ # # $Id$ # -binutils_version=2.11.2 +binutils_version=2.12 binutils_rpm_release=1 solaris_version=8 -solaris_rpm_release=1 -gcc_version=2.95.3 +solaris_rpm_release=2 +gcc_version=3.0.4 gcc_rpm_release=1 rpm_build_root=/var/tmp diff --git a/contrib/solaris/sparc-solaris-binutils.spec.in b/contrib/solaris/sparc-solaris-binutils.spec.in index df0b74fdc5..e1b6d2ff1e 100644 --- a/contrib/solaris/sparc-solaris-binutils.spec.in +++ b/contrib/solaris/sparc-solaris-binutils.spec.in @@ -19,7 +19,7 @@ Prefix: /opt/solaris BuildRoot: @RPM_BUILD_ROOT@ Version: %binutils_rpmvers -Source0: ftp://ftp.gnu.org.com/pub/gnu/binutils/binutils-%{binutils_version}.tar.gz +Source0: ftp://ftp.gnu.org.com/pub/gnu/binutils/binutils-%{binutils_version}.tar.bz2 NoSource: 0 %description diff --git a/contrib/solaris/sparc-solaris-gcc.spec.in b/contrib/solaris/sparc-solaris-gcc.spec.in index bb95f8170c..58da690335 100644 --- a/contrib/solaris/sparc-solaris-gcc.spec.in +++ b/contrib/solaris/sparc-solaris-gcc.spec.in @@ -19,7 +19,7 @@ Autoreqprov: on Packager: joel@OARcorp.com Version: %gcc_rpmvers -Source0: ftp://sourceware.cygnus.com/pub/solaris/latest/gcc/gcc-everything-%{gcc_version}.tar.gz +Source0: ftp://sourceware.cygnus.com/pub/solaris/latest/gcc/gcc-%{gcc_version}.tar.gz NoSource: 0 BuildRoot: @RPM_BUILD_ROOT@ @@ -37,13 +37,13 @@ Cross gcc for target solaris cd build ../gcc-%{gcc_version}/configure --target=sparc-solaris \ - --with-gnu-as --with-gnu-ld --verbose \ - --disable-nls --enable-languages=c,c++ \ + --with-gnu-as --with-gnu-ld --without-newlib --verbose \ + --disable-shared --disable-nls --enable-languages=c \ --prefix=%{prefix} make all # We don't want info files -# make info + make info %install cd build @@ -54,45 +54,21 @@ Cross gcc for target solaris make prefix=$RPM_BUILD_ROOT%{prefix} install # cd back to build/ - cd ../.. + cd .. # We don't want info files rm -rf $RPM_BUILD_ROOT%{prefix}/info - # libiberty comes from solaris-libs + # libiberty comes from solaris-libs or binutils rm -f $RPM_BUILD_ROOT%{prefix}/sparc-solaris/lib/libiberty.a + rm -f $RPM_BUILD_ROOT%{prefix}/lib/libiberty.a + + pwd + find $RPM_BUILD_ROOT%{prefix} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g" >files.list %clean # let rpm --clean remove BuildRoot iff using the default BuildRoot test "$RPM_BUILD_ROOT" = "@RPM_BUILD_ROOT@" && \ rm -rf $RPM_BUILD_ROOT -%files - -%dir %{prefix}/bin -%{prefix}/bin/cpp -%{prefix}/bin/gcov - -%dir %{prefix}/man -%dir %{prefix}/man/man1 -%doc %{prefix}/man/man1/cccp.1* -%doc %{prefix}/man/man1/sparc-solaris-gcc.1* -%doc %{prefix}/man/man1/sparc-solaris-g++.1* - -%dir %{prefix}/include - -%{prefix}/include/g++-3 -%{prefix}/bin/sparc-solaris-c++ -%{prefix}/bin/sparc-solaris-c++filt -%{prefix}/bin/sparc-solaris-g++ -%{prefix}/bin/sparc-solaris-gcc -%{prefix}/bin/sparc-solaris-protoize -%{prefix}/bin/sparc-solaris-unprotoize - -# %dir %{prefix}/lib/gcc-lib/sparc-solaris/%{gcc_version}/include - -%{prefix}/sparc-solaris -%dir %{prefix}/lib -%dir %{prefix}/lib/gcc-lib -%dir %{prefix}/lib/gcc-lib/sparc-solaris -%{prefix}/lib/gcc-lib/sparc-solaris/%{gcc_version} +%files -f files.list -- cgit v1.2.3