rpms/gcc/devel gcc43-libjava-gcjpath.patch, NONE, 1.1 gcc43.spec, 1.1, 1.2

[Jakub Jelinek (jakub)]

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv477

Modified Files:
	gcc43.spec 
Added Files:
	gcc43-libjava-gcjpath.patch 
Log Message:
4.3.0-0.2

gcc43-libjava-gcjpath.patch:

--- NEW FILE gcc43-libjava-gcjpath.patch ---
--- libjava/classpath/configure.ac	(revision 130691)
+++ libjava/classpath/configure.ac	(working copy)
@@ -294,14 +294,14 @@ CLASSPATH_TOOLEXECLIBDIR
 dnl -----------------------------------------------------------
 dnl Sets the native libraries installation dir
 dnl -----------------------------------------------------------
-dnl GCJ LOCAL: default to ${toolexeclibdir}/gcj-${gcc_version}-${libgcj_soversion}
+dnl GCJ LOCAL: default to ${toolexeclibdir}/gcj-${gcc_version}
 AC_ARG_WITH([native-libdir],
 	    [AS_HELP_STRING(--with-native-libdir,sets the installation directory for native libraries [default='${libdir}/${PACKAGE}'])],
 	    [
 	     nativeexeclibdir=${withval}
 	    ],
 	    [
-	     nativeexeclibdir='${toolexeclibdir}/gcj-'`cat ${srcdir}/../../gcc/BASE-VER`-`awk -F: '/^[[^#]].*:/ { print $1 }' ${srcdir}/../libtool-version`
+	     nativeexeclibdir='${toolexeclibdir}/gcj-'`cat ${srcdir}/../../gcc/BASE-VER`
 	    ])
 
 AC_SUBST(nativeexeclibdir)
--- libjava/classpath/configure	(revision 130691)
+++ libjava/classpath/configure	(working copy)
@@ -4771,7 +4771,7 @@ if test "${with_native_libdir+set}" = se
 
 else
 
-	     nativeexeclibdir='${toolexeclibdir}/gcj-'`cat ${srcdir}/../../gcc/BASE-VER`-`awk -F: '/^[^#].*:/ { print $1 }' ${srcdir}/../libtool-version`
+	     nativeexeclibdir='${toolexeclibdir}/gcj-'`cat ${srcdir}/../../gcc/BASE-VER`
 
 fi;
 


Index: gcc43.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc43.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc43.spec	12 Dec 2007 20:16:35 -0000	1.1
+++ gcc43.spec	12 Dec 2007 23:29:33 -0000	1.2
@@ -139,6 +139,7 @@
 Patch12: gcc43-rh341221.patch
 Patch13: gcc43-libjava-test.patch
 Patch14: gcc43-pr34427.patch
+Patch15: gcc43-libjava-gcjpath.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -436,6 +437,7 @@
 %patch12 -p0 -b .rh341221~
 %patch13 -p0 -b .libjava-test~
 %patch14 -p0 -E -b .pr34427~
+%patch15 -p0 -b .libjava-gcjpath~
 
 %if %{bootstrap_java}
 tar xjf %{SOURCE10}