Hello community, here is the log from the commit of package gcc45 for openSUSE:Factory checked in at Fri Feb 12 16:00:01 CET 2010. -------- --- gcc45/gcc45.changes 2010-02-09 17:23:49.000000000 +0100 +++ /mounts/work_src_done/STABLE/gcc45/gcc45.changes 2010-02-12 15:17:43.000000000 +0100 @@ -1,0 +2,24 @@ +Fri Feb 12 15:06:35 CET 2010 - rguenther@suse.de + +- Update to SVN trunk head (r156733). +- Split libffi45 build to a separate spec file. + +------------------------------------------------------------------- +Wed Feb 10 18:08:57 CET 2010 - rguenther@suse.de + +- Update to SVN trunk head (r156666). + +------------------------------------------------------------------- +Tue Feb 9 23:27:39 UTC 2010 - jengelh@medozas.de + +- Also add zlib to BuildRequires - lto_compress depends on it + +------------------------------------------------------------------- +Tue Feb 9 19:02:12 UTC 2010 - jengelh@medozas.de + +- Add missing mpc-devel to cross.spec.in's BuildRequires + (GCC really wants this) +- Add cloog/ppl to cross.spec.in BuildRequires + (Nice to have) + +------------------------------------------------------------------- New Changes file: --- /dev/null 2009-09-30 08:50:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/gcc45/libffi45.changes 2010-02-12 15:17:43.000000000 +0100 @@ -0,0 +1,229 @@ +------------------------------------------------------------------- +Fri Feb 12 15:06:35 CET 2010 - rguenther@suse.de + +- Update to SVN trunk head (r156733). +- Split libffi45 build to a separate spec file. + +------------------------------------------------------------------- +Wed Feb 10 18:08:57 CET 2010 - rguenther@suse.de + +- Update to SVN trunk head (r156666). + +------------------------------------------------------------------- +Tue Feb 9 23:27:39 UTC 2010 - jengelh@medozas.de + +- Also add zlib to BuildRequires - lto_compress depends on it + +------------------------------------------------------------------- +Tue Feb 9 19:02:12 UTC 2010 - jengelh@medozas.de + +- Add missing mpc-devel to cross.spec.in's BuildRequires + (GCC really wants this) +- Add cloog/ppl to cross.spec.in BuildRequires + (Nice to have) + +------------------------------------------------------------------- +Tue Feb 9 12:38:43 CET 2010 - rguenther@suse.de + +- Update to SVN trunk head (r156628). + +------------------------------------------------------------------- +Tue Feb 9 01:33:51 UTC 2010 - jengelh@medozas.de + +- Adjust baselibs.conf (4.4 -> 4.5) + +------------------------------------------------------------------- +Sun Feb 7 17:28:50 UTC 2010 - jengelh@medozas.de + +- Add SPARC support to specfile + +------------------------------------------------------------------- +Fri Feb 5 11:20:25 CET 2010 - rguenther@suse.de + +- Update to SVN trunk head (r156514). +- Add patch for PR42762. + +------------------------------------------------------------------- +Wed Feb 3 16:56:11 CET 2010 - rguenther@suse.de + +- Update to SVN trunk head (r156468). + +------------------------------------------------------------------- +Fri Jan 29 13:31:49 CET 2010 - rguenther@suse.de + +- Update to SVN trunk head (r156346). + +------------------------------------------------------------------- +Thu Jan 21 13:52:45 CET 2010 - rguenther@suse.de + +- Update to SVN trunk head (r156152). +- Adjust textdomain. +- Adjust libjava version. +- Adjust ada manual version. +- Fix libffi-devel provides and obsoletes. + +------------------------------------------------------------------- +Fri Jan 15 12:28:55 CET 2010 - rguenther@suse.de + +- Update to SVN trunk head (r155935). +- Revert patch for PR42634. +- Add patches for PR42248 and PR42739. + +------------------------------------------------------------------- +Tue Jan 12 17:16:26 CET 2010 - rguenther@suse.de + +- Fixup and re-enable patch for stack-protector support on ia64. + +------------------------------------------------------------------- +Mon Jan 11 13:52:12 CET 2010 - rguenther@suse.de + +- Update to SVN trunk head (r155809). + +------------------------------------------------------------------- +Wed Jan 6 19:03:41 CET 2010 - rguenther@suse.de + +- Update to SVN trunk head (r155679). +- Update ecj.jar. + +------------------------------------------------------------------- +Wed Dec 18 12:53:27 CET 2009 - rguenther@suse.de + +- Update to SVN trunk head (r155344). + +------------------------------------------------------------------- +Mon Dec 14 00:37:58 CET 2009 - rguenther@suse.de + +- Update to SVN trunk head (r155199). + +------------------------------------------------------------------- +Thu Nov 26 17:30:05 CET 2009 - rguenther@suse.de + +- Update to SVN trunk head (r154675). + +------------------------------------------------------------------- +Thu Nov 19 18:45:55 CET 2009 - rguenther@suse.de + +- Enable decimal floating point support on s390(x). + +------------------------------------------------------------------- +Fri Nov 18 17:05:30 CET 2009 - rguenther@suse.de + +- Update to SVN trunk head (r154292). +- Re-diff patches to avoid fuzz. +- Add defaults.spec that adds a rpath by default for the optional compiler. + +------------------------------------------------------------------- +Tue Nov 17 16:10:47 CET 2009 - rguenther@suse.de + +- For optional compilers do not build libgcj.spec and run the + testsuite from within gcc.spec. + +------------------------------------------------------------------- +Fri Nov 6 11:25:03 CET 2009 - rguenther@suse.de + +- Update to SVN trunk head (r153963). + +------------------------------------------------------------------- +Wed Nov 4 21:06:32 CET 2009 - rguenther@suse.de + +- Update to SVN trunk head (r153912). +- Build with release checking. + +------------------------------------------------------------------- +Tue Nov 3 12:06:26 CET 2009 - rguenther@suse.de + +- Update to SVN trunk head (r153845). +- Fixup lto-plugin install. +- Fixup thunks with LTO. + +------------------------------------------------------------------- +Thu Oct 29 11:54:27 CET 2009 - rguenther@suse.de + +- Update to SVN trunk head (r153698). + +------------------------------------------------------------------- +Mon Oct 26 11:42:53 CET 2009 - rguenther@suse.de + +- Update to SVN trunk head (r153548). + +------------------------------------------------------------------- +Sun Oct 18 13:21:48 CEST 2009 - rguenther@suse.de + +- Fixup provides. + +------------------------------------------------------------------- +Mon Oct 12 14:35:29 CEST 2009 - rguenther@suse.de + +- Enable support to build an optional compiler that doesn't + replace system libraries. [fate#306970] +- Add the patch to read a default spec file if present. + +------------------------------------------------------------------- +Sun Oct 4 00:20:38 CEST 2009 - rguenther@suse.de + +- Update to SVN trunk head (r152434). + * Includes LTO. + +------------------------------------------------------------------- +Fri Sep 25 14:41:32 CEST 2009 - rguenther@suse.de + +- Update to SVN trunk head (r152168). + +------------------------------------------------------------------- +Tue Aug 25 11:08:24 CEST 2009 - rguenther@suse.de + +- Bump libgcj so version, remove unpackaged ffi manpages. + +------------------------------------------------------------------- +Thu Aug 20 12:04:16 CEST 2009 - rguenther@suse.de + +- Update to SVN trunk head (r150958). +- Disable plugin support. + +------------------------------------------------------------------- +Mon Aug 3 12:49:52 CEST 2009 - rguenther@suse.de + +- Package cpuid.h. [bnc#527433] + +------------------------------------------------------------------- +Wed Jul 22 15:46:40 CEST 2009 - rguenther@suse.de + +- Update to SVN trunk head (r149933). + +------------------------------------------------------------------- +Fri Jul 3 13:44:11 CEST 2009 - rguenther@suse.de + +- Update to SVN trunk head (r149207). +- Do not package gdb python scripting support. ++++ 32 more lines (skipped) ++++ between /dev/null ++++ and /mounts/work_src_done/STABLE/gcc45/libffi45.changes --- gcc45/libgcj45.changes 2010-02-09 17:23:49.000000000 +0100 +++ /mounts/work_src_done/STABLE/gcc45/libgcj45.changes 2010-02-12 15:17:43.000000000 +0100 @@ -1,0 +2,24 @@ +Fri Feb 12 15:06:35 CET 2010 - rguenther@suse.de + +- Update to SVN trunk head (r156733). +- Split libffi45 build to a separate spec file. + +------------------------------------------------------------------- +Wed Feb 10 18:08:57 CET 2010 - rguenther@suse.de + +- Update to SVN trunk head (r156666). + +------------------------------------------------------------------- +Tue Feb 9 23:27:39 UTC 2010 - jengelh@medozas.de + +- Also add zlib to BuildRequires - lto_compress depends on it + +------------------------------------------------------------------- +Tue Feb 9 19:02:12 UTC 2010 - jengelh@medozas.de + +- Add missing mpc-devel to cross.spec.in's BuildRequires + (GCC really wants this) +- Add cloog/ppl to cross.spec.in BuildRequires + (Nice to have) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gcc-4.5.0-20100209.tar.bz2 New: ---- gcc-4.5.0-20100212.tar.bz2 libffi45.changes libffi45.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gcc45.spec ++++++ --- /var/tmp/diff_new_pack.c8J3QY/_old 2010-02-12 15:45:58.000000000 +0100 +++ /var/tmp/diff_new_pack.c8J3QY/_new 2010-02-12 15:45:58.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gcc45 (Version 4.5.0_20100209) +# spec file for package gcc45 (Version 4.5.0_20100212) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -29,7 +29,7 @@ # on those that work # Note that AdaCore only supports %ix86, x86_64 and ia64 %ifarch %ix86 x86_64 ppc s390 ia64 -%define build_ada 0%{!?building_libjava:1} +%define build_ada !0%{?building_libjava:1}%{?building_libffi:1} %else # alpha ppc64 s390x hppa arm %define build_ada 0 @@ -40,12 +40,12 @@ %define build_libjava 0 %else %define build_java 1 -%define build_libjava 0%{?building_libjava:1} +%define build_libjava 0%{?building_libjava:1}%{?building_libffi:1} %endif %define build_cp 1 %define build_fortran 1 %define build_objc 1 -%define build_objcp 0%{!?building_libjava:1} +%define build_objcp !0%{?building_libjava:1}%{?building_libffi:1} %define build_with_mudflap 0 %if %{build_objcp} %define build_cp 1 @@ -78,8 +78,10 @@ %endif %endif %if %{build_libjava} +%if 0%{!?building_libffi:1} BuildRequires: fastjar gtk2-devel libart_lgpl-devel unzip %endif +%endif %ifarch ia64 BuildRequires: libunwind-devel %endif @@ -129,14 +131,14 @@ # COMMON-BEGIN %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 4.5.0_20100209 +Version: 4.5.0_20100212 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) %define snapshot_date %(echo %version | sed 's/[34]\.[0-9]\.[0-6]//' | sed 's/_/-/') %define binsuffix -4.5 # COMMON-END -%if 0%{?!building_libjava:1} +%if !0%{?building_libjava:1}%{?building_libffi:1} Requires: binutils glibc-devel %ifarch %gold_archs Requires: binutils-gold @@ -193,6 +195,7 @@ Patch61: gcc44-rename-info-files.patch # Patches for SAP features Patch130: sap303956-uchar.diff +# LIBFFI-DELETE-BEGIN # LIBJAVA-DELETE-BEGIN Group: Development/Languages/C and C++ Summary: The GNU C Compiler and Support Files @@ -1265,7 +1268,6 @@ %description -n gcc45-gij This package contains the java bytecode interpreter gij and related tools. - %package -n libffi45 License: BSD3c Summary: Foreign Function Interface library @@ -1783,6 +1785,9 @@ %endif --build=%{GCCDIST} # COMMON-END +%if 0%{?building_libffi:1} +make all-target-libffi $PARALLEL +%else # Only run profiled bootstrap on archs where it works #%ifarch %ix86 x86_64 ppc ppc64 ia64 #make profiledbootstrap-lean STAGE1_CFLAGS="-O -g" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL @@ -1800,6 +1805,7 @@ mkdir ../testresults ../contrib/test_summary > ../testresults/test_summary.txt %endif +%endif %install export NO_BRP_CHECK_BYTECODE_VERSION=true @@ -1807,9 +1813,11 @@ # Work around tail/head -1 changes export _POSIX2_VERSION=199209 export LIBRARY_PATH=$RPM_BUILD_ROOT%{libsubdir}:$RPM_BUILD_ROOT%{mainlibdirbi} +%if 0%{?building_libffi:1} +make -C %{GCCDIST}/libffi install DESTDIR=$RPM_BUILD_ROOT +%else %if 0%{?building_libjava:1} make -C %{GCCDIST}/libjava install DESTDIR=$RPM_BUILD_ROOT -make -C %{GCCDIST}/libffi install DESTDIR=$RPM_BUILD_ROOT make -C gcc java.install-man DESTDIR=$RPM_BUILD_ROOT make -C gcc java.install-common DESTDIR=$RPM_BUILD_ROOT make -C gcc install-common DESTDIR=$RPM_BUILD_ROOT COMPILERS='jc1$(exeext) jvgenmain$(exeext)' @@ -1833,6 +1841,7 @@ rm $RPM_BUILD_ROOT%{libsubdir}/jvgenmain %endif %endif +%endif # Remove some useless .la files for lib in libobjc libgfortran libgfortranbegin libmudflap libmudflapth \ libgomp libstdc++ libsupc++ libgcj-tools libgij; do @@ -1849,6 +1858,7 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib64 %endif %endif +# LIBFFI-DELETE-BEGIN # LIBJAVA-DELETE-BEGIN %if %{build_cp} # Merge multilib c++config.h to allow omitting the duplicate and @@ -2002,6 +2012,7 @@ EOF %endif # LIBJAVA-DELETE-END +# LIBFFI-DELETE-END %if %{build_ada} mv $RPM_BUILD_ROOT%{libsubdir}/adalib/lib*-*.so $RPM_BUILD_ROOT%{_libdir} ln -sf %{_libdir}/libgnarl%{binsuffix}.so $RPM_BUILD_ROOT%{libsubdir}/adalib/libgnarl.so @@ -2039,6 +2050,7 @@ cp `find . -name "*.log" \! -name "config.log" |grep -v 'acats/tests' ` ../testresults/ chmod 644 ../testresults/* %endif +# LIBFFI-DELETE-BEGIN %if %{build_cp} # Find C++ and Java headers find $RPM_BUILD_ROOT%{_prefix}/include/c++ \ @@ -2046,6 +2058,7 @@ -o \( -type d -printf "%%%%dir " , \ -printf "%{_prefix}/include/c++/%%P\n" \) > ../c++-headers %endif +# LIBFFI-DELETE-END # Remove files that we do not need to clean up filelist rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{GCCDIST}-* rm -rf $RPM_BUILD_ROOT%{libsubdir}/install-tools @@ -2071,7 +2084,7 @@ rm -rf $RPM_BUILD_ROOT%{libsubdir}/plugin rm -f $RPM_BUILD_ROOT%{_infodir}/dir rm -f $RPM_BUILD_ROOT%{_prefix}/bin/gccbug%{binsuffix} -%if !0%{?building_libjava:1} +%if !0%{?building_libjava:1}%{?building_libffi:1} # delete compile flag tracking from crt files crt_list=$RPM_BUILD_ROOT%{versmainlibdir}/crt*.o %if %{biarch} @@ -2085,7 +2098,7 @@ objcopy -R ".comment.SUSE.OPTs" $o done %endif -%if %{build_libjava} +%if 0%{?building_libjava:1} # gcj -static doesn't work properly anyway, unless using --whole-archive # let's save the space instead. find $RPM_BUILD_ROOT -name libgcj.a \ @@ -2098,21 +2111,21 @@ | xargs rm -f find $RPM_BUILD_ROOT -name libgcj.spec | xargs \ sed -i -e 's/lib: /&%%{static:%%eJava programs cannot be linked statically}/' +# security files have broken install locations, also they cause conflicts +# between libgcj versions. Simply delete them here, libgcj will use its +# defaults in this case (which is what these files contain anyway). +rm $RPM_BUILD_ROOT%{_libdir}/logging.properties +rm -r $RPM_BUILD_ROOT%{_libdir}/security +%endif +%if 0%{?building_libffi:1} # Move libffi headers, remove empty libffi libtool file +mkdir -p $RPM_BUILD_ROOT%{_prefix}/include mv $RPM_BUILD_ROOT%{libsubdir}/include/ffitarget.h $RPM_BUILD_ROOT%{_prefix}/include/ mv $RPM_BUILD_ROOT%{libsubdir}/include/ffi.h $RPM_BUILD_ROOT%{_prefix}/include/ rm -f $RPM_BUILD_ROOT%{mainlibdir}/libffi.la %if %{biarch} rm -f $RPM_BUILD_ROOT%{mainlibdirbi}/libffi.la %endif -rm -f $RPM_BUILD_ROOT%{_mandir}/man3/ffi%{binsuffix}.3 -rm -f $RPM_BUILD_ROOT%{_mandir}/man3/ffi_call%{binsuffix}.3 -rm -f $RPM_BUILD_ROOT%{_mandir}/man3/ffi_prep_cif%{binsuffix}.3 -# security files have broken install locations, also they cause conflicts -# between libgcj versions. Simply delete them here, libgcj will use its -# defaults in this case (which is what these files contain anyway). -rm $RPM_BUILD_ROOT%{_libdir}/logging.properties -rm -r $RPM_BUILD_ROOT%{_libdir}/security %endif %if %{build_java} %if !%{build_libjava} @@ -2145,6 +2158,7 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/liblto_plugin.a rm -f $RPM_BUILD_ROOT%{libsubdir}/liblto_plugin.la %endif +# LIBFFI-DELETE-BEGIN %if 0%{?building_libjava:1} # For building libjava only we need to delete other info docs rm $RPM_BUILD_ROOT%{_infodir}/cp-tools.info* @@ -2793,6 +2807,11 @@ %doc %{_mandir}/man1/gorbd%{binsuffix}.1.gz %doc %{_mandir}/man1/gserialver%{binsuffix}.1.gz %doc %{_mandir}/man1/gtnameserv%{binsuffix}.1.gz +%endif +%endif +# LIBFFI-DELETE-END +%if %{build_java} +%if 0%{?building_libffi:1} %files -n libffi45 %defattr(-,root,root) @@ -2814,6 +2833,9 @@ %mainlib libffi.a +%doc %{_mandir}/man3/ffi%{binsuffix}.3.gz +%doc %{_mandir}/man3/ffi_call%{binsuffix}.3.gz +%doc %{_mandir}/man3/ffi_prep_cif%{binsuffix}.3.gz %if %{separate_biarch} %files -n libffi45-devel%{separate_biarch_suffix} ++++++ libffi45.spec ++++++ ++++ 987 lines (skipped) ++++++ libgcj45.spec ++++++ --- /var/tmp/diff_new_pack.c8J3QY/_old 2010-02-12 15:45:58.000000000 +0100 +++ /var/tmp/diff_new_pack.c8J3QY/_new 2010-02-12 15:45:58.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libgcj45 (Version 4.5.0_20100209) +# spec file for package libgcj45 (Version 4.5.0_20100212) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -46,7 +46,7 @@ # on those that work # Note that AdaCore only supports %ix86, x86_64 and ia64 %ifarch %ix86 x86_64 ppc s390 ia64 -%define build_ada 0%{!?building_libjava:1} +%define build_ada !0%{?building_libjava:1}%{?building_libffi:1} %else # alpha ppc64 s390x hppa arm %define build_ada 0 @@ -57,12 +57,12 @@ %define build_libjava 0 %else %define build_java 1 -%define build_libjava 0%{?building_libjava:1} +%define build_libjava 0%{?building_libjava:1}%{?building_libffi:1} %endif %define build_cp 1 %define build_fortran 1 %define build_objc 1 -%define build_objcp 0%{!?building_libjava:1} +%define build_objcp !0%{?building_libjava:1}%{?building_libffi:1} %define build_with_mudflap 0 %if %{build_objcp} %define build_cp 1 @@ -95,8 +95,10 @@ %endif %endif %if %{build_libjava} +%if 0%{!?building_libffi:1} BuildRequires: fastjar gtk2-devel libart_lgpl-devel unzip %endif +%endif %ifarch ia64 BuildRequires: libunwind-devel %endif @@ -146,14 +148,14 @@ # COMMON-BEGIN %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 4.5.0_20100209 +Version: 4.5.0_20100212 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) %define snapshot_date %(echo %version | sed 's/[34]\.[0-9]\.[0-6]//' | sed 's/_/-/') %define binsuffix -4.5 # COMMON-END -%if 0%{?!building_libjava:1} +%if !0%{?building_libjava:1}%{?building_libffi:1} Requires: binutils glibc-devel %ifarch %gold_archs Requires: binutils-gold @@ -210,6 +212,7 @@ Patch61: gcc44-rename-info-files.patch # Patches for SAP features Patch130: sap303956-uchar.diff +# LIBFFI-DELETE-BEGIN License: GPLv2+ ; LGPLv2.1+ Summary: Java Runtime Library for gcc Group: System/Libraries @@ -316,7 +319,6 @@ %description -n gcc45-gij This package contains the java bytecode interpreter gij and related tools. - %package -n libffi45 License: BSD3c Summary: Foreign Function Interface library @@ -834,6 +836,9 @@ %endif --build=%{GCCDIST} # COMMON-END +%if 0%{?building_libffi:1} +make all-target-libffi $PARALLEL +%else # Only run profiled bootstrap on archs where it works #%ifarch %ix86 x86_64 ppc ppc64 ia64 #make profiledbootstrap-lean STAGE1_CFLAGS="-O -g" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL @@ -851,6 +856,7 @@ mkdir ../testresults ../contrib/test_summary > ../testresults/test_summary.txt %endif +%endif %install export NO_BRP_CHECK_BYTECODE_VERSION=true @@ -858,9 +864,11 @@ # Work around tail/head -1 changes export _POSIX2_VERSION=199209 export LIBRARY_PATH=$RPM_BUILD_ROOT%{libsubdir}:$RPM_BUILD_ROOT%{mainlibdirbi} +%if 0%{?building_libffi:1} +make -C %{GCCDIST}/libffi install DESTDIR=$RPM_BUILD_ROOT +%else %if 0%{?building_libjava:1} make -C %{GCCDIST}/libjava install DESTDIR=$RPM_BUILD_ROOT -make -C %{GCCDIST}/libffi install DESTDIR=$RPM_BUILD_ROOT make -C gcc java.install-man DESTDIR=$RPM_BUILD_ROOT make -C gcc java.install-common DESTDIR=$RPM_BUILD_ROOT make -C gcc install-common DESTDIR=$RPM_BUILD_ROOT COMPILERS='jc1$(exeext) jvgenmain$(exeext)' @@ -884,6 +892,7 @@ rm $RPM_BUILD_ROOT%{libsubdir}/jvgenmain %endif %endif +%endif # Remove some useless .la files for lib in libobjc libgfortran libgfortranbegin libmudflap libmudflapth \ libgomp libstdc++ libsupc++ libgcj-tools libgij; do @@ -900,6 +909,7 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib64 %endif %endif +# LIBFFI-DELETE-BEGIN %if 0%{!?build_optional_compiler:1} # move shared libs from versionspecific dir to main libdir for libname in \ @@ -952,6 +962,7 @@ %endif %endif %endif +# LIBFFI-DELETE-END %if %{build_ada} mv $RPM_BUILD_ROOT%{libsubdir}/adalib/lib*-*.so $RPM_BUILD_ROOT%{_libdir} ln -sf %{_libdir}/libgnarl%{binsuffix}.so $RPM_BUILD_ROOT%{libsubdir}/adalib/libgnarl.so @@ -989,6 +1000,7 @@ cp `find . -name "*.log" \! -name "config.log" |grep -v 'acats/tests' ` ../testresults/ chmod 644 ../testresults/* %endif +# LIBFFI-DELETE-BEGIN %if %{build_cp} # Find C++ and Java headers find $RPM_BUILD_ROOT%{_prefix}/include/c++ \ @@ -996,6 +1008,7 @@ -o \( -type d -printf "%%%%dir " , \ -printf "%{_prefix}/include/c++/%%P\n" \) > ../c++-headers %endif +# LIBFFI-DELETE-END # Remove files that we do not need to clean up filelist rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{GCCDIST}-* rm -rf $RPM_BUILD_ROOT%{libsubdir}/install-tools @@ -1021,7 +1034,7 @@ rm -rf $RPM_BUILD_ROOT%{libsubdir}/plugin rm -f $RPM_BUILD_ROOT%{_infodir}/dir rm -f $RPM_BUILD_ROOT%{_prefix}/bin/gccbug%{binsuffix} -%if !0%{?building_libjava:1} +%if !0%{?building_libjava:1}%{?building_libffi:1} # delete compile flag tracking from crt files crt_list=$RPM_BUILD_ROOT%{versmainlibdir}/crt*.o %if %{biarch} @@ -1035,7 +1048,7 @@ objcopy -R ".comment.SUSE.OPTs" $o done %endif -%if %{build_libjava} +%if 0%{?building_libjava:1} # gcj -static doesn't work properly anyway, unless using --whole-archive # let's save the space instead. find $RPM_BUILD_ROOT -name libgcj.a \ @@ -1048,21 +1061,21 @@ | xargs rm -f find $RPM_BUILD_ROOT -name libgcj.spec | xargs \ sed -i -e 's/lib: /&%%{static:%%eJava programs cannot be linked statically}/' +# security files have broken install locations, also they cause conflicts +# between libgcj versions. Simply delete them here, libgcj will use its +# defaults in this case (which is what these files contain anyway). +rm $RPM_BUILD_ROOT%{_libdir}/logging.properties +rm -r $RPM_BUILD_ROOT%{_libdir}/security +%endif +%if 0%{?building_libffi:1} # Move libffi headers, remove empty libffi libtool file +mkdir -p $RPM_BUILD_ROOT%{_prefix}/include mv $RPM_BUILD_ROOT%{libsubdir}/include/ffitarget.h $RPM_BUILD_ROOT%{_prefix}/include/ mv $RPM_BUILD_ROOT%{libsubdir}/include/ffi.h $RPM_BUILD_ROOT%{_prefix}/include/ rm -f $RPM_BUILD_ROOT%{mainlibdir}/libffi.la %if %{biarch} rm -f $RPM_BUILD_ROOT%{mainlibdirbi}/libffi.la %endif -rm -f $RPM_BUILD_ROOT%{_mandir}/man3/ffi%{binsuffix}.3 -rm -f $RPM_BUILD_ROOT%{_mandir}/man3/ffi_call%{binsuffix}.3 -rm -f $RPM_BUILD_ROOT%{_mandir}/man3/ffi_prep_cif%{binsuffix}.3 -# security files have broken install locations, also they cause conflicts -# between libgcj versions. Simply delete them here, libgcj will use its -# defaults in this case (which is what these files contain anyway). -rm $RPM_BUILD_ROOT%{_libdir}/logging.properties -rm -r $RPM_BUILD_ROOT%{_libdir}/security %endif %if %{build_java} %if !%{build_libjava} @@ -1095,6 +1108,7 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/liblto_plugin.a rm -f $RPM_BUILD_ROOT%{libsubdir}/liblto_plugin.la %endif +# LIBFFI-DELETE-BEGIN %if 0%{?building_libjava:1} # For building libjava only we need to delete other info docs rm $RPM_BUILD_ROOT%{_infodir}/cp-tools.info* @@ -1265,6 +1279,11 @@ %doc %{_mandir}/man1/gorbd%{binsuffix}.1.gz %doc %{_mandir}/man1/gserialver%{binsuffix}.1.gz %doc %{_mandir}/man1/gtnameserv%{binsuffix}.1.gz +%endif +%endif +# LIBFFI-DELETE-END +%if %{build_java} +%if 0%{?building_libffi:1} %files -n libffi45 %defattr(-,root,root) @@ -1286,6 +1305,9 @@ %mainlib libffi.a +%doc %{_mandir}/man3/ffi%{binsuffix}.3.gz +%doc %{_mandir}/man3/ffi_call%{binsuffix}.3.gz +%doc %{_mandir}/man3/ffi_prep_cif%{binsuffix}.3.gz %if %{separate_biarch} %files -n libffi45-devel%{separate_biarch_suffix} ++++++ change_spec ++++++ --- /var/tmp/diff_new_pack.c8J3QY/_old 2010-02-12 15:45:58.000000000 +0100 +++ /var/tmp/diff_new_pack.c8J3QY/_new 2010-02-12 15:45:58.000000000 +0100 @@ -70,8 +70,32 @@ p } }' >> libgcj$base_ver.spec + echo '%define building_libffi 1' > libffi$base_ver.spec + sed -e '/^# LIBFFI-DELETE-BEGIN/,/^# LIBFFI-DELETE-END/d;s/^Name:[[:space:]]*gcc/Name: libffi/g' \ + gcc.spec.in \ + | sed -e 's%@base_ver@%'$base_ver'%g' \ + | sed -n -e '{ +/^# PACKAGE-BEGIN/h +/^# PACKAGE-BEGIN/,/^# PACKAGE-END/H +/^# PACKAGE-BEGIN/,/^# PACKAGE-END/!p +/^# PACKAGE-END/{g +s/@variant@//g +p +g +s/@variant@/-32bit/g +p +g +s/@variant@/-64bit/g +p +} +}' \ + | sed -e '/^%package -n libffi'$base_ver'$/d' \ + | sed -e 's/-n libffi'$base_ver'$//g' \ +>> libffi$base_ver.spec - test -f gcc$base_ver.changes && ln -f gcc$base_ver.changes libgcj$base_ver.changes + test -f gcc$base_ver.changes \ + && ( ln -f gcc$base_ver.changes libgcj$base_ver.changes; \ + ln -f gcc$base_ver.changes libffi$base_ver.changes ) fi ++++++ cross.spec.in ++++++ --- /var/tmp/diff_new_pack.c8J3QY/_old 2010-02-12 15:45:58.000000000 +0100 +++ /var/tmp/diff_new_pack.c8J3QY/_new 2010-02-12 15:45:58.000000000 +0100 @@ -43,7 +43,10 @@ %endif Name: cross-$cross_arch-gcc$name_suffix -BuildRequires: bison flex mpfr-devel +BuildRequires: bison flex mpfr-devel zlib-devel mpc-devel +%ifarch %ix86 x86_64 ppc ppc64 s390 s390x ia64 %sparc +BuildRequires: cloog-devel ppl-devel libelf0-devel +%endif BuildRequires: cross-$cross_arch_cpu-binutils %if "$cross_arch$name_suffix" == "spu-static" BuildRequires: cross-$cross_arch_cpu-newlib-headers ++++++ gcc-4.5.0-20100209.tar.bz2 -> gcc-4.5.0-20100212.tar.bz2 ++++++ gcc45/gcc-4.5.0-20100209.tar.bz2 /mounts/work_src_done/STABLE/gcc45/gcc-4.5.0-20100212.tar.bz2 differ: char 11, line 1 ++++++ gcc.spec.in ++++++ --- /var/tmp/diff_new_pack.c8J3QY/_old 2010-02-12 15:45:58.000000000 +0100 +++ /var/tmp/diff_new_pack.c8J3QY/_new 2010-02-12 15:45:58.000000000 +0100 @@ -33,7 +33,7 @@ # on those that work # Note that AdaCore only supports %ix86, x86_64 and ia64 %ifarch %ix86 x86_64 ppc s390 ia64 -%define build_ada 0%{!?building_libjava:1} +%define build_ada !0%{?building_libjava:1}%{?building_libffi:1} %else # alpha ppc64 s390x hppa arm %define build_ada 0 @@ -45,13 +45,13 @@ %define build_libjava 0 %else %define build_java 1 -%define build_libjava 0%{?building_libjava:1} +%define build_libjava 0%{?building_libjava:1}%{?building_libffi:1} %endif %define build_cp 1 %define build_fortran 1 %define build_objc 1 -%define build_objcp 0%{!?building_libjava:1} +%define build_objcp !0%{?building_libjava:1}%{?building_libffi:1} %define build_with_mudflap 0 %if %{build_objcp} @@ -88,8 +88,10 @@ %endif %endif %if %{build_libjava} +%if 0%{!?building_libffi:1} BuildRequires: fastjar gtk2-devel libart_lgpl-devel unzip %endif +%endif %ifarch ia64 BuildRequires: libunwind-devel %endif @@ -146,7 +148,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: http://gcc.gnu.org/ -Version: 4.5.0_20100209 +Version: 4.5.0_20100212 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -154,7 +156,7 @@ %define binsuffix -4.5 # COMMON-END -%if 0%{?!building_libjava:1} +%if !0%{?building_libjava:1}%{?building_libffi:1} Requires: binutils glibc-devel %ifarch %gold_archs Requires: binutils-gold @@ -213,6 +215,7 @@ # Patches for SAP features Patch130: sap303956-uchar.diff +# LIBFFI-DELETE-BEGIN # LIBJAVA-DELETE-BEGIN Group: Development/Languages/C and C++ Summary: The GNU C Compiler and Support Files @@ -716,7 +719,7 @@ %description -n gcc@base_ver@-gij This package contains the java bytecode interpreter gij and related tools. - +# LIBFFI-DELETE-END # PACKAGE-BEGIN %package -n libffi@base_ver@@variant@ License: BSD 3-Clause @@ -1175,6 +1178,9 @@ # COMMON-END +%if 0%{?building_libffi:1} +make all-target-libffi $PARALLEL +%else # Only run profiled bootstrap on archs where it works #%ifarch %ix86 x86_64 ppc ppc64 ia64 #make profiledbootstrap-lean STAGE1_CFLAGS="-O -g" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL @@ -1192,6 +1198,7 @@ mkdir ../testresults ../contrib/test_summary > ../testresults/test_summary.txt %endif +%endif %install export NO_BRP_CHECK_BYTECODE_VERSION=true @@ -1199,9 +1206,11 @@ # Work around tail/head -1 changes export _POSIX2_VERSION=199209 export LIBRARY_PATH=$RPM_BUILD_ROOT%{libsubdir}:$RPM_BUILD_ROOT%{mainlibdirbi} +%if 0%{?building_libffi:1} +make -C %{GCCDIST}/libffi install DESTDIR=$RPM_BUILD_ROOT +%else %if 0%{?building_libjava:1} make -C %{GCCDIST}/libjava install DESTDIR=$RPM_BUILD_ROOT -make -C %{GCCDIST}/libffi install DESTDIR=$RPM_BUILD_ROOT make -C gcc java.install-man DESTDIR=$RPM_BUILD_ROOT make -C gcc java.install-common DESTDIR=$RPM_BUILD_ROOT make -C gcc install-common DESTDIR=$RPM_BUILD_ROOT COMPILERS='jc1$(exeext) jvgenmain$(exeext)' @@ -1225,6 +1234,7 @@ rm $RPM_BUILD_ROOT%{libsubdir}/jvgenmain %endif %endif +%endif # Remove some useless .la files for lib in libobjc libgfortran libgfortranbegin libmudflap libmudflapth \ @@ -1244,6 +1254,7 @@ %endif %endif +# LIBFFI-DELETE-BEGIN # LIBJAVA-DELETE-BEGIN %if %{build_cp} # Merge multilib c++config.h to allow omitting the duplicate and @@ -1401,6 +1412,7 @@ EOF %endif # LIBJAVA-DELETE-END +# LIBFFI-DELETE-END %if %{build_ada} mv $RPM_BUILD_ROOT%{libsubdir}/adalib/lib*-*.so $RPM_BUILD_ROOT%{_libdir} @@ -1442,6 +1454,7 @@ cp `find . -name "*.log" \! -name "config.log" |grep -v 'acats/tests' ` ../testresults/ chmod 644 ../testresults/* %endif +# LIBFFI-DELETE-BEGIN %if %{build_cp} # Find C++ and Java headers find $RPM_BUILD_ROOT%{_prefix}/include/c++ \ @@ -1449,6 +1462,7 @@ -o \( -type d -printf "%%%%dir " , \ -printf "%{_prefix}/include/c++/%%P\n" \) > ../c++-headers %endif +# LIBFFI-DELETE-END # Remove files that we do not need to clean up filelist rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{GCCDIST}-* rm -rf $RPM_BUILD_ROOT%{libsubdir}/install-tools @@ -1475,7 +1489,7 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir rm -f $RPM_BUILD_ROOT%{_prefix}/bin/gccbug%{binsuffix} -%if !0%{?building_libjava:1} +%if !0%{?building_libjava:1}%{?building_libffi:1} # delete compile flag tracking from crt files crt_list=$RPM_BUILD_ROOT%{versmainlibdir}/crt*.o %if %{biarch} @@ -1490,7 +1504,7 @@ done %endif -%if %{build_libjava} +%if 0%{?building_libjava:1} # gcj -static doesn't work properly anyway, unless using --whole-archive # let's save the space instead. find $RPM_BUILD_ROOT -name libgcj.a \ @@ -1505,23 +1519,24 @@ find $RPM_BUILD_ROOT -name libgcj.spec | xargs \ sed -i -e 's/lib: /&%%{static:%%eJava programs cannot be linked statically}/' +# security files have broken install locations, also they cause conflicts +# between libgcj versions. Simply delete them here, libgcj will use its +# defaults in this case (which is what these files contain anyway). +rm $RPM_BUILD_ROOT%{_libdir}/logging.properties +rm -r $RPM_BUILD_ROOT%{_libdir}/security +%endif + +%if 0%{?building_libffi:1} # Move libffi headers, remove empty libffi libtool file +mkdir -p $RPM_BUILD_ROOT%{_prefix}/include mv $RPM_BUILD_ROOT%{libsubdir}/include/ffitarget.h $RPM_BUILD_ROOT%{_prefix}/include/ mv $RPM_BUILD_ROOT%{libsubdir}/include/ffi.h $RPM_BUILD_ROOT%{_prefix}/include/ rm -f $RPM_BUILD_ROOT%{mainlibdir}/libffi.la %if %{biarch} rm -f $RPM_BUILD_ROOT%{mainlibdirbi}/libffi.la %endif -rm -f $RPM_BUILD_ROOT%{_mandir}/man3/ffi%{binsuffix}.3 -rm -f $RPM_BUILD_ROOT%{_mandir}/man3/ffi_call%{binsuffix}.3 -rm -f $RPM_BUILD_ROOT%{_mandir}/man3/ffi_prep_cif%{binsuffix}.3 - -# security files have broken install locations, also they cause conflicts -# between libgcj versions. Simply delete them here, libgcj will use its -# defaults in this case (which is what these files contain anyway). -rm $RPM_BUILD_ROOT%{_libdir}/logging.properties -rm -r $RPM_BUILD_ROOT%{_libdir}/security %endif + %if %{build_java} %if !%{build_libjava} rm $RPM_BUILD_ROOT%{_mandir}/man1/jv-convert%{binsuffix}.1 @@ -1554,6 +1569,7 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/liblto_plugin.la %endif +# LIBFFI-DELETE-BEGIN %if 0%{?building_libjava:1} # For building libjava only we need to delete other info docs rm $RPM_BUILD_ROOT%{_infodir}/cp-tools.info* @@ -2132,7 +2148,12 @@ %doc %{_mandir}/man1/gorbd%{binsuffix}.1.gz %doc %{_mandir}/man1/gserialver%{binsuffix}.1.gz %doc %{_mandir}/man1/gtnameserv%{binsuffix}.1.gz +%endif +%endif +# LIBFFI-DELETE-END +%if %{build_java} +%if 0%{?building_libffi:1} %files -n libffi@base_ver@ %defattr(-,root,root) %mainlib libffi.so.* @@ -2149,6 +2170,9 @@ %{_prefix}/include/ffitarget.h %mainlib libffi.so %mainlib libffi.a +%doc %{_mandir}/man3/ffi%{binsuffix}.3.gz +%doc %{_mandir}/man3/ffi_call%{binsuffix}.3.gz +%doc %{_mandir}/man3/ffi_prep_cif%{binsuffix}.3.gz %if %{separate_biarch} %files -n libffi@base_ver@-devel%{separate_biarch_suffix} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org