Fix up OS and pthread detection.

3 files changed, 62 insertions, 13 deletions

diff --git a/lang/jamvm/Makefile b/lang/jamvm/Makefile
index 456faa33e20..7846f4c667e 100644
--- a/lang/jamvm/Makefile
+++ b/lang/jamvm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/04/16 22:16:36 tonio Exp $
+# $NetBSD: Makefile,v 1.2 2006/05/02 08:59:30 joerg Exp $
 #
 
 DISTNAME=		jamvm-1.4.2
@@ -22,18 +22,8 @@ USE_TOOLS+=	gmake
 
 DEPENDS+=	classpath>=0.19:../../lang/classpath
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Linux"
-.	if ${MACHINE_ARCH} == "i386"
-MACHINE_GNU_PLATFORM=i686-pc-linux-gnu
-.	endif
-.endif
-.if ${OPSYS} == "NetBSD"
-MACHINE_GNU_PLATFORM=${MACHINE_ARCH}-foo-openbsd
-.endif
-
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/java-env.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/jamvm/distinfo b/lang/jamvm/distinfo
index 67af17c7ae1..762523bedab 100644
--- a/lang/jamvm/distinfo
+++ b/lang/jamvm/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/04/16 22:16:36 tonio Exp $
+$NetBSD: distinfo,v 1.2 2006/05/02 08:59:30 joerg Exp $
 
 SHA1 (jamvm-1.4.2.tar.gz) = cfda95e52261d58e535a0c8ec03878304e9560c7
 RMD160 (jamvm-1.4.2.tar.gz) = ca9d26f90dd04e5aaefb1c33dda59a4f41456e31
 Size (jamvm-1.4.2.tar.gz) = 285593 bytes
+SHA1 (patch-aa) = 932c69d3cb7eae2ade71c7d6b4644d44cb68e68e
diff --git a/lang/jamvm/patches/patch-aa b/lang/jamvm/patches/patch-aa
new file mode 100644
index 00000000000..b31266cc5c9
--- /dev/null
+++ b/lang/jamvm/patches/patch-aa
@@ -0,0 +1,58 @@
+$NetBSD: patch-aa,v 1.1 2006/05/02 08:59:30 joerg Exp $
+
+--- configure.orig	2006-01-18 10:08:36.000000000 +0000
++++ configure
+@@ -1943,19 +1943,25 @@ host_os=`echo $ac_cv_host | sed 's/^\([^
+ 
+ 
+ case "$host" in
+-i[456]86-*-linux*) host_cpu=i386 host_os=linux ;;
+-i[456]86-*-kfreebsd*) host_cpu=i386 host_os=linux ;;
++i[3456]86-*-linux*) host_cpu=i386 host_os=linux ;;
++i[3456]86-*-kfreebsd*) host_cpu=i386 host_os=linux ;;
+ i386-*-openbsd*) host_os=linux libdl_needed=no ;;
+ i386-*-freebsd*) host_os=linux libdl_needed=no ;;
++i386-*-netbsd*) host_os=linux libdl_needed=no ;;
++i386-*-dragonfly*) host_os=linux libdl_needed=no ;;
+ x86_64-*-linux*) host_os=linux ;;
+ amd64-*-openbsd*) host_os=linux libdl_needed=no ;;
+ amd64-*-freebsd*) host_os=linux libdl_needed=no ;;
++amd64-*-netbsd*) host_os=linux libdl_needed=no ;;
++amd64-*-dragonfly*) host_os=linux libdl_needed=no ;;
+ arm*-*-linux*) host_cpu=arm host_os=linux ;;
+ arm*-*-openbsd*) host_cpu=arm host_os=linux libdl_needed=no ;;
+ arm*-*-freebsd*) host_cpu=arm host_os=linux libdl_needed=no ;;
++arm*-*-netbsd*) host_cpu=arm host_os=linux libdl_needed=no ;;
+ powerpc*-*-linux*) host_cpu=powerpc host_os=linux ;;
+ powerpc*-*-openbsd*) host_cpu=powerpc host_os=linux libdl_needed=no ;;
+ powerpc*-*-freebsd*) host_cpu=powerpc host_os=linux libdl_needed=no ;;
++powerpc*-*-netbsd*) host_cpu=powerpc host_os=linux libdl_needed=no ;;
+ powerpc-*-darwin*) host_os=darwin ;;
+ *) { { echo "$as_me:$LINENO: error: $host not supported" >&5
+ echo "$as_me: error: $host not supported" >&2;}
+@@ -3289,13 +3295,13 @@ done
+ 
+ 
+ 
+-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
+@@ -3358,7 +3364,7 @@ if test $ac_cv_lib_pthread_pthread_self 
+ #define HAVE_LIBPTHREAD 1
+ _ACEOF
+ 
+-  LIBS="-lpthread $LIBS"
++  LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
+ 
+ else
+   { { echo "$as_me:$LINENO: error: libpthread is missing" >&5