mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-05 02:50:46 +00:00
syslog-ng: Run autoreconf twice to avoid problems with libtool
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 <peter.kjellerstedt@axis.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
committed by
Martin Jansa
parent
fcd985180b
commit
a4835a616b
@@ -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
|
||||
|
||||
@@ -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/"
|
||||
|
||||
Reference in New Issue
Block a user