55 lines
4 KiB
Text
55 lines
4 KiB
Text
$NetBSD: patch-ak,v 1.2 2015/12/29 23:34:49 dholland Exp $
|
|
|
|
Use pkgsrc libffi.
|
|
|
|
--- progs/japharh/Makefile.in.orig 2006-06-06 14:44:32.000000000 +0000
|
|
+++ progs/japharh/Makefile.in
|
|
@@ -87,7 +87,7 @@ LINK = $(LIBTOOL) --mode=link $(CXX) $(C
|
|
@NEED_ZLIB_TRUE@ZLIB = $(top_builddir)/lib/zlib/libzlib.la
|
|
@NEED_ZLIB_FALSE@ZLIB = @ZLIB@
|
|
|
|
-@LIBFFI_SUPPORT_TRUE@LIBFFI = $(top_builddir)/lib/libffi/src/libffi.la
|
|
+@LIBFFI_SUPPORT_TRUE@LIBFFI = -lffi
|
|
|
|
@ENABLE_JVMDI_TRUE@JVMDI_LIB = $(top_builddir)/lib/libjvmdi/src/libjvmdi.la
|
|
|
|
@@ -120,8 +120,7 @@ clazz.o method.o field.o misc.o
|
|
@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_TRUE@$(top_builddir)/lib/libruntime/libruntime.la \
|
|
@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_TRUE@$(top_builddir)/lib/libjvmdi/src/libjvmdi.la \
|
|
@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_TRUE@$(top_builddir)/arch/libarch.la \
|
|
-@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_TRUE@$(top_builddir)/lib/zlib/libzlib.la \
|
|
-@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_TRUE@$(top_builddir)/lib/libffi/src/libffi.la
|
|
+@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_TRUE@$(top_builddir)/lib/zlib/libzlib.la
|
|
@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@@ENABLE_JVMDI_FALSE@japharh_DEPENDENCIES = \
|
|
@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@@ENABLE_JVMDI_FALSE@$(top_builddir)/lib/libjni/src/libjni.la \
|
|
@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@@ENABLE_JVMDI_FALSE@$(top_builddir)/lib/libruntime/libruntime.la \
|
|
@@ -134,8 +133,7 @@ clazz.o method.o field.o misc.o
|
|
@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_FALSE@japharh_DEPENDENCIES = \
|
|
@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_FALSE@$(top_builddir)/lib/libjni/src/libjni.la \
|
|
@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_FALSE@$(top_builddir)/lib/libruntime/libruntime.la \
|
|
-@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_FALSE@$(top_builddir)/arch/libarch.la \
|
|
-@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_FALSE@$(top_builddir)/lib/libffi/src/libffi.la
|
|
+@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_FALSE@$(top_builddir)/arch/libarch.la
|
|
@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@@ENABLE_JVMDI_TRUE@japharh_DEPENDENCIES = \
|
|
@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@@ENABLE_JVMDI_TRUE@$(top_builddir)/lib/libjni/src/libjni.la \
|
|
@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@@ENABLE_JVMDI_TRUE@$(top_builddir)/lib/libruntime/libruntime.la \
|
|
@@ -145,8 +143,7 @@ clazz.o method.o field.o misc.o
|
|
@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_TRUE@$(top_builddir)/lib/libjni/src/libjni.la \
|
|
@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_TRUE@$(top_builddir)/lib/libruntime/libruntime.la \
|
|
@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_TRUE@$(top_builddir)/lib/libjvmdi/src/libjvmdi.la \
|
|
-@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_TRUE@$(top_builddir)/arch/libarch.la \
|
|
-@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_TRUE@$(top_builddir)/lib/libffi/src/libffi.la
|
|
+@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_TRUE@$(top_builddir)/arch/libarch.la
|
|
@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_FALSE@@ENABLE_JVMDI_TRUE@japharh_DEPENDENCIES = \
|
|
@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_FALSE@@ENABLE_JVMDI_TRUE@$(top_builddir)/lib/libjni/src/libjni.la \
|
|
@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_FALSE@@ENABLE_JVMDI_TRUE@$(top_builddir)/lib/libruntime/libruntime.la \
|
|
@@ -157,8 +154,7 @@ clazz.o method.o field.o misc.o
|
|
@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_FALSE@$(top_builddir)/lib/libjni/src/libjni.la \
|
|
@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_FALSE@$(top_builddir)/lib/libruntime/libruntime.la \
|
|
@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_FALSE@$(top_builddir)/arch/libarch.la \
|
|
-@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_FALSE@$(top_builddir)/lib/zlib/libzlib.la \
|
|
-@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_FALSE@$(top_builddir)/lib/libffi/src/libffi.la
|
|
+@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_FALSE@$(top_builddir)/lib/zlib/libzlib.la
|
|
japharh_LDFLAGS =
|
|
CFLAGS = @CFLAGS@
|
|
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|