syslog-ng has sub-projects with their own autotools configurations. Something has been messed up after the switch to RSS and now it requires autoreconf to be run twice to fully update all files.
Signed-off-by: Peter Kjellerstedt <[email protected]> --- meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 11 ++++++++++- meta-oe/recipes-support/syslog-ng/syslog-ng_3.6.4.bb | 2 -- 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 21d1748..a5e1bfe 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 file://configure.ac-add-option-enable-thread-tls-to-manage-.patch \ " -inherit autotools systemd pkgconfig update-rc.d +inherit autotools gettext systemd pkgconfig update-rc.d EXTRA_OECONF = " \ --enable-dynamic-linking \ @@ -55,6 +55,15 @@ PACKAGECONFIG[json] = "--enable-json,--disable-json,json-c," PACKAGECONFIG[tcp-wrapper] = "--enable-tcp-wrapper,--disable-tcp-wrapper,tcp-wrappers," PACKAGECONFIG[geoip] = "--enable-geoip,--disable-geoip,geoip," +do_configure_prepend() { + olddir=$(pwd) + cd ${AUTOTOOLS_SCRIPT_PATH} + + ACLOCAL="$ACLOCAL" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} -I ${S}/m4 ${ACLOCALEXTRAPATH} || die "extra autoreconf execution failed." + + cd $olddir +} + do_install_prepend() { sed -i -e 's,@SBINDIR@,${sbindir},g' ${S}/contrib/systemd/*.service 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 bee1e19..73609af 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 += " \ SRC_URI[md5sum] = "e9f401615e92e5eb27396c995c1446ba" SRC_URI[sha256sum] = "7be11df31ac7d716f1f952e22b5ae8e2049edd633a41b223776a853d9106f4e7" - -PNBLACKLIST[syslog-ng] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130631/"; -- 2.9.0 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
