Hello community, here is the log from the commit of package gcc41 for openSUSE:Factory checked in at Fri Apr 30 01:34:25 CEST 2010. -------- --- gcc41/gcc41.changes 2009-11-20 13:45:34.000000000 +0100 +++ /mounts/work_src_done/STABLE/gcc41/gcc41.changes 2010-04-29 13:15:13.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Apr 29 11:14:40 UTC 2010 - rguenther@novell.com + +- Drop cross-avr-gcc. + +------------------------------------------------------------------- +Wed Apr 14 16:27:11 CEST 2010 - rguenther@novell.com + +- Fix cross-avr-patch-dwarf.patch. + +------------------------------------------------------------------- libgcj41.changes: same change calling whatdependson for head-i586 Old: ---- cross-avr-gcc.changes cross-avr-gcc.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gcc41.spec ++++++ ++++ 939 lines (skipped) ++++ between gcc41/gcc41.spec ++++ and /mounts/work_src_done/STABLE/gcc41/gcc41.spec ++++++ libgcj41.spec ++++++ --- /var/tmp/diff_new_pack.wbuh3y/_old 2010-04-30 01:32:38.000000000 +0200 +++ /var/tmp/diff_new_pack.wbuh3y/_new 2010-04-30 01:32:38.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libgcj41 (Version 4.1.2_20070115) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,12 +28,15 @@ # # Please submit bugfixes or comments via http://www.suse.de/feedback/ # + # PREFIX_FOR_OPT is the definition for _prefix # LIBDIR_FOR_OPT is the definition for _libdir + # Run the testsuite if there's a file named RUN_TESTS in the source %if 0%{!?run_tests:1} %define run_tests %(test -f %_sourcedir/RUN_TESTS && echo 1 || echo 0) %endif + # Ada currently fails to build on a few platforms, enable it only # on those that work # Note that AdaCore only supports %ix86, x86_64 and ia64 @@ -43,6 +46,7 @@ # alpha ppc64 s390x %define build_ada 0 %endif + # We don't want to build java on arm %ifarch mips %arm %define build_java 0 @@ -51,8 +55,10 @@ %define build_java 1 %define build_libjava 0%{?building_libjava:1} %endif + %define build_fortran 1 %define build_objcp 0%{!?building_libjava:1} + %if 0%{?build_for_base:1} %define build_ada 0 %define build_java 0 @@ -85,14 +91,17 @@ %if %{run_tests} BuildRequires: dejagnu expect %endif + # Define this as 1 to get gcc packages for business products %define gcc_for_opt 0 + # Disable the use of icecream for this package. It would generate # too much parallelism when building state2 and stage3 and the runtime libs # Just touch RUN_TESTS in the source dir to run the testsuite. %if %{gcc_for_opt} %define run_tests 0 %endif + # Define version number of libgcc_s %ifarch hppa %define libgcc_s 4 @@ -106,6 +115,7 @@ %else %define build_nof 0 %endif + %define separate_bi32 0 %define separate_bi64 0 %ifarch ppc @@ -116,6 +126,7 @@ %ifarch x86_64 s390x %define separate_bi32 1 %endif + # Define two macros to trigger -32bit or -64bit package variants %define separate_biarch 0 %if %{separate_bi32} @@ -126,19 +137,23 @@ %define separate_biarch 1 %define separate_biarch_suffix -64bit %endif + %ifarch x86_64 ia64 s390x alpha ppc64 # 64-bit is primary build target %define build_primary_64bit 1 %else %define build_primary_64bit 0 %endif + %define biarch_libjava 0 + # COMMON-BEGIN %define biarch_targets x86_64 s390x powerpc64 powerpc + Url: http://gcc.gnu.org/ License: GPL Version: 4.1.2_20070115 -Release: 13 +Release: 14 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') %define binsuffix -4.1 @@ -148,6 +163,7 @@ %define versionspecificlibs 0 %endif # COMMON-END + %if 0%{?!building_libjava:1} Requires: binutils glibc-devel Requires: cpp41 = %{version}-%{release} @@ -155,6 +171,7 @@ Obsoletes: gcc41-mudflap Requires: libmudflap >= %{version}-%{release} %endif + # COMMON-BEGIN Group: System/Libraries AutoReqProv: on @@ -256,6 +273,7 @@ Patch300: gcc-4.1.0-power6.diff Patch301: nov341254-pic.diff Patch302: nov341254-altivec.diff + %if "%{gcc_target_arch}" == "avr" # Joerg Wunsch places his cross-avr-gcc-patches there: # http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/avr-gcc/files @@ -267,6 +285,7 @@ Patch1004: cross-avr-patch-newdevices.patch Patch1005: cross-avr-patch-zz-atmega256x.patch %endif + Summary: Java Runtime Library for gcc Group: System/Libraries %if "41" != "" @@ -320,6 +339,8 @@ This package contains the java bytecode interpreter gij and related tools. +# PACKAGE-BEGIN +# PACKAGE-BEGIN %package -n libffi41 License: GPL Summary: Foreign Function Interface library @@ -347,9 +368,6 @@ Provides: g-wrap:/usr/lib/libffi.so.4 %description -n libffi41-32bit -This is a re-packaged binary rpm. For the package source, please look -for the source of the package without the "32bit" ending - A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language. %post -n libffi41-32bit @@ -369,9 +387,6 @@ Provides: g-wrap:/usr/lib/libffi.so.4 %description -n libffi41-64bit -This is a re-packaged binary rpm. For the package source, please look -for the source of the package without the "64bit" ending - A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language. %post -n libffi41-64bit @@ -380,6 +395,7 @@ %postun -n libffi41-64bit /sbin/ldconfig # PACKAGE-END + # PACKAGE-BEGIN # PACKAGE-BEGIN @@ -392,6 +408,9 @@ %description -n libffi41-devel A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language. +# PACKAGE-END +# PACKAGE-BEGIN +# PACKAGE-BEGIN %package -n libffi41-devel-32bit License: GPL Summary: Foreign Function Interface library development files @@ -400,10 +419,10 @@ Requires: libffi41-32bit >= %{version}-%{release} %description -n libffi41-devel-32bit -This is a re-packaged binary rpm. For the package source, please look -for the source of the package without the "32bit" ending - A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language. +# PACKAGE-END +# PACKAGE-BEGIN +# PACKAGE-BEGIN %package -n libffi41-devel-64bit License: GPL Summary: Foreign Function Interface library development files @@ -412,10 +431,8 @@ Requires: libffi41-64bit >= %{version}-%{release} %description -n libffi41-devel-64bit -This is a re-packaged binary rpm. For the package source, please look -for the source of the package without the "64bit" ending - A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language. +# PACKAGE-END %package -n gcc41-testresults License: GPL @@ -426,7 +443,12 @@ Results from running the gcc and target library testsuites. +# COMMON-BEGIN +# Define the canonical target and host architecture +# %gcc_target_arch is supposed to be the full target triple +# %TARGET_ARCH is the canonicalized CPU part +# %CONFIGURE_TARGET is the target triple used for --target= %if 0%{?gcc_target_arch:1} %define CONFIGURE_TARGET %{gcc_target_arch} %define TARGET_ARCH %(echo %{gcc_target_arch} | cut -d - -f 1 | sed -e "s/i.86/i586/;s/ppc/powerpc/") @@ -437,15 +459,20 @@ %define TARGET_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/") %endif %define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/") + %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac) + %ifarch ppc %define GCCDIST powerpc64-suse-linux %else %define GCCDIST %{HOST_ARCH}-suse-linux %endif + %define libsubdir %{_libdir}/gcc/%{GCCDIST}/%{gcc_version} %define gxxinclude %{_prefix}/include/c++/%{gcc_version} + # COMMON-END + # Versionspecific directories %define versmainlibdir %{libsubdir} %define versmainlibdirbi32 %{libsubdir}/32 @@ -458,6 +485,7 @@ %ifarch ppc64 %define versnoflibdir %{libsubdir}/32/nof %endif + # If we use versionspecific libs, they end in libsubdir %if %{versionspecificlibs} %define mainlibdir %{libsubdir} @@ -477,6 +505,7 @@ %define mainlibdirbi64 %{_prefix}/lib64 %define noflibdir %{_prefix}/lib/nof %endif + # Now define a few macros that make it easy to package libs and # related files just to the right package, without caring for the # exact path the files are in. @@ -535,6 +564,7 @@ %endif %endif %endif + %if %{build_nof} %define versmainlib() %{versmainlibdir}/%1\ %{versnoflibdir}/%1\ @@ -587,6 +617,7 @@ %endif %endif %endif + # COMMON-BEGIN %prep @@ -684,6 +715,7 @@ %patch300 %patch301 -p1 %patch302 -p1 + %if "%{gcc_target_arch}" == "avr" %patch1000 %patch1001 @@ -696,8 +728,10 @@ %build # Avoid conflict with commercial libjawt.so sed -i -e 's/libjawt/libgcjawt/g' libjava/Makefile.{am,in} + # Avoid rebuilding of generated files contrib/gcc_update --touch + rm -rf obj-%{GCCDIST} mkdir obj-%{GCCDIST} cd obj-%{GCCDIST} @@ -719,6 +753,7 @@ %endif # Replace 2 spaces by one finally RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/ / /g'` + languages=c,c++,objc %if %{build_fortran} languages=$languages,fortran @@ -736,6 +771,7 @@ %if 0%{?gcc_target_arch:1} languages=c,c++ %endif + J=%{?jobs:%jobs} if test -z "$J"; then J=$(getconf _NPROCESSORS_CONF) @@ -751,26 +787,32 @@ JL=1 fi PARALLEL="-j$J -l$JL" + # we don't want some miscompiles in the testsuite, or some fault in # the compiler to kill the machine. Hence we limit the amount of memory # by the physical RAM plus half of swap #MEM=$(free -m | awk '/^Mem:/ {print $2}') #SWAP=$(free -m | awk '/^Swap:/ {print $2}') #ulimit -v $(((MEM + SWAP/2)*1024)) + # In general we want to ship release checking enabled compilers # and run BETA with checking enabled. #ENABLE_CHECKING=--enable-checking ENABLE_CHECKING="--enable-checking=release" + %if "%{name}" != "gcc41" export PATH=/opt/cross/bin:$PATH %endif + # Work around tail/head -1 changes export _POSIX2_VERSION=199209 + # configure tries to parse include/features.h to detect # if glibc supports SSP. When cross compiling we would need # to install a cross glibc, which we don't, or make the whole # thing point to the native glibc, which is in /, hence the # --with-sysroot=/ + %if %{build_ada} # Using the host gnatmake like # CC="gcc%{hostsuffix}" GNATBIND="gnatbind%{hostsuffix}" @@ -850,7 +892,9 @@ --with-long-double-128 \ %endif --host=%{GCCDIST} + # COMMON-END + # Only run profiled bootstrap on archs where it works #%ifarch %ix86 x86_64 ppc ppc64 ia64 #make profiledbootstrap BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL @@ -875,6 +919,7 @@ manpath=%{_mandir}:%{_infodir} export manpath %endif + cd obj-%{GCCDIST} # Work around tail/head -1 changes export _POSIX2_VERSION=199209 @@ -887,6 +932,7 @@ make install DESTDIR=$RPM_BUILD_ROOT %endif mkdir -p $RPM_BUILD_ROOT%{_libdir} + # Remove some useless .la files for lib in libobjc libgfortran libgfortranbegin libmudflap libmudflapth \ libstdc++ libsupc++; do @@ -907,6 +953,7 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/lib64/libffi.la %endif %endif + %if %{biarch} %if %{build_primary_64bit} mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib @@ -914,6 +961,7 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib64 %endif %endif + # Move shared libs around %if %{versionspecificlibs} %else @@ -933,7 +981,9 @@ %endif done %endif + rm -f $RPM_BUILD_ROOT%{_prefix}/bin/c++%{binsuffix} + %if %{biarch} %if %{build_primary_64bit} # move around some libs that end in wrong paths @@ -962,6 +1012,7 @@ popd %endif %endif + # Remove some crap from the .la files: for l in `find $RPM_BUILD_ROOT -name '*.la'`; do echo "changing $l" @@ -986,6 +1037,7 @@ perl -pi -e "s|^(.*elf_i386.*)|\1 %{m32:-rpath=/opt/gcc33/lib} %{\!m32:-rpath=/opt/gcc33/lib64}|;" $RPM_BUILD_ROOT%{_prefix}/lib64/gcc/x86_64-suse-linux/3.3/specs %endif %endif + %if %{run_tests} cp `find . -name "*.sum"` ../testresults/ cp `find . -name "*.log" \! -name "config.log" |grep -v 'acats/tests' ` ../testresults/ @@ -1026,8 +1078,10 @@ find $RPM_BUILD_ROOT -name libgcj.a -o -name lib-gnu-java-awt-peer-gtk.a \ -o -name libgjsmalsa.a \ -o -name libgij.a -o -name libgcjawt.a | xargs rm -f + find $RPM_BUILD_ROOT -name libgcj.spec | xargs \ sed -i -e 's/lib: /&%%{static:%%eJava programs cannot be linked statically}/' + mv $RPM_BUILD_ROOT%{libsubdir}/include/libffi/ffitarget.h $RPM_BUILD_ROOT%{_prefix}/include/ rm -r $RPM_BUILD_ROOT%{libsubdir}/include/libffi %endif @@ -1059,11 +1113,13 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/lib64/libiberty.a %endif %endif + # Move mudflap header %if 0%{!?building_libjava:1} mv $RPM_BUILD_ROOT/usr/include/mf-runtime.h $RPM_BUILD_ROOT%{libsubdir}/include/ rm $RPM_BUILD_ROOT%{_mandir}/man1/jv-convert%{binsuffix}.1 %endif + # For building libjava only we need to delete other manpages %if 0%{?building_libjava:1} rm $RPM_BUILD_ROOT%{_prefix}/bin/addr2name.awk%{binsuffix} @@ -1073,6 +1129,7 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/jcf-dump%{binsuffix}.1 rm $RPM_BUILD_ROOT%{_mandir}/man1/jv-scan%{binsuffix}.1 %endif + # Delete some files... %if %{versionspecificlibs} %if %{build_libjava} @@ -1083,6 +1140,7 @@ rm $RPM_BUILD_ROOT%{_infodir}/*.info* rm $RPM_BUILD_ROOT%{_prefix}/share/locale/*/LC_MESSAGES/*.mo %endif + %if %{build_java} %if %{build_libjava} @@ -1183,6 +1241,7 @@ %defattr(-,root,root) %mainlib libffi.so.* + %if %{separate_biarch} %files -n libffi41%{separate_biarch_suffix} @@ -1199,6 +1258,7 @@ %mainlib libffi.a + %if %{separate_biarch} %files -n libffi41-devel%{separate_biarch_suffix} @@ -1210,6 +1270,7 @@ %endif %endif %endif + %if %{run_tests} %files -n gcc41-testresults ++++++ change_spec ++++++ --- /var/tmp/diff_new_pack.wbuh3y/_old 2010-04-30 01:32:38.000000000 +0200 +++ /var/tmp/diff_new_pack.wbuh3y/_new 2010-04-30 01:32:38.000000000 +0200 @@ -106,7 +106,7 @@ fi ## non-icecream cross compilers. export outfile - for arch in avr; do + for arch in ; do cross_arch=$arch sh micro-cross.spec.in > cross-$arch-gcc.spec test -f gcc*.changes && ln -f gcc*.changes cross-$arch-gcc.changes done ++++++ cross-avr-patch-dwarf.patch ++++++ --- /var/tmp/diff_new_pack.wbuh3y/_old 2010-04-30 01:32:38.000000000 +0200 +++ /var/tmp/diff_new_pack.wbuh3y/_new 2010-04-30 01:32:38.000000000 +0200 @@ -1,10 +1,10 @@ --- gcc/config/avr/avr.h.orig 2006-04-13 15:31:19.000000000 +0200 +++ gcc/config/avr/avr.h 2006-04-13 16:23:16.000000000 +0200 -@@ -892,3 +892,7 @@ - #define ZERO_REGNO 1 +@@ -872,3 +872,7 @@ + #define DWARF2_DEBUGGING_INFO 1 -+#define DWARF2_DEBUGGING_INFO 1 - #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG + #define OBJECT_FORMAT_ELF + +/* Offset from the frame pointer register value to the top of the stack. */ +#define FRAME_POINTER_CFA_OFFSET(FNDECL) 0 ++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org