Patchwork zlib: substitute sharedlibdir

login
register
mail settings
Submitter Enrico Scholz
Date Jan. 13, 2011, 2:29 p.m.
Message ID <1294928952-25833-1-git-send-email-enrico.scholz@sigma-chemnitz.de>
Download mbox | patch
Permalink /patch/270/
State New, archived
Headers show

Comments

Enrico Scholz - Jan. 13, 2011, 2:29 p.m.
From: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>

@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 <enrico.scholz@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(-)
Khem Raj - Jan. 14, 2011, 3:24 a.m.
On 1/13/2011 6:29 AM, Enrico Scholz wrote:
> From: Enrico Scholz<enrico.scholz@informatik.tu-chemnitz.de>
>
> @sharedlibdir@ is not substituted so that linkerflags in zlib.pc expand to
> "... -L@sharedlibdir@" which breaks e.g. glib builds.
>


I think zlib has --sharedlibdir configure option since 1.2.4.4+
so you could try to use it instead of patching

> Signed-off-by: Enrico Scholz<enrico.scholz@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 "
>
Enrico Scholz - Jan. 14, 2011, 9:55 a.m.
Khem Raj <raj.khem@gmail.com> writes:

>> @sharedlibdir@ is not substituted so that linkerflags in zlib.pc expand to
>> "... -L@sharedlibdir@" which breaks e.g. glib builds.
>
> I think zlib has --sharedlibdir configure option since 1.2.4.4+
> so you could try to use it instead of patching

afais, the ./configure will be completely replaced due to the
0001-autotools.patch (added by a2393dbf941554098).  So there exists no
such option anymore.


>> --- 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


Enrico
Khem Raj - Jan. 14, 2011, 8:10 p.m.
On Fri, Jan 14, 2011 at 1:55 AM, Enrico Scholz
<enrico.scholz@sigma-chemnitz.de> wrote:
> Khem Raj <raj.khem@gmail.com> writes:
>
>>> @sharedlibdir@ is not substituted so that linkerflags in zlib.pc expand to
>>> "... -L@sharedlibdir@" which breaks e.g. glib builds.
>>
>> I think zlib has --sharedlibdir configure option since 1.2.4.4+
>> so you could try to use it instead of patching
>
> afais, the ./configure will be completely replaced due to the
> 0001-autotools.patch (added by a2393dbf941554098).  So there exists no
> such option anymore.

now that I look into OE we have autoconf'ed it ourselves. Originally
it has a configure
but not all configure scripts are generated via autoconf so We kind of
swerved away
from zlib's build system has anyone proposed it to zlib upstream that
they autconf
their build system ? otherwise I think it would be better to use the
configure script as is

>
>
>>> --- 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
>
>
> Enrico
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>

Patch

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 "