Thu Sep 25 12:55:52 2014 UTC ()
Don't define _XOPEN_SOURCE to a bogus value on SunOS.


(jperkin)
diff -r1.7 -r1.8 pkgsrc/lang/sablevm/distinfo
diff -r1.6 -r1.7 pkgsrc/lang/sablevm/patches/patch-aa
cvs diff -r1.7 -r1.8 pkgsrc/lang/sablevm/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/sablevm/distinfo 2006/04/30 17:10:18 1.7
+++ pkgsrc/lang/sablevm/distinfo 2014/09/25 12:55:52 1.8
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.7 2006/04/30 17:10:18 joerg Exp $ 1$NetBSD: distinfo,v 1.8 2014/09/25 12:55:52 jperkin Exp $
2 2
3SHA1 (sablevm-1.13.tar.gz) = 153b403ca8a9d3a96c2a48ac0e25a4e5e7f05cfd 3SHA1 (sablevm-1.13.tar.gz) = 153b403ca8a9d3a96c2a48ac0e25a4e5e7f05cfd
4RMD160 (sablevm-1.13.tar.gz) = b7ea39bf5437d4bd986ce0e3a016f2b6e0e7e173 4RMD160 (sablevm-1.13.tar.gz) = b7ea39bf5437d4bd986ce0e3a016f2b6e0e7e173
5Size (sablevm-1.13.tar.gz) = 1336864 bytes 5Size (sablevm-1.13.tar.gz) = 1336864 bytes
6SHA1 (patch-aa) = 72fad6e996ffe023eee63fff6b4f15b3bbc58ff3 6SHA1 (patch-aa) = 87604aeeff2d5fe6463146d8f5687c38001c93cd
cvs diff -r1.6 -r1.7 pkgsrc/lang/sablevm/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/lang/sablevm/patches/patch-aa 2006/04/30 17:10:18 1.6
+++ pkgsrc/lang/sablevm/patches/patch-aa 2014/09/25 12:55:52 1.7
@@ -1,51 +1,63 @@ @@ -1,51 +1,63 @@
1$NetBSD: patch-aa,v 1.6 2006/04/30 17:10:18 joerg Exp $ 1$NetBSD: patch-aa,v 1.7 2014/09/25 12:55:52 jperkin Exp $
 2
 3Don't define _XOPEN_SOURCE on SunOS.
2 4
3--- configure.orig 2005-12-07 17:56:07.000000000 +0000 5--- configure.orig 2005-12-07 17:56:07.000000000 +0000
4+++ configure 6+++ configure
5@@ -465,8 +465,6 @@ ac_includes_default="\ 7@@ -465,8 +465,6 @@ ac_includes_default="\
6 # include <unistd.h> 8 # include <unistd.h>
7 #endif" 9 #endif"
8  10
9-ac_subdirs_all="$ac_subdirs_all src/libffi" 11-ac_subdirs_all="$ac_subdirs_all src/libffi"
10-ac_subdirs_all="$ac_subdirs_all src/libpopt" 12-ac_subdirs_all="$ac_subdirs_all src/libpopt"
11 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' 13 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'
12 ac_subst_files='' 14 ac_subst_files=''
13  15
14@@ -19967,13 +19965,13 @@ case $host in 16@@ -2028,7 +2026,9 @@ _ACEOF
 17
 18
 19 cat >>confdefs.h <<\_ACEOF
 20+#ifndef __sun
 21 #define _XOPEN_SOURCE 500
 22+#endif
 23 _ACEOF
 24
 25
 26@@ -19967,13 +19967,13 @@ case $host in
15 *-freebsd*) 27 *-freebsd*)
16 ;; 28 ;;
17 *) 29 *)
18- echo "$as_me:$LINENO: checking for pthread_self in -lpthread" >&5 30- echo "$as_me:$LINENO: checking for pthread_self in -lpthread" >&5
19-echo $ECHO_N "checking for pthread_self in -lpthread... $ECHO_C" >&6 31-echo $ECHO_N "checking for pthread_self in -lpthread... $ECHO_C" >&6
20+echo "$as_me:$LINENO: checking for pthread_self in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5 32+echo "$as_me:$LINENO: checking for pthread_self in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
21+echo $ECHO_N "checking for pthread_self in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6 33+echo $ECHO_N "checking for pthread_self in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
22 if test "${ac_cv_lib_pthread_pthread_self+set}" = set; then 34 if test "${ac_cv_lib_pthread_pthread_self+set}" = set; then
23 echo $ECHO_N "(cached) $ECHO_C" >&6 35 echo $ECHO_N "(cached) $ECHO_C" >&6
24 else 36 else
25 ac_check_lib_save_LIBS=$LIBS 37 ac_check_lib_save_LIBS=$LIBS
26-LIBS="-lpthread $LIBS" 38-LIBS="-lpthread $LIBS"
27+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS" 39+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
28 cat >conftest.$ac_ext <<_ACEOF 40 cat >conftest.$ac_ext <<_ACEOF
29 /* confdefs.h. */ 41 /* confdefs.h. */
30 _ACEOF 42 _ACEOF
31@@ -20036,7 +20034,7 @@ else 43@@ -20036,7 +20036,7 @@ else
32 echo ***ERROR: libpthread is missing; exit 1 44 echo ***ERROR: libpthread is missing; exit 1
33 fi 45 fi
34  46
35- LIBSVMADD="$LIBSVMADD -lpthread" 47- LIBSVMADD="$LIBSVMADD -lpthread"
36+ LIBSVMADD="$LIBSVMADD ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" 48+ LIBSVMADD="$LIBSVMADD ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
37 ;; 49 ;;
38 esac 50 esac
39  51
40@@ -20360,11 +20358,9 @@ esac 52@@ -20360,11 +20360,9 @@ esac
41  53
42  54
43  55
44-subdirs="$subdirs src/libffi" 56-subdirs="$subdirs src/libffi"
45  57
46  58
47  59
48-subdirs="$subdirs src/libpopt" 60-subdirs="$subdirs src/libpopt"
49  61
50  62
51  63