[arch-commits] CVS update of extra/devel/gcc-gcj (PKGBUILD gcc_pure64.patch)

[andyrtr at archlinux.org]

    Date: Sunday, May 20, 2007 @ 13:32:02
  Author: andyrtr
    Path: /home/cvs-extra/extra/devel/gcc-gcj

Modified: PKGBUILD (1.22 -> 1.23) gcc_pure64.patch (1.1 -> 1.2)

x86_64 prepared; pure64 patch fixed following CLFS


------------------+
 PKGBUILD         |   10 ++++++++--
 gcc_pure64.patch |   32 ++++++++++++++++----------------
 2 files changed, 24 insertions(+), 18 deletions(-)


Index: extra/devel/gcc-gcj/PKGBUILD
diff -u extra/devel/gcc-gcj/PKGBUILD:1.22 extra/devel/gcc-gcj/PKGBUILD:1.23
--- extra/devel/gcc-gcj/PKGBUILD:1.22	Sun May 20 11:54:51 2007
+++ extra/devel/gcc-gcj/PKGBUILD	Sun May 20 13:32:02 2007
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.22 2007/05/20 15:54:51 jgc Exp $
+# $Id: PKGBUILD,v 1.23 2007/05/20 17:32:02 andyrtr Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 # There's a circular dependency between gcc-gcj and eclipse-ecj. There is no 
@@ -14,13 +14,19 @@
 url="http://gcc.gnu.org"
 depends=('gcc>=4.2.0-2' 'gtk2>=2.10.12' 'file' 'libsm' 'libxtst' 'alsa-lib' 'eclipse-ecj>=3.2.2-2')
 makedepends=('texinfo' 'pkgconfig' 'xulrunner')
-options=('nolibtool')
+options=(!libtool)
 _javasnap=4.3-20070511
 source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++}-${pkgver}.tar.bz2
 	http://www.archlinux.org/~jgc/gcc/gcc-ecj-20070516.tar.bz2
 	gcc_pure64.patch
 	libjava-disable-static.dpatch
 	libjava-sjlj.dpatch)
+md5sums=('de693d0917d710c3de41297d574470f5'
+         'f30a13d9d33693f4cd6452318fa80ff3'
+         '02494fa9a5b7b6dbc349a19a1bda78b8'
+         '8fc86e4c4d1f4ec8b226307d39fbd9e3'
+         'bef24466abe00c4e655ac074cedf0c29'
+         'afe3541abf5ce163223f94ccdbc66e30')
 
 build() {
   [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh ]
Index: extra/devel/gcc-gcj/gcc_pure64.patch
diff -u extra/devel/gcc-gcj/gcc_pure64.patch:1.1 extra/devel/gcc-gcj/gcc_pure64.patch:1.2
--- extra/devel/gcc-gcj/gcc_pure64.patch:1.1	Fri Feb 16 14:10:45 2007
+++ extra/devel/gcc-gcj/gcc_pure64.patch	Sun May 20 13:32:02 2007
@@ -1,20 +1,20 @@
-diff -Naur gcc-4.1.0.orig/gcc/config/i386/linux64.h gcc-4.1.0/gcc/config/i386/linux64.h
---- gcc-4.1.0.orig/gcc/config/i386/linux64.h	2005-08-10 13:53:01.000000000 -0400
-+++ gcc-4.1.0/gcc/config/i386/linux64.h	2006-03-01 01:13:54.000000000 -0500
-@@ -60,8 +60,8 @@
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
--      %{m32:%{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
--      %{!m32:%{!dynamic-linker:-dynamic-linker /lib64/ld-linux-x86-64.so.2}}} \
-+      %{m32:%{!dynamic-linker:-dynamic-linker /lib32/ld-linux.so.2}} \
-+      %{!m32:%{!dynamic-linker:-dynamic-linker /lib/ld-linux-x86-64.so.2}}} \
-     %{static:-static}}"
+diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h
+--- gcc-4.2.0.orig/gcc/config/i386/linux64.h	2007-05-16 19:21:19.000000000 -0400
++++ gcc-4.2.0/gcc/config/i386/linux64.h	2007-05-18 17:04:05.000000000 -0400
+@@ -49,8 +49,8 @@
+    When the -shared link option is used a final link is not being
+    done.  */
  
- /* Similar to standard Linux, but adding -ffast-math support.  */
-diff -Naur gcc-4.1.0.orig/gcc/config/i386/t-linux64 gcc-4.1.0/gcc/config/i386/t-linux64
---- gcc-4.1.0.orig/gcc/config/i386/t-linux64	2005-08-10 13:53:01.000000000 -0400
-+++ gcc-4.1.0/gcc/config/i386/t-linux64	2006-03-01 01:13:54.000000000 -0500
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
++#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
+ 
+ #undef	LINK_SPEC
+ #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
+diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64
+--- gcc-4.2.0.orig/gcc/config/i386/t-linux64	2007-05-16 19:21:19.000000000 -0400
++++ gcc-4.2.0/gcc/config/i386/t-linux64	2007-05-18 17:04:36.000000000 -0400
 @@ -6,7 +6,7 @@
  
  MULTILIB_OPTIONS = m64/m32