summaryrefslogtreecommitdiff
path: root/sysutils/syslog-ng-devel/files/patch-configure
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2016-08-10 03:57:56 +0000
committerCy Schubert <cy@FreeBSD.org>2016-08-10 03:57:56 +0000
commitd5d1f754721a922b99e1d85406d4c119fa88d005 (patch)
treef525f05dc065a4df06b23199f300a6774f421c6d /sysutils/syslog-ng-devel/files/patch-configure
parentImprove the search performance looking for required openjdk files. (diff)
syslog-ng-devel is active again. This time with 3.8 beta1.
Java support does not build properly, thus is disabled and marked BROKEN for now. Submitted by: Peter Czanik (CzP) <peter.czanik@balabit.com> Balabit / syslog-ng upstream
Notes
Notes: svn path=/head/; revision=419989
Diffstat (limited to 'sysutils/syslog-ng-devel/files/patch-configure')
-rw-r--r--sysutils/syslog-ng-devel/files/patch-configure96
1 files changed, 93 insertions, 3 deletions
diff --git a/sysutils/syslog-ng-devel/files/patch-configure b/sysutils/syslog-ng-devel/files/patch-configure
index c3c533b2df4c..7a9c97a5a1cd 100644
--- a/sysutils/syslog-ng-devel/files/patch-configure
+++ b/sysutils/syslog-ng-devel/files/patch-configure
@@ -1,6 +1,78 @@
---- 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-07-28 04:37:01.000000000 -0700
++++ configure 2016-08-09 20:31:51.087322000 -0700
+@@ -10483,7 +10483,7 @@
+ hardcode_minus_L=no
+ hardcode_shlibpath_var=unsupported
+ inherit_rpath=no
+- link_all_deplibs=unknown
++ link_all_deplibs=no
+ module_cmds=
+ module_expsym_cmds=
+ old_archive_from_new_cmds=
+@@ -10785,7 +10785,7 @@
+ wlarc=
+ else
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
+ fi
+ ;;
+
+@@ -10804,7 +10804,7 @@
+ _LT_EOF
+ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
+ else
+ ld_shlibs=no
+ fi
+@@ -10833,7 +10833,7 @@
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
+ else
+ ld_shlibs=no
+ fi
+@@ -10851,7 +10851,7 @@
+ *)
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
+ else
+ ld_shlibs=no
+ fi
+@@ -11500,7 +11500,7 @@
+ hardcode_direct_absolute=yes
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
++ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-version-script,$lib-ver'
+ hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+ export_dynamic_flag_spec='$wl-E'
+ else
+@@ -12349,7 +12349,7 @@
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' soname_spec='$libname$release$shared_ext$major'
+ soname_spec='$libname$release$shared_ext$major'
+ need_version=no
+ need_lib_prefix=no
+@@ -13493,7 +13493,7 @@
+ old_striplib=
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+ $as_echo_n "checking whether stripping libraries is possible... " >&6; }
+-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
++if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "strip" >/dev/null; then
+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+ test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+@@ -15656,9 +15656,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 +84,21 @@
fi
if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then
+@@ -16879,7 +16879,7 @@
+ if test -e "$JAVA_HOME_CHECKER"; then
+ JNI_HOME=`$JAVA_HOME_CHECKER`
+ else
+- JNI_HOME=`echo $JAVAC_BIN | sed "s/\(.*\)[/]bin[/]java.*/\1\//"`
++ JNI_HOME=`echo $JAVAC_BIN | sed "s/\(.*\)[/]bin[/]java.*/\1\/openjdk\*/"`
+ fi
+
+ JNI_LIBDIR=`find $JNI_HOME \( -name "libjvm.so" -or -name "libjvm.dylib" \) \
+@@ -16980,7 +16980,7 @@
+ if test -e "$JAVA_HOME_CHECKER"; then
+ JNI_HOME=`$JAVA_HOME_CHECKER`
+ else
+- JNI_HOME=`echo $JAVAC_BIN | sed "s/\(.*\)[/]bin[/]java.*/\1\//"`
++ JNI_HOME=`echo $JAVAC_BIN | sed "s/\(.*\)[/]bin[/]java.*/\1\/openjdk\*/"`
+ fi
+
+ JNI_LIBDIR=`find $JNI_HOME \( -name "libjvm.so" -or -name "libjvm.dylib" \) \