diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2016-08-10 11:38:51 +0800 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2016-08-10 11:38:51 +0800 |
| commit | 586da9a2aff44e27c240131feb9c4a28c5319fab (patch) | |
| tree | 08731c8f639832f0aa7692dbe0149f836468b501 /sysutils | |
| parent | 4dbed34736d8fb38649469d5867ba312dc8163c0 (diff) | |
| download | freebsd-ports-gnome-586da9a2aff44e27c240131feb9c4a28c5319fab.tar.gz freebsd-ports-gnome-586da9a2aff44e27c240131feb9c4a28c5319fab.tar.zst freebsd-ports-gnome-586da9a2aff44e27c240131feb9c4a28c5319fab.zip | |
Improve the search performance looking for required openjdk files.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/syslog-ng37/files/patch-configure | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/sysutils/syslog-ng37/files/patch-configure b/sysutils/syslog-ng37/files/patch-configure index c3c533b2df4c..76dba389a906 100644 --- a/sysutils/syslog-ng37/files/patch-configure +++ b/sysutils/syslog-ng37/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2016-03-22 04:58:27.000000000 -0700 -+++ configure 2016-03-23 20:51:10.722420000 -0700 -@@ -14996,9 +14996,9 @@ +--- configure.orig 2016-04-01 01:45:11.000000000 -0700 ++++ configure 2016-08-09 20:35:26.657622000 -0700 +@@ -15049,9 +15049,9 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNET" >&5 $as_echo_n "checking for LIBNET... " >&6; } if test "x$with_libnet" = "x"; then @@ -12,3 +12,21 @@ fi if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then +@@ -16086,7 +16086,7 @@ + + if test "$VERSION_OK" = "1"; + then +- JNI_HOME=`echo $JAVAC_BIN | sed "s/\(.*\)[/]bin[/]java.*/\1/"` ++ JNI_HOME=`echo $JAVAC_BIN | sed "s/\(.*\)[/]bin[/]java.*/\1\/openjdk\*/"` + JNI_LIBDIR=`find $JNI_HOME -name "libjvm.so" | sed "s/\(.*\)libjvm.so/\1/" | head -n 1` + JNI_LIBS="-L$JNI_LIBDIR -ljvm" + JNI_INCLUDE_DIR=`find $JNI_HOME -name "jni.h" | sed "s/\(.*\)jni.h/\1/" | head -n 1` +@@ -16187,7 +16187,7 @@ + + if test "$VERSION_OK" = "1"; + then +- JNI_HOME=`echo $JAVAC_BIN | sed "s/\(.*\)[/]bin[/]java.*/\1/"` ++ JNI_HOME=`echo $JAVAC_BIN | sed "s/\(.*\)[/]bin[/]java.*/\1\/openjdk\*/"` + JNI_LIBDIR=`find $JNI_HOME -name "libjvm.so" | sed "s/\(.*\)libjvm.so/\1/" | head -n 1` + JNI_LIBS="-L$JNI_LIBDIR -ljvm" + JNI_INCLUDE_DIR=`find $JNI_HOME -name "jni.h" | sed "s/\(.*\)jni.h/\1/" | head -n 1` |