diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2015-02-18 22:50:36 -0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-02-27 09:35:52 +0100 |
commit | f4a111e8d9e13e1702ef7502ca7468b9ccd035cd (patch) | |
tree | dbfca804a9efd60c0bf7a25f1e998cd5aa1b636c /meta-oe | |
parent | da6ca531874356077977e9bfed661629a95eb16d (diff) | |
download | meta-openembedded-contrib-f4a111e8d9e13e1702ef7502ca7468b9ccd035cd.tar.gz |
log4c: fix undeclared dependency on expat
The original log4c configure.in is buggy and requires fixing
before "configure --with-expat" works as expected.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-support/log4c/log4c/fix_configure_with-expat.patch | 21 | ||||
-rw-r--r-- | meta-oe/recipes-support/log4c/log4c_1.2.4.bb | 13 |
2 files changed, 27 insertions, 7 deletions
diff --git a/meta-oe/recipes-support/log4c/log4c/fix_configure_with-expat.patch b/meta-oe/recipes-support/log4c/log4c/fix_configure_with-expat.patch new file mode 100644 index 0000000000..4872eb4f5e --- /dev/null +++ b/meta-oe/recipes-support/log4c/log4c/fix_configure_with-expat.patch @@ -0,0 +1,21 @@ +The original use of AC_ARG_WITH is buggy and causes expat support +to be *disabled* if "--with-expat" is passed to configure. + +Upstream status: pending + +Index: log4c-1.2.4/configure.in +=================================================================== +--- log4c-1.2.4.orig/configure.in ++++ log4c-1.2.4/configure.in +@@ -217,9 +217,9 @@ AC_ARG_WITH(expat, + have any effect and Log4C uses some bundled yacc/lex code + for parsing it's configuration file. + ]), +- with_expat=no, ++ [], + with_expat=yes) +-if test x$with_expat = xyes ; then ++if test x$with_expat != xno ; then + use_expat=yes + AM_PATH_EXPAT(1.95.1) + fi diff --git a/meta-oe/recipes-support/log4c/log4c_1.2.4.bb b/meta-oe/recipes-support/log4c/log4c_1.2.4.bb index 43e074699b..ea75757f80 100644 --- a/meta-oe/recipes-support/log4c/log4c_1.2.4.bb +++ b/meta-oe/recipes-support/log4c/log4c_1.2.4.bb @@ -1,16 +1,15 @@ -SUMMARY = "Logging Framework for C" +SUMMARY = "Log4c is a C library for flexible logging to files, syslog and other destinations" HOMEPAGE = "http://log4c.sourceforge.net" LICENSE = "LGPLv2" - LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = "http://cznic.dl.sourceforge.net/project/log4c/log4c/${PV}/log4c-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \ + file://fix_configure_with-expat.patch" + SRC_URI[md5sum] = "0d94919136e1d16b68427562e74cb3dd" SRC_URI[sha256sum] = "5991020192f52cc40fa852fbf6bbf5bd5db5d5d00aa9905c67f6f0eadeed48ea" -S = "${WORKDIR}/${PN}-${PV}" - -EXTRA_OECONF = "--prefix=/usr" +PACKAGECONFIG ??= "expat" +PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat" inherit autotools - |