diff options
Diffstat (limited to 'lang/japhar/patches')
-rw-r--r-- | lang/japhar/patches/patch-aa | 45 | ||||
-rw-r--r-- | lang/japhar/patches/patch-ab | 22 | ||||
-rw-r--r-- | lang/japhar/patches/patch-ac | 18 | ||||
-rw-r--r-- | lang/japhar/patches/patch-ad | 18 | ||||
-rw-r--r-- | lang/japhar/patches/patch-ae | 15 |
5 files changed, 118 insertions, 0 deletions
diff --git a/lang/japhar/patches/patch-aa b/lang/japhar/patches/patch-aa new file mode 100644 index 00000000000..fe35c05fa51 --- /dev/null +++ b/lang/japhar/patches/patch-aa @@ -0,0 +1,45 @@ +$NetBSD: patch-aa,v 1.1.1.1 1999/10/28 09:51:43 agc Exp $ + +Use NetBSD pkglibtool + +--- configure 1999/10/19 10:58:12 1.1 ++++ configure 1999/10/19 10:59:12 +@@ -1557,6 +1557,7 @@ + ac_tool_prefix= + fi + ++if false; then + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' + +@@ -1789,6 +1790,7 @@ + ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ + $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ + || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } ++fi + + # Redirect the config.log output again, so that the ltconfig log is not + # clobbered by the next message. +@@ -5973,8 +5975,8 @@ + cat >conftestl.c <<\EOF && + void japhar_test() {} + EOF +- ../libtool --mode=compile ${CC-cc} -c $CFLAGS $CPPFLAGS conftestl.c 1>&5 && +- ../libtool --mode=link ${CC-cc} -shared -export-dynamic -no-undefined -rpath `pwd`/inst -version-info 1:0:0 $CFLAGS $CPPFLAGS $LDFLAGS conftestl.lo -o libconftest.la 1>&5 && ++ ${LIBTOOL} --mode=compile ${CC-cc} -c $CFLAGS $CPPFLAGS conftestl.c 1>&5 && ++ ${LIBTOOL} --mode=link ${CC-cc} -shared -export-dynamic -no-undefined -rpath `pwd`/inst -version-info 1:0:0 $CFLAGS $CPPFLAGS $LDFLAGS conftestl.lo -o libconftest.la 1>&5 && + cat >conftest.c <<\EOF && + #include <stdio.h> + /* We are here in a subdirectory, and need to use .. to find the file */ +@@ -6004,9 +6006,9 @@ + } + EOF + ${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5 && +- ../libtool --mode=link ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.o $LIBS 1>&5 && ++ ${LIBTOOL} --mode=link ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.o $LIBS 1>&5 && + mkdir inst && +- ../libtool --mode=install cp libconftest.la `pwd`/inst/libconftest.la 1>&5 ++ ${LIBTOOL} --mode=install cp libconftest.la `pwd`/inst/libconftest.la 1>&5 + ) && + libname=`. conftest.dir/inst/libconftest.la && echo $dlname` && + test x"$libname"x != x""x && diff --git a/lang/japhar/patches/patch-ab b/lang/japhar/patches/patch-ab new file mode 100644 index 00000000000..cac2fefc0ad --- /dev/null +++ b/lang/japhar/patches/patch-ab @@ -0,0 +1,22 @@ +$NetBSD: patch-ab,v 1.1.1.1 1999/10/28 09:51:43 agc Exp $ + +Use NetBSD's pkglibtool + +--- lib/libffi/configure 1999/10/19 11:00:32 1.1 ++++ lib/libffi/configure 1999/10/19 11:00:58 +@@ -1520,6 +1520,7 @@ + ac_tool_prefix= + fi + ++if false; then + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' + +@@ -1752,6 +1753,7 @@ + ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ + $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ + || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } ++fi + + # Redirect the config.log output again, so that the ltconfig log is not + # clobbered by the next message. diff --git a/lang/japhar/patches/patch-ac b/lang/japhar/patches/patch-ac new file mode 100644 index 00000000000..97b5994fcd5 --- /dev/null +++ b/lang/japhar/patches/patch-ac @@ -0,0 +1,18 @@ +$NetBSD: patch-ac,v 1.1.1.1 1999/10/28 09:51:43 agc Exp $ + +Pick up PATH_MAX from <limits.h> on Solaris + +--- lib/libnative/java.io/file.c 1999/10/19 11:16:37 1.1 ++++ lib/libnative/java.io/file.c 1999/10/19 11:17:59 +@@ -46,6 +46,11 @@ + # include <direct.h> + #endif + ++/* On Solaris, include <limits.h> to pick up PATH_MAX */ ++#if defined(__sun__) && defined(__svr4__) ++#include <limits.h> ++#endif ++ + /** + * WARNING: returned pointer must be freed by caller + */ diff --git a/lang/japhar/patches/patch-ad b/lang/japhar/patches/patch-ad new file mode 100644 index 00000000000..aafcc231f81 --- /dev/null +++ b/lang/japhar/patches/patch-ad @@ -0,0 +1,18 @@ +$NetBSD: patch-ad,v 1.1.1.1 1999/10/28 09:51:43 agc Exp $ + +On Solaris, pick up PATH_MAX from <limits.h> + +--- lib/libnative/java.io/unixfilesystem.c 1999/10/19 11:19:27 1.1 ++++ lib/libnative/java.io/unixfilesystem.c 1999/10/19 11:19:53 +@@ -47,6 +47,11 @@ + #include <utime.h> + #endif + ++/* On Solaris, include <limits.h> to pick up PATH_MAX */ ++#if defined(__sun__) && defined(__svr4__) ++#include <limits.h> ++#endif ++ + static jint BA_EXISTS; + static jint BA_REGULAR; + static jint BA_DIRECTORY; diff --git a/lang/japhar/patches/patch-ae b/lang/japhar/patches/patch-ae new file mode 100644 index 00000000000..13e290b392c --- /dev/null +++ b/lang/japhar/patches/patch-ae @@ -0,0 +1,15 @@ +$NetBSD: patch-ae,v 1.1.1.1 1999/10/28 09:51:43 agc Exp $ + +Don't install libreadline.a + +--- progs/japhard/readline/Makefile.in 1999/10/19 13:33:04 1.1 ++++ progs/japhard/readline/Makefile.in 1999/10/19 13:33:41 +@@ -327,7 +327,7 @@ + all-recursive-am: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + +-install-exec-am: install-libLIBRARIES ++install-exec-am: + install-exec: install-exec-am + + install-data-am: |