[oe] [PATCH] zlib: substitute sharedlibdir

Enrico Scholz enrico.scholz at sigma-chemnitz.de
Thu Jan 13 14:29:12 UTC 2011


From: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

@sharedlibdir@ is not substituted so that linkerflags in zlib.pc expand to
"... -L at sharedlibdir@" which breaks e.g. glib builds.

Signed-off-by: Enrico Scholz <enrico.scholz at sigma-chemnitz.de>
---
 recipes/zlib/zlib-1.2.5/0001-autotools.patch |    4 +++-
 recipes/zlib/zlib_1.2.5.bb                   |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/recipes/zlib/zlib-1.2.5/0001-autotools.patch b/recipes/zlib/zlib-1.2.5/0001-autotools.patch
index 6642860..f5c50f1 100644
--- a/recipes/zlib/zlib-1.2.5/0001-autotools.patch
+++ b/recipes/zlib/zlib-1.2.5/0001-autotools.patch
@@ -33,7 +33,7 @@ new file mode 100644
 index 0000000..177c89a
 --- /dev/null
 +++ b/configure.ac
-@@ -0,0 +1,17 @@
+@@ -0,0 +1,19 @@
 +AC_INIT(zlib,1.2.5)
 +AC_CONFIG_SRCDIR(adler32.c)
 +AM_INIT_AUTOMAKE(zlibs,1.2.5)
@@ -45,6 +45,8 @@ index 0000000..177c89a
 +
 +AC_HEADER_STDC
 +
++AC_SUBST(sharedlibdir,$libdir)
++
 +AC_CONFIG_FILES([
 +Makefile
 +zlib.pc
diff --git a/recipes/zlib/zlib_1.2.5.bb b/recipes/zlib/zlib_1.2.5.bb
index 34419f0..1f51404 100644
--- a/recipes/zlib/zlib_1.2.5.bb
+++ b/recipes/zlib/zlib_1.2.5.bb
@@ -1,6 +1,6 @@
 include zlib.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 SRC_URI += "file://0001-autotools.patch "
 
-- 
1.7.3.4





More information about the Openembedded-devel mailing list