[pkgsrc/trunk]: pkgsrc/lang/sablevm Make sure to avoid running configure in s...

[tonio <tonio%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9211f5de193b
branches:  trunk
changeset: 511565:9211f5de193b
user:      tonio <tonio%pkgsrc.org@localhost>
date:      Mon Apr 17 12:54:07 2006 +0000

description:
Make sure to avoid running configure in sablevm's libffi and libpopt, as we use
pkgsrc ones. That should fix the problems with x86_64 (PR pkg/30138)

diffstat:

 lang/sablevm/distinfo         |   4 ++--
 lang/sablevm/patches/patch-aa |  34 ++++++++++++++++++++++++++++++++--
 2 files changed, 34 insertions(+), 4 deletions(-)

diffs (60 lines):

diff -r b47dd968715a -r 9211f5de193b lang/sablevm/distinfo
--- a/lang/sablevm/distinfo     Mon Apr 17 12:49:16 2006 +0000
+++ b/lang/sablevm/distinfo     Mon Apr 17 12:54:07 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2006/04/15 22:20:02 tonio Exp $
+$NetBSD: distinfo,v 1.6 2006/04/17 12:54:07 tonio Exp $
 
 SHA1 (sablevm-1.13.tar.gz) = 153b403ca8a9d3a96c2a48ac0e25a4e5e7f05cfd
 RMD160 (sablevm-1.13.tar.gz) = b7ea39bf5437d4bd986ce0e3a016f2b6e0e7e173
 Size (sablevm-1.13.tar.gz) = 1336864 bytes
-SHA1 (patch-aa) = c7927b22b4294c8d2f31c3a5b99e7179a1faa396
+SHA1 (patch-aa) = 8342c4f95badd06bc52b7577d99199288d7e52ed
diff -r b47dd968715a -r 9211f5de193b lang/sablevm/patches/patch-aa
--- a/lang/sablevm/patches/patch-aa     Mon Apr 17 12:49:16 2006 +0000
+++ b/lang/sablevm/patches/patch-aa     Mon Apr 17 12:54:07 2006 +0000
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.4 2006/04/15 22:20:02 tonio Exp $
+$NetBSD: patch-aa,v 1.5 2006/04/17 12:54:07 tonio Exp $
 
 --- configure.orig     2005-12-07 18:56:07.000000000 +0100
 +++ configure
-@@ -19967,13 +19967,13 @@ case $host in
+@@ -465,8 +465,6 @@ ac_includes_default="\
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subdirs_all="$ac_subdirs_all src/libffi"
+-ac_subdirs_all="$ac_subdirs_all src/libpopt"
+ ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir 
sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA 
CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar LIBRELEASE 
RELEASE build build_cpu build_vendor build_os host host_cpu host_vendor host_os inlinability_testing JIKES FASTJAR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote 
AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP LN_S EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE 
am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL subdirs CONV_LIBFFI_TRUE CONV_LIBFFI_FALSE CONV_LIBPOPT_TRUE CONV_LIBPOPT_FALSE LIBSVMADD LIBSVMINCLUDE SVMADD SVMINCLUDE NO_UNDEFINED M4 
LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+ 
+@@ -19967,13 +19965,13 @@ case $host in
        *-freebsd*)
                    ;;
        *)
@@ -19,3 +28,24 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
+@@ -20360,11 +20358,9 @@ esac
+ 
+ 
+ 
+-subdirs="$subdirs src/libffi"
+ 
+ 
+ 
+-subdirs="$subdirs src/libpopt"
+ 
+ 
+ 
+@@ -22662,6 +22658,8 @@ do
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++    # Avoid regenerating for rechecks on pkgsrc
++    exit 0
+     ac_cs_recheck=: ;;
+   --version | --vers* | -V )
+     echo "$ac_cs_version"; exit 0 ;;