diff options
| author | joerg <joerg> | 2006-01-11 23:19:56 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2006-01-11 23:19:56 +0000 |
| commit | 5a868cacd93126e52ac6780fb34c883e3e2aee16 (patch) | |
| tree | 7006d685250ba024834cff4db9e7c2e577f079fb /lang | |
| parent | bd2265657b1415da828f3bd764304a8474327f18 (diff) | |
| download | pkgsrc-5a868cacd93126e52ac6780fb34c883e3e2aee16.tar.gz | |
Use PTHREAD_* instead of hard-wired -lpthread or -lrt. Expects GNU m4.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/sablevm/Makefile | 4 | ||||
| -rw-r--r-- | lang/sablevm/distinfo | 4 | ||||
| -rw-r--r-- | lang/sablevm/patches/patch-aa | 21 | ||||
| -rw-r--r-- | lang/sablevm/patches/patch-ab | 13 |
4 files changed, 39 insertions, 3 deletions
diff --git a/lang/sablevm/Makefile b/lang/sablevm/Makefile index 63be046bd5c..66ae7ab8f90 100644 --- a/lang/sablevm/Makefile +++ b/lang/sablevm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/09/22 14:58:00 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2006/01/11 23:19:56 joerg Exp $ # DISTNAME= sablevm-1.1.3 @@ -17,7 +17,7 @@ DEPENDS+= sablevm-classpath-1.1.3nb3:../../lang/sablevm-classpath GNU_CONFIGURE= yes GNU_CONFIGURE_PREFIX= ${JAVA_HOME} NO_MTREE= yes -USE_TOOLS+= gmake +USE_TOOLS+= gmake gm4 USE_LIBTOOL= yes JAVA_NAME= sablevm diff --git a/lang/sablevm/distinfo b/lang/sablevm/distinfo index 48166cb2298..330a84b3737 100644 --- a/lang/sablevm/distinfo +++ b/lang/sablevm/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 09:03:11 agc Exp $ +$NetBSD: distinfo,v 1.4 2006/01/11 23:19:56 joerg Exp $ SHA1 (sablevm-1.1.3.tar.gz) = 7b38a3c12a1ddc7fe5eae37207d8b4b44412c050 RMD160 (sablevm-1.1.3.tar.gz) = 3a172d3513ad5298457ab8bc77728beafd7d9311 Size (sablevm-1.1.3.tar.gz) = 654232 bytes +SHA1 (patch-aa) = b0fa698bd8107a2a65838bc80e056d0cef20e73c +SHA1 (patch-ab) = 325eadfa78f44c4db674482218757feca39d0fad diff --git a/lang/sablevm/patches/patch-aa b/lang/sablevm/patches/patch-aa new file mode 100644 index 00000000000..3ee08b74ad0 --- /dev/null +++ b/lang/sablevm/patches/patch-aa @@ -0,0 +1,21 @@ +$NetBSD: patch-aa,v 1.3 2006/01/11 23:19:56 joerg Exp $ + +--- configure.orig 2006-01-11 22:37:08.000000000 +0000 ++++ configure +@@ -19678,13 +19678,13 @@ else + echo ***ERROR: libpopt is missing; exit 1 + fi + +-echo "$as_me:$LINENO: checking for pthread_self in -lpthread" >&5 +-echo $ECHO_N "checking for pthread_self in -lpthread... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking for pthread_self in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5 ++echo $ECHO_N "checking for pthread_self in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6 + if test "${ac_cv_lib_pthread_pthread_self+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lpthread $LIBS" ++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF diff --git a/lang/sablevm/patches/patch-ab b/lang/sablevm/patches/patch-ab new file mode 100644 index 00000000000..aacaa5620c0 --- /dev/null +++ b/lang/sablevm/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.3 2006/01/11 23:19:56 joerg Exp $ + +--- src/libsablevm/Makefile.in.orig 2006-01-11 23:05:18.000000000 +0000 ++++ src/libsablevm/Makefile.in +@@ -341,7 +341,7 @@ noinst_HEADERS = \ + util.m4.c \ + vm_args.m4.c + +-libsablevm_la_LIBADD = -lpthread -lm -lffi -lltdl -lrt ++libsablevm_la_LIBADD = -lm -lffi -lltdl ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} + libsablevm_la_LDFLAGS = -release @LIBRELEASE@ + INCLUDES = \ + -I$(srcdir)/include -I$(srcdir)/inlinability \ |