Mailinglist Archive: opensuse-commit (832 mails)
| < Previous | Next > |
commit gcc44 for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Fri, 12 Feb 2010 15:29:13 +0100
- Message-id: <20100212142914.1149C2029A@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package gcc44 for openSUSE:Factory
checked in at Fri Feb 12 15:29:13 CET 2010.
--------
--- gcc44/cross-avr-gcc44.changes 2010-01-11 10:51:52.000000000 +0100
+++ /mounts/work_src_done/STABLE/gcc44/cross-avr-gcc44.changes 2010-02-12
14:46:43.000000000 +0100
@@ -1,0 +2,10 @@
+Fri Feb 12 14:44:44 CET 2010 - rguenther@xxxxxxx
+
+- Split libffi44 build to a separate spec file.
+
+-------------------------------------------------------------------
+Sat Jan 16 16:42:37 CET 2010 - rguenther@xxxxxxx
+
+- Update to gcc-4_4-branch head (r155966).
+
+-------------------------------------------------------------------
cross-hppa-gcc-icecream-backend.changes: same change
cross-i386-gcc-icecream-backend.changes: same change
cross-ia64-gcc-icecream-backend.changes: same change
cross-ppc-gcc-icecream-backend.changes: same change
cross-ppc64-gcc-icecream-backend.changes: same change
cross-s390-gcc-icecream-backend.changes: same change
cross-s390x-gcc-icecream-backend.changes: same change
cross-spu-gcc-static.changes: same change
cross-spu-gcc.changes: same change
cross-x86_64-gcc-icecream-backend.changes: same change
gcc44.changes: same change
New Changes file:
--- /dev/null 2009-09-30 08:50:26.000000000 +0200
+++ /mounts/work_src_done/STABLE/gcc44/libffi44.changes 2010-02-12
14:46:43.000000000 +0100
@@ -0,0 +1,291 @@
+-------------------------------------------------------------------
+Fri Feb 12 14:44:44 CET 2010 - rguenther@xxxxxxx
+
+- Split libffi44 build to a separate spec file.
+
+-------------------------------------------------------------------
+Sat Jan 16 16:42:37 CET 2010 - rguenther@xxxxxxx
+
+- Update to gcc-4_4-branch head (r155966).
+
+-------------------------------------------------------------------
+Mon Jan 11 10:45:53 CET 2010 - rguenther@xxxxxxx
+
+- Update to gcc-4_4-branch head (r155802).
+
+-------------------------------------------------------------------
+Wed Dec 16 10:36:09 CET 2009 - jengelh@xxxxxxxxxx
+
+- package documentation as noarch
+
+-------------------------------------------------------------------
+Sat Dec 12 17:35:22 CET 2009 - jengelh@xxxxxxxxxx
+
+- add baselibs.conf as a source
+- add definitions for building on SPARC
+
+-------------------------------------------------------------------
+Tue Nov 24 14:40:33 CET 2009 - rguenther@xxxxxxx
+
+- Update to gcc-4_4-branch head (r154496). [bnc#558005]
+- Build ada with gcc43 packages to work around the issues caused
+ by the loss of program-transform-name.diff.
+
+-------------------------------------------------------------------
+Tue Nov 24 11:06:12 CET 2009 - rguenther@xxxxxxx
+
+- Re-instantiate lost program-transform-name.diff patch.
+
+-------------------------------------------------------------------
+Wed Nov 4 11:21:39 CET 2009 - rguenther@xxxxxxx
+
+- Update to gcc-4_4-branch head (r153890).
+ * includes GCC 4.4.2 release.
+
+-------------------------------------------------------------------
+Tue Nov 3 19:13:10 UTC 2009 - coolo@xxxxxxxxxx
+
+- updated patches to apply with fuzz=0
+
+-------------------------------------------------------------------
+Thu Oct 8 13:51:10 CEST 2009 - rguenther@xxxxxxx
+
+- Add patch for gjar crashes with -M. [bnc#544794]
+
+-------------------------------------------------------------------
+Mon Aug 17 13:48:33 CEST 2009 - rguenther@xxxxxxx
+
+- Update to gcc-4_4-branch head (r150839).
+ * Pulls fixes for PR41019, PR41033 and PR40924 miscompiles.
+- Change boehm-gc heuristic for stack bottom detection on arm.
+
+-------------------------------------------------------------------
+Thu Aug 13 11:06:47 CEST 2009 - rguenther@xxxxxxx
+
+- Fix arm header install.
+- Use -O2 for STAGE1_CFLAGS to fix arm build.
+
+-------------------------------------------------------------------
+Mon Aug 3 11:33:03 CEST 2009 - rguenther@xxxxxxx
+
+- Package cpuid.h. [bnc#527433]
+
+-------------------------------------------------------------------
+Wed Jul 22 16:53:29 CEST 2009 - rguenther@xxxxxxx
+
+- Update to gcc-4_4-branch head (r149935).
+ * Includes GCC 4.4.1 release with various bugfixes.
+- Disable -Wl,-as-needed as this breaks libgcj.
+
+-------------------------------------------------------------------
+Thu Jul 2 14:40:04 CEST 2009 - rguenther@xxxxxxx
+
+- Update to gcc-4_4-branch head (r149173). [bnc#516424]
+
+-------------------------------------------------------------------
+Thu Jun 4 10:54:05 CEST 2009 - rguenther@xxxxxxx
+
+- Update to gcc-4_4-branch head (r148163).
+
+-------------------------------------------------------------------
+Fri May 29 14:26:39 CEST 2009 - rguenther@xxxxxxx
+
+- Update to gcc-4_4-branch head (r147974).
+
+-------------------------------------------------------------------
+Tue May 19 14:37:40 CEST 2009 - rguenther@xxxxxxx
+
+- Update to gcc-4_4-branch head (r147703).
+
+-------------------------------------------------------------------
+Fri May 15 16:13:57 CEST 2009 - rguenther@xxxxxxx
+
+- Adjust cross specs and generation.
+
+-------------------------------------------------------------------
+Fri May 8 10:09:46 CEST 2009 - rguenther@xxxxxxx
+
+- Update to gcc-4_4-branch head (r147285). [bnc#501751]
+- Disable GRAPHITE support for host architectures other than
+ %ix86, x86_64, ppc, ppc64, s390, s390x and ia64.
+
+-------------------------------------------------------------------
+Thu May 7 16:29:11 CEST 2009 - rguenther@xxxxxxx
+
+- Update to gcc-4_4-branch head (r147237).
+- Enable icecream backends and cross compilers.
+
+-------------------------------------------------------------------
+Mon Apr 20 17:07:59 CEST 2009 - rguenther@xxxxxxx
+
+- Update to GCC 4.4.0 release.
+
+-------------------------------------------------------------------
+Sat Apr 18 14:45:46 CEST 2009 - rguenther@xxxxxxx
+
+- Adjust Ada BuildRequires check.
+
+-------------------------------------------------------------------
+Tue Apr 14 13:42:06 CEST 2009 - rguenther@xxxxxxx
+
+- Update to GCC 4.4.0 RC1.
+
+-------------------------------------------------------------------
+Tue Mar 31 12:00:48 CEST 2009 - rguenther@xxxxxxx
+
+- Update to gcc-4_4-branch head (r145337).
+- Switch to release-checking.
+
+-------------------------------------------------------------------
+Mon Mar 23 10:54:07 CET 2009 - rguenther@xxxxxxx
+
+- Update to SVN trunk head (r145004).
+
+-------------------------------------------------------------------
+Mon Mar 16 14:49:31 CET 2009 - rguenther@xxxxxxx
+
+- Update to SVN trunk head (r144881).
+
+-------------------------------------------------------------------
+Thu Feb 26 11:30:35 CET 2009 - rguenther@xxxxxxx
+
+- Update to SVN trunk head (r144446).
+- Updates classpath to 0.98 release. [bnc#457169]
+- Add patch for PR39272.
+
+-------------------------------------------------------------------
+Thu Feb 19 11:24:56 CET 2009 - rguenther@xxxxxxx
+
+- Update to SVN trunk head (r144292).
+
+-------------------------------------------------------------------
+Wed Feb 11 15:35:38 CET 2009 - rguenther@xxxxxxx
+
+- Update to SVN trunk head (r144122).
+- Enable LFS support for 32bit host binaries.
+- Set default cpu and tuning for x86_64 and ix86. Filter RPM_OPT_FLAGS.
+
+-------------------------------------------------------------------
+Fri Feb 6 16:37:28 CET 2009 - rguenther@xxxxxxx
+
+- Update baselibs.conf.
+
+-------------------------------------------------------------------
+Wed Feb 4 15:17:50 CET 2009 - rguenther@xxxxxxx
+
+- Update to SVN trunk head (r143983).
+- Forward-port -Wunprototyped-calls.
+
+-------------------------------------------------------------------
+Wed Jan 28 13:36:48 CET 2009 - rguenther@xxxxxxx
+
+- Update to SVN trunk head (143725).
+- Add patch to fix PR38977.
+- Forward-port SUSE local changes from gcc43 package.
+
+-------------------------------------------------------------------
+Fri Jan 23 00:02:21 CET 2009 - rguenther@xxxxxxx
+
+- Update to SVN trunk head (143577).
+
+-------------------------------------------------------------------
+Fri Jan 9 11:42:24 CET 2009 - rguenther@xxxxxxx
+
+- Properly package x86intrin.h.
+
+-------------------------------------------------------------------
+Thu Jan 8 17:18:11 CET 2009 - rguenther@xxxxxxx
++++ 94 more lines (skipped)
++++ between /dev/null
++++ and /mounts/work_src_done/STABLE/gcc44/libffi44.changes
--- gcc44/libgcj44.changes 2010-01-11 10:51:52.000000000 +0100
+++ /mounts/work_src_done/STABLE/gcc44/libgcj44.changes 2010-02-12
14:46:43.000000000 +0100
@@ -1,0 +2,10 @@
+Fri Feb 12 14:44:44 CET 2010 - rguenther@xxxxxxx
+
+- Split libffi44 build to a separate spec file.
+
+-------------------------------------------------------------------
+Sat Jan 16 16:42:37 CET 2010 - rguenther@xxxxxxx
+
+- Update to gcc-4_4-branch head (r155966).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
gcc-4.4.2-20100111.tar.bz2
New:
----
gcc-4.4.2-20100116.tar.bz2
libffi44.changes
libffi44.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cross-avr-gcc44.spec ++++++
--- /var/tmp/diff_new_pack.pN5sGQ/_old 2010-02-12 15:28:40.000000000 +0100
+++ /var/tmp/diff_new_pack.pN5sGQ/_new 2010-02-12 15:28:40.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package cross-avr-gcc44 (Version 4.4.2_20100111)
+# spec file for package cross-avr-gcc44 (Version 4.4.2_20100116)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -64,7 +64,7 @@
# COMMON-BEGIN
%define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
Url: http://gcc.gnu.org/
-Version: 4.4.2_20100111
+Version: 4.4.2_20100116
Release: 1
%define gcc_version %(echo %version | sed 's/_.*//')
%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2)
@@ -107,6 +107,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
cross-hppa-gcc-icecream-backend.spec: same change
cross-i386-gcc-icecream-backend.spec: same change
cross-ia64-gcc-icecream-backend.spec: same change
cross-ppc-gcc-icecream-backend.spec: same change
cross-ppc64-gcc-icecream-backend.spec: same change
cross-s390-gcc-icecream-backend.spec: same change
cross-s390x-gcc-icecream-backend.spec: same change
cross-spu-gcc-static.spec: same change
cross-spu-gcc.spec: same change
cross-x86_64-gcc-icecream-backend.spec: same change
++++++ gcc44.spec ++++++
--- /var/tmp/diff_new_pack.pN5sGQ/_old 2010-02-12 15:28:41.000000000 +0100
+++ /var/tmp/diff_new_pack.pN5sGQ/_new 2010-02-12 15:28:41.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package gcc44 (Version 4.4.2_20100111)
+# spec file for package gcc44 (Version 4.4.2_20100116)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -25,7 +25,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
@@ -36,12 +36,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
@@ -66,8 +66,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
@@ -117,14 +119,14 @@
# COMMON-BEGIN
%define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
Url: http://gcc.gnu.org/
-Version: 4.4.2_20100111
+Version: 4.4.2_20100116
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-4]\.[0-6]//' | sed
's/_/-/')
%define binsuffix -4.4
# COMMON-END
-%if 0%{?!building_libjava:1}
+%if !0%{?building_libjava:1}%{?building_libffi:1}
Requires: binutils glibc-devel
Requires: cpp44 = %{version}-%{release}
Requires: libgcc%{libgcc_s} >= %{version}-%{release}
@@ -173,6 +175,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
@@ -1187,7 +1190,6 @@
%description -n gcc44-gij
This package contains the java bytecode interpreter gij and related tools.
-
%package -n libffi44
License: BSD3c
Summary: Foreign Function Interface library
@@ -1682,6 +1684,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. We rely on
# a good stage1 host compiler, so use -O2 for speed. Arm needs it
# for correctness even (that's of course a bug).
@@ -1701,6 +1706,7 @@
mkdir ../testresults
../contrib/test_summary > ../testresults/test_summary.txt
%endif
+%endif
%install
export NO_BRP_CHECK_BYTECODE_VERSION=true
@@ -1708,9 +1714,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)'
@@ -1734,6 +1742,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
@@ -1750,6 +1759,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
@@ -1866,6 +1876,7 @@
%endif
%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
@@ -1903,6 +1914,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++ \
@@ -1910,6 +1922,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
@@ -1932,7 +1945,7 @@
rm -rf $RPM_BUILD_ROOT%{libsubdir}/include-fixed/sys
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}
@@ -1946,7 +1959,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 \
@@ -1959,18 +1972,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 -f $RPM_BUILD_ROOT%{_libdir}/logging.properties
+rm -rf $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
-# 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}
@@ -1999,6 +2015,7 @@
rm -f $RPM_BUILD_ROOT%{_prefix}/lib64/libiberty.a
%endif
%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*
@@ -2618,6 +2635,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 libffi44
%defattr(-,root,root)
++++++ libffi44.spec ++++++
++++ 936 lines (skipped)
++++++ libgcj44.spec ++++++
--- /var/tmp/diff_new_pack.pN5sGQ/_old 2010-02-12 15:28:41.000000000 +0100
+++ /var/tmp/diff_new_pack.pN5sGQ/_new 2010-02-12 15:28:41.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package libgcj44 (Version 4.4.2_20100111)
+# spec file for package libgcj44 (Version 4.4.2_20100116)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -42,7 +42,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
@@ -53,12 +53,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
@@ -83,8 +83,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
@@ -134,14 +136,14 @@
# COMMON-BEGIN
%define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
Url: http://gcc.gnu.org/
-Version: 4.4.2_20100111
+Version: 4.4.2_20100116
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-4]\.[0-6]//' | sed
's/_/-/')
%define binsuffix -4.4
# COMMON-END
-%if 0%{?!building_libjava:1}
+%if !0%{?building_libjava:1}%{?building_libffi:1}
Requires: binutils glibc-devel
Requires: cpp44 = %{version}-%{release}
Requires: libgcc%{libgcc_s} >= %{version}-%{release}
@@ -190,6 +192,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
@@ -296,7 +299,6 @@
%description -n gcc44-gij
This package contains the java bytecode interpreter gij and related tools.
-
%package -n libffi44
License: BSD3c
Summary: Foreign Function Interface library
@@ -791,6 +793,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. We rely on
# a good stage1 host compiler, so use -O2 for speed. Arm needs it
# for correctness even (that's of course a bug).
@@ -810,6 +815,7 @@
mkdir ../testresults
../contrib/test_summary > ../testresults/test_summary.txt
%endif
+%endif
%install
export NO_BRP_CHECK_BYTECODE_VERSION=true
@@ -817,9 +823,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)'
@@ -843,6 +851,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
@@ -859,6 +868,7 @@
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib64
%endif
%endif
+# LIBFFI-DELETE-BEGIN
# move shared libs from versionspecific dir to main libdir
for libname in \
%if 0%{?building_libjava:1}
@@ -909,6 +919,7 @@
ln -s libgcj.so.%{gcj_sover} $RPM_BUILD_ROOT%{mainlibdirbi}/libgcj_bc.so.1
%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
@@ -946,6 +957,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++ \
@@ -953,6 +965,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
@@ -975,7 +988,7 @@
rm -rf $RPM_BUILD_ROOT%{libsubdir}/include-fixed/sys
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}
@@ -989,7 +1002,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 \
@@ -1002,18 +1015,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 -f $RPM_BUILD_ROOT%{_libdir}/logging.properties
+rm -rf $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
-# 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}
@@ -1042,6 +1058,7 @@
rm -f $RPM_BUILD_ROOT%{_prefix}/lib64/libiberty.a
%endif
%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*
@@ -1212,6 +1229,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 libffi44
%defattr(-,root,root)
++++++ change_spec ++++++
--- /var/tmp/diff_new_pack.pN5sGQ/_old 2010-02-12 15:28:41.000000000 +0100
+++ /var/tmp/diff_new_pack.pN5sGQ/_new 2010-02-12 15:28:41.000000000 +0100
@@ -63,10 +63,33 @@
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 )
# disabled: mips, sparc, alpha, arm
if test "$do_icecream" = 1 ; then
++++++ gcc-4.4.2-20100111.tar.bz2 -> gcc-4.4.2-20100116.tar.bz2 ++++++
gcc44/gcc-4.4.2-20100111.tar.bz2
/mounts/work_src_done/STABLE/gcc44/gcc-4.4.2-20100116.tar.bz2 differ: char 11,
line 1
++++++ gcc.spec.in ++++++
--- /var/tmp/diff_new_pack.pN5sGQ/_old 2010-02-12 15:28:41.000000000 +0100
+++ /var/tmp/diff_new_pack.pN5sGQ/_new 2010-02-12 15:28:41.000000000 +0100
@@ -28,7 +28,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,13 +40,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}
@@ -74,8 +74,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
@@ -132,7 +134,7 @@
%define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
URL: http://gcc.gnu.org/
-Version: 4.4.2_20100111
+Version: 4.4.2_20100116
Release: 1
%define gcc_version %(echo %version | sed 's/_.*//')
%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2)
@@ -140,7 +142,7 @@
%define binsuffix -4.4
# COMMON-END
-%if 0%{?!building_libjava:1}
+%if !0%{?building_libjava:1}%{?building_libffi:1}
Requires: binutils glibc-devel
Requires: cpp@base_ver@ = %{version}-%{release}
Requires: libgcc%{libgcc_s} >= %{version}-%{release}
@@ -191,6 +193,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
@@ -668,7 +671,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
@@ -1113,6 +1116,9 @@
# COMMON-END
+%if 0%{?building_libffi:1}
+make all-target-libffi $PARALLEL
+%else
# Only run profiled bootstrap on archs where it works. We rely on
# a good stage1 host compiler, so use -O2 for speed. Arm needs it
# for correctness even (that's of course a bug).
@@ -1132,6 +1138,7 @@
mkdir ../testresults
../contrib/test_summary > ../testresults/test_summary.txt
%endif
+%endif
%install
export NO_BRP_CHECK_BYTECODE_VERSION=true
@@ -1139,9 +1146,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)'
@@ -1165,6 +1174,7 @@
rm $RPM_BUILD_ROOT%{libsubdir}/jvgenmain
%endif
%endif
+%endif
# Remove some useless .la files
for lib in libobjc libgfortran libgfortranbegin libmudflap libmudflapth \
@@ -1184,6 +1194,7 @@
%endif
%endif
+# LIBFFI-DELETE-BEGIN
# LIBJAVA-DELETE-BEGIN
%if %{build_cp}
# Merge multilib c++config.h to allow omitting the duplicate and
@@ -1303,6 +1314,7 @@
%endif
%endif
# LIBJAVA-DELETE-END
+# LIBFFI-DELETE-END
%if %{build_ada}
mv $RPM_BUILD_ROOT%{libsubdir}/adalib/lib*-*.so $RPM_BUILD_ROOT%{_libdir}
@@ -1344,6 +1356,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++ \
@@ -1351,6 +1364,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
@@ -1374,7 +1388,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}
@@ -1389,7 +1403,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 \
@@ -1404,20 +1418,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 -f $RPM_BUILD_ROOT%{_libdir}/logging.properties
+rm -rf $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
-
-# 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
@@ -1446,6 +1464,7 @@
%endif
%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*
@@ -1998,7 +2017,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.*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |