From 8c1da289d756fe37c0ffaee7ddd61f8001bd57d0 Mon Sep 17 00:00:00 2001 From: mef Date: Jul 06 2009 11:18:57 +0000 Subject: Remove a few more patches --- diff --git a/pl-5.6.57-jpl-configure-alpha.patch b/pl-5.6.57-jpl-configure-alpha.patch deleted file mode 100644 index 14a813f..0000000 --- a/pl-5.6.57-jpl-configure-alpha.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up pl-5.6.57/packages/jpl/configure.alpha pl-5.6.57/packages/jpl/configure ---- pl-5.6.57/packages/jpl/configure.alpha 2009-02-10 12:53:01.000000000 +0100 -+++ pl-5.6.57/packages/jpl/configure 2009-02-10 12:53:24.000000000 +0100 -@@ -4614,6 +4614,10 @@ case "$host_cpu" in - _JNI_LIBDIRS="lib/amd64" - _JNI_LIBSUBDIR="server" - ;; -+ alpha*) -+ _JNI_LIBDIRS="lib/alpha" -+ _JNI_LIBSUBDIR="server" -+ ;; - powerpc) - _JNI_LIBDIRS="lib/ppc" - _JNI_LIBSUBDIR="server" diff --git a/pl-5.6.57-jpl-configure-s390x.patch b/pl-5.6.57-jpl-configure-s390x.patch deleted file mode 100644 index 51122b4..0000000 --- a/pl-5.6.57-jpl-configure-s390x.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up pl-5.7.6/packages/jpl/configure.s390x pl-5.7.6/packages/jpl/configure ---- pl-5.7.6/packages/jpl/configure.s390x 2009-03-01 16:42:25.000000000 +0100 -+++ pl-5.7.6/packages/jpl/configure 2009-03-01 16:43:13.000000000 +0100 -@@ -4632,6 +4632,14 @@ case "$host_cpu" in - _JNI_LIBDIRS="lib/ppc64" - _JNI_LIBSUBDIR="server" - ;; -+ s390) -+ _JNI_LIBDIRS="lib/s390" -+ _JNI_LIBSUBDIR="server" -+ ;; -+ s390x) -+ _JNI_LIBDIRS="lib/s390x" -+ _JNI_LIBSUBDIR="server" -+ ;; - *) - _JNI_LIBDIRS="" - esac diff --git a/pl-5.6.57-jpl-configure.patch b/pl-5.6.57-jpl-configure.patch deleted file mode 100644 index 59436ea..0000000 --- a/pl-5.6.57-jpl-configure.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- pl-5.6.57/packages/jpl/configure 2008-06-20 11:19:03.000000000 +0100 -+++ /home/mef/rpmbuild/BUILD/pl-5.6.57/packages/jpl/configure 2008-07-02 14:11:55.000000000 +0100 -@@ -3658,21 +3658,6 @@ - CWFLAGS="${CWFLAGS-}" - fi - --if test "x$JAVALIBS" = "x"; then -- case "$PLARCH" in -- *darwin*) -- JAVALIBS="-Wl,-framework,JavaVM" -- ;; -- *powerpc-linux*) -- JAVALIBS="-ljava -ljvm" -- ;; -- *) -- JAVALIBS="-ljava -lverify -ljvm" -- ;; -- esac --fi -- -- - # Make sure we can run config.sub. - $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -@@ -4572,6 +4557,7 @@ - { echo "$as_me:$LINENO: checking symlink for $_cur" >&5 - echo $ECHO_N "checking symlink for $_cur... $ECHO_C" >&6; } - _slink=`ls -ld "$_cur" | sed 's/.* -> //'` -+ if [ `basename $_slink` = "ecj" ]; then break; fi - case "$_slink" in - /*) _cur="$_slink";; - # 'X' avoids triggering unwanted echo options. -@@ -4629,19 +4615,37 @@ - _JNI_LIBSUBDIR="server" - ;; - powerpc) -- case "$host_os" in -- linux*) -- _JNI_LIBDIRS="bin" -- _JNI_LIBSUBDIR="classic" -- ;; -- *) -- _JNI_LIBDIRS="" -- esac -+ _JNI_LIBDIRS="lib/ppc" -+ _JNI_LIBSUBDIR="server" -+ ;; -+ powerpc64) -+ _JNI_LIBDIRS="lib/ppc64" -+ _JNI_LIBSUBDIR="server" - ;; - *) - _JNI_LIBDIRS="" - esac - -+# Set JAVALIBS differently if we're using GCJ -+if test "x$JAVALIBS" = "x"; then -+ if (echo $_JTOPDIR | grep gcj > /dev/null); then -+ JAVALIBS="-ljvm" -+ else -+ case "$PLARCH" in -+ *darwin*) -+ JAVALIBS="-Wl,-framework,JavaVM" -+ ;; -+ *powerpc-linux*) -+ JAVALIBS="-ljava -ljvm" -+ ;; -+ *) -+ JAVALIBS="-ljava -lverify -ljvm" -+ ;; -+ esac -+ fi -+fi -+ -+ - for d in $_JNI_LIBDIRS; do - echo "Trying $_JTOPDIR/jre/$d/$_JNI_LIBSUBDIR" - if test -d $_JTOPDIR/jre/$d/$_JNI_LIBSUBDIR; then