From patchwork Thu Jan 13 14:29:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: zlib: substitute sharedlibdir Date: Thu, 13 Jan 2011 14:29:12 -0000 From: Enrico Scholz X-Patchwork-Id: 270 Message-Id: <1294928952-25833-1-git-send-email-enrico.scholz@sigma-chemnitz.de> To: openembedded-devel@lists.openembedded.org Cc: Enrico Scholz , Enrico Scholz From: Enrico Scholz @sharedlibdir@ is not substituted so that linkerflags in zlib.pc expand to "... -L@sharedlibdir@" which breaks e.g. glib builds. Signed-off-by: Enrico Scholz --- 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 "