summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-support/syslog-ng/syslog-ng.inc11
-rw-r--r--meta-oe/recipes-support/syslog-ng/syslog-ng_3.6.4.bb2
2 files changed, 10 insertions, 3 deletions
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
index 21d1748777..a5e1bfe489 100644
--- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
+++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
@@ -22,7 +22,7 @@ SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/${PV}/source
22 file://configure.ac-add-option-enable-thread-tls-to-manage-.patch \ 22 file://configure.ac-add-option-enable-thread-tls-to-manage-.patch \
23" 23"
24 24
25inherit autotools systemd pkgconfig update-rc.d 25inherit autotools gettext systemd pkgconfig update-rc.d
26 26
27EXTRA_OECONF = " \ 27EXTRA_OECONF = " \
28 --enable-dynamic-linking \ 28 --enable-dynamic-linking \
@@ -55,6 +55,15 @@ PACKAGECONFIG[json] = "--enable-json,--disable-json,json-c,"
55PACKAGECONFIG[tcp-wrapper] = "--enable-tcp-wrapper,--disable-tcp-wrapper,tcp-wrappers," 55PACKAGECONFIG[tcp-wrapper] = "--enable-tcp-wrapper,--disable-tcp-wrapper,tcp-wrappers,"
56PACKAGECONFIG[geoip] = "--enable-geoip,--disable-geoip,geoip," 56PACKAGECONFIG[geoip] = "--enable-geoip,--disable-geoip,geoip,"
57 57
58do_configure_prepend() {
59 olddir=$(pwd)
60 cd ${AUTOTOOLS_SCRIPT_PATH}
61
62 ACLOCAL="$ACLOCAL" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} -I ${S}/m4 ${ACLOCALEXTRAPATH} || die "extra autoreconf execution failed."
63
64 cd $olddir
65}
66
58do_install_prepend() { 67do_install_prepend() {
59 sed -i -e 's,@SBINDIR@,${sbindir},g' ${S}/contrib/systemd/*.service 68 sed -i -e 's,@SBINDIR@,${sbindir},g' ${S}/contrib/systemd/*.service
60 sed -i -e 's,@LOCALSTATEDIR@,${localstatedir},g' ${S}/contrib/systemd/*.service 69 sed -i -e 's,@LOCALSTATEDIR@,${localstatedir},g' ${S}/contrib/systemd/*.service
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng_3.6.4.bb b/meta-oe/recipes-support/syslog-ng/syslog-ng_3.6.4.bb
index bee1e19e43..73609af108 100644
--- a/meta-oe/recipes-support/syslog-ng/syslog-ng_3.6.4.bb
+++ b/meta-oe/recipes-support/syslog-ng/syslog-ng_3.6.4.bb
@@ -13,5 +13,3 @@ SRC_URI += " \
13 13
14SRC_URI[md5sum] = "e9f401615e92e5eb27396c995c1446ba" 14SRC_URI[md5sum] = "e9f401615e92e5eb27396c995c1446ba"
15SRC_URI[sha256sum] = "7be11df31ac7d716f1f952e22b5ae8e2049edd633a41b223776a853d9106f4e7" 15SRC_URI[sha256sum] = "7be11df31ac7d716f1f952e22b5ae8e2049edd633a41b223776a853d9106f4e7"
16
17PNBLACKLIST[syslog-ng] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130631/"