sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Add USES=libtool

Browse source 
- Patch configure to fix detection of shared library support
This commit is contained in:
Tijl Coosemans 2014-08-17 18:45:52 +00:00
parent 20f6ab5849
commit 1fecd6a9ee
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=365221
3 changed files with 36 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
java/jamvm/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= jamvm PORTNAME= jamvm
PORTVERSION= 1.5.4 PORTVERSION= 1.5.4
PORTREVISION= 1
CATEGORIES= java devel CATEGORIES= java devel
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/JamVM%20${PORTVERSION} MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/JamVM%20${PORTVERSION}
@ -15,7 +16,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/classpath/glibj.zip:${PORTSDIR}/java/classpath
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-classpath-install-dir=${LOCALBASE} CONFIGURE_ARGS= --with-classpath-install-dir=${LOCALBASE}
USES= gmake pkgconfig USES= gmake libtool pkgconfig
OPTIONS_DEFINE= FFI ZIP OPTIONS_DEFINE= FFI ZIP
OPTIONS_DEFAULT=FFI ZIP OPTIONS_DEFAULT=FFI ZIP

37
java/jamvm/files/patch-configure
View file

@ -1,15 +1,40 @@
--- configure.orig 2009-12-31 13:41:44.000000000 -0500 --- configure.orig 2009-12-31 13:41:44.000000000 -0500
+++ configure 2012-09-17 12:29:34.000000000 -0400 +++ configure 2012-09-17 12:29:34.000000000 -0400
@@ -2689,7 +2689,7 @@ @@ -2683,28 +2683,27 @@
i[3456]86-*-darwin*) host_cpu=i386 host_os=darwin ;;
arm*-*-darwin*) host_cpu=arm host_os=darwin libdl_needed=no ;;
i386-*-openbsd*) host_os=bsd libdl_needed=no ;;
-i386-*-freebsd*) host_os=bsd libdl_needed=no ;;
+i386-*-freebsd*) os=bsd libdl_needed=no ;;
i386-*-solaris*) host_cpu=x86 host_os=solaris ;;
x86_64-*-linux*) host_os=linux ;;
hppa*-*-linux*) host_cpu=parisc host_os=linux ;; hppa*-*-linux*) host_cpu=parisc host_os=linux ;;
mipsel-*-linux*) host_cpu=mips host_os=linux ;; mipsel-*-linux*) host_cpu=mips host_os=linux ;;
x86_64-*-openbsd*) host_os=bsd libdl_needed=no ;; x86_64-*-openbsd*) host_os=bsd libdl_needed=no ;;
-x86_64-*-freebsd*) host_os=bsd libdl_needed=no ;; -x86_64-*-freebsd*) host_os=bsd libdl_needed=no ;;
+amd64-*-freebsd*) host_os=bsd host_cpu=x86_64 libdl_needed=no ;; +amd64-*-freebsd*) os=bsd host_cpu=x86_64 libdl_needed=no ;;
arm*-*-linux*) host_cpu=arm host_os=linux ;; arm*-*-linux*) host_cpu=arm host_os=linux ;;
arm*-*-openbsd*) host_cpu=arm host_os=bsd libdl_needed=no ;; arm*-*-openbsd*) host_cpu=arm host_os=bsd libdl_needed=no ;;
arm*-*-freebsd*) host_cpu=arm host_os=bsd libdl_needed=no ;; -arm*-*-freebsd*) host_cpu=arm host_os=bsd libdl_needed=no ;;
@@ -21662,8 +21662,15 @@ +arm*-*-freebsd*) host_cpu=arm os=bsd libdl_needed=no ;;
powerpc*-*-linux*) host_cpu=powerpc host_os=linux ;;
powerpc*-*-openbsd*) host_cpu=powerpc host_os=bsd libdl_needed=no ;;
-powerpc*-*-freebsd*) host_cpu=powerpc host_os=bsd libdl_needed=no ;;
+powerpc*-*-freebsd*) host_cpu=powerpc os=bsd libdl_needed=no ;;
powerpc-*-darwin*) host_os=darwin ;;
-sparc*-*-freebsd*) host_cpu=sparc host_os=bsd libdl_needed=no ;;
+sparc*-*-freebsd*) host_cpu=sparc os=bsd libdl_needed=no ;;
*) { { $as_echo "$as_me:$LINENO: error: $host not supported" >&5
$as_echo "$as_me: error: $host not supported" >&2;}
{ (exit 1); exit 1; }; } ;;
esac
arch=$host_cpu
-os=$host_os
@@ -21662,8 +21661,15 @@
if test "${ac_cv_lib_ffi_ffi_call+set}" = set; then if test "${ac_cv_lib_ffi_ffi_call+set}" = set; then
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
@ -26,7 +51,7 @@
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
@@ -21718,6 +21725,8 @@ @@ -21718,6 +21724,8 @@
rm -rf conftest.dSYM rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
@ -35,7 +60,7 @@
LIBS=$ac_check_lib_save_LIBS LIBS=$ac_check_lib_save_LIBS
fi fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ffi_ffi_call" >&5 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ffi_ffi_call" >&5
@@ -21726,9 +21735,9 @@ @@ -21726,9 +21734,9 @@
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define HAVE_LIBFFI 1 #define HAVE_LIBFFI 1
_ACEOF _ACEOF

5
java/jamvm/pkg-plist
View file

@ -1,6 +1,7 @@
bin/jamvm bin/jamvm
lib/libjvm.la lib/libjvm.so
lib/libjvm.a lib/libjvm.so.0
lib/libjvm.so.0.0.0
%%WITH_ZIP%%lib/rt.jar %%WITH_ZIP%%lib/rt.jar
%%WITH_ZIP%%%%DATADIR%%/classes.zip %%WITH_ZIP%%%%DATADIR%%/classes.zip
%%WITHOUT_ZIP%%%%DATADIR%%/classes/gnu/classpath/VMStackWalker.class %%WITHOUT_ZIP%%%%DATADIR%%/classes/gnu/classpath/VMStackWalker.class