[oe-commits] Martin Jansa : libconfig_1.3.2: add patch for build with automake-1.11
git version control
git at git.openembedded.org
Thu Apr 22 13:17:25 UTC 2010
Module: openembedded.git
Branch: shr/testing2010
Commit: 3e3a9ab2f12c58204b7fe92233b189ef39965147
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=3e3a9ab2f12c58204b7fe92233b189ef39965147
Author: Martin Jansa <Martin.Jansa at gmail.com>
Date: Thu Apr 22 15:04:14 2010 +0200
libconfig_1.3.2: add patch for build with automake-1.11
* libconfig.h is installed twice from $(libinc) and then again from $(libinc_cpp)
* newer automake checks that and fails
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
.../libconfig.newer.automake-1.11.patch | 12 ++++++++++++
recipes/libconfig/libconfig_1.3.2.bb | 5 +++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/recipes/libconfig/libconfig-1.3.2/libconfig.newer.automake-1.11.patch b/recipes/libconfig/libconfig-1.3.2/libconfig.newer.automake-1.11.patch
new file mode 100644
index 0000000..cabd356
--- /dev/null
+++ b/recipes/libconfig/libconfig-1.3.2/libconfig.newer.automake-1.11.patch
@@ -0,0 +1,12 @@
+diff -uNr libconfig-1.3.2.orig//Makefile.am libconfig-1.3.2/Makefile.am
+--- libconfig-1.3.2.orig//Makefile.am 2009-02-18 20:46:32.000000000 +0100
++++ libconfig-1.3.2/Makefile.am 2010-04-22 14:59:36.000000000 +0200
+@@ -34,7 +34,7 @@
+ libinc = libconfig.h
+
+ libsrc_cpp = $(libsrc) libconfigcpp.c++
+-libinc_cpp = $(libinc) libconfig.h++
++libinc_cpp = libconfig.h++
+
+ BUILT_SOURCES = scanner.c scanner.h grammar.c grammar.h
+
diff --git a/recipes/libconfig/libconfig_1.3.2.bb b/recipes/libconfig/libconfig_1.3.2.bb
index df0be71..701ac73 100644
--- a/recipes/libconfig/libconfig_1.3.2.bb
+++ b/recipes/libconfig/libconfig_1.3.2.bb
@@ -4,9 +4,10 @@ HOMEPAGE = "http://www.hyperrealm.com/libconfig/"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "LGPLv2"
-PR = "r0"
+PR = "r1"
-SRC_URI = "http://www.hyperrealm.com/libconfig/libconfig-${PV}.tar.gz"
+SRC_URI = "http://www.hyperrealm.com/libconfig/libconfig-${PV}.tar.gz \
+ file://libconfig.newer.automake-1.11.patch;patch=1"
S = "${WORKDIR}/libconfig-${PV}"
More information about the Openembedded-commits
mailing list