build internal ivykis as static library only

Otherwise dynamic library is used and the system one would be used on
runtime even though  --without system_libivykis was used.

diff --git a/no_shared_ivykis.patch b/no_shared_ivykis.patch
new file mode 100644 (file)
index 0000000..2f6f5c4
--- /dev/null
+++ b/no_shared_ivykis.patch
@@ -0,0 +1,11 @@
+--- syslog-ng-syslog-ng-3.14.1.orig/lib/ivykis/configure.ac    2017-10-18 01:42:59.000000000 +0200
++++ syslog-ng-syslog-ng-3.14.1/lib/ivykis/configure.ac 2018-03-30 15:58:09.000000000 +0200
+@@ -22,7 +22,7 @@
+ esac
+ 
+ # Checks for programs.
+-LT_INIT
++LT_INIT([disable-shared])
+ AC_PROG_CC
+ AC_PROG_LIBTOOL
+ 

diff --git a/syslog-ng.spec b/syslog-ng.spec
index bc9cb48bdd46fbb67bccdaf5a1759f0e58bb5bec..0fee2ae9008752fb1f2e3457dd47ac6b6c136bbe 100644 (file)
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -65,6 +65,7 @@ Patch2:               %{name}-nolibs.patch
 Patch3:                %{name}-systemd.patch
 Patch4:                man-paths.patch
 Patch5:                %{name}-link.patch
+Patch6:                no_shared_ivykis.patch
 URL:           https://syslog-ng.org/
 %{?with_geoip:BuildRequires:   GeoIP-devel >= 1.5.1}
 BuildRequires: autoconf >= 2.59
@@ -333,13 +334,14 @@ Pliki nagłówkowe do tworzenia modułów dla sysloga-ng.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 cp -p %{SOURCE4} doc
 cp -p %{SOURCE5} contrib/syslog-ng.conf.simple
 
 %{__sed} -i -e 's|/usr/bin/awk|/bin/awk|' scl/syslogconf/convert-syslogconf.awk
 
 rmdir lib/ivykis
-ln -s ../ivykis-%{libivykis_version} lib/ivykis
+mv ivykis-%{libivykis_version} lib/ivykis
 
 %build
 for i in . ; do