[PATCH] libtool: Put all libltdl headers in the correct libltdl-dev package

[PATCH] libtool: Put all libltdl headers in the correct libltdl-dev package

[Colin Walters]

[-- Attachment #1: Type: text/plain, Size: 17 bytes --]

See attached.


[-- Attachment #2: 0001-libtool-Put-all-libltdl-headers-in-the-correct-liblt.patch --]
[-- Type: text/x-patch, Size: 1321 bytes --]

From e525d755da98d9f6accab007ed46fee52f4b6e44 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sun, 15 Jan 2012 13:11:43 -0500
Subject: [PATCH] libtool: Put all libltdl headers in the correct libltdl-dev
 package

/usr/include/ltdl.h was in libtldl-dev, but not the headers it depends
on.
---
 meta/recipes-devtools/libtool/libtool-2.4.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/libtool/libtool-2.4.inc b/meta/recipes-devtools/libtool/libtool-2.4.inc
index e3d17b7..d4f6011 100644
--- a/meta/recipes-devtools/libtool/libtool-2.4.inc
+++ b/meta/recipes-devtools/libtool/libtool-2.4.inc
@@ -4,10 +4,10 @@ DEPENDS = "libtool-native"
 PACKAGES =+ "libltdl libltdl-dev libltdl-dbg"
 FILES_${PN} += "${datadir}/aclocal*"
 FILES_libltdl = "${libdir}/libltdl.so.*"
-FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h"
+FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h ${includedir}/libltdl/*.h"
 FILES_libltdl-dbg = "${libdir}/.debug/"
 
 SRC_URI[md5sum] = "b32b04148ecdd7344abc6fe8bd1bb021"
 SRC_URI[sha256sum] = "13df57ab63a94e196c5d6e95d64e53262834fe780d5e82c28f177f9f71ddf62e"
 
-EXTRA_OECONF = "--with-sysroot"
\ No newline at end of file
+EXTRA_OECONF = "--with-sysroot"
-- 
1.7.6.4

Re: [PATCH] libtool: Put all libltdl headers in the correct libltdl-dev package

[Saul Wold]

On 01/15/2012 10:13 AM, Colin Walters wrote:
> See attached.
>
>
The current version is 2.4.2 and this requires a PR bump.

Also, can you use "git send-email" directly instead of sending the patch 
as an attachment, when sent that way, it requires extra steps to edit 
the file before applying.

Thanks
	Sau!

>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [PATCH] libtool: Put all libltdl headers in the correct libltdl-dev package

[Colin Walters]

On Sun, 2012-01-15 at 20:11 -0800, Saul Wold wrote:
> On 01/15/2012 10:13 AM, Colin Walters wrote:
> > See attached.
> >
> >
> The current version is 2.4.2 and this requires a PR bump.

Hm, do you want a new patch that bumps the PR?  What are the rules for
when a PR should be incremented?

> Also, can you use "git send-email" directly instead of sending the patch 
> as an attachment, when sent that way, it requires extra steps to edit 
> the file before applying.

Ah...the problem is that I'd have to teach git-send-email how to
authenticate to my mail server which isn't trivial.  Would a workflow
where I paste the patch inline (thus creating whitespace damage), but
also link to my github mirror work?  Let's try it with a new patch:

https://github.com/cgwalters/poky/commit/0255ac2e95bb5230f7fdf1b861be0b97b01f2ecf

From 0255ac2e95bb5230f7fdf1b861be0b97b01f2ecf Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 17 Jan 2012 09:06:28 -0500
Subject: [PATCH] zlib: Build and install zlib.pc

Poky has a fork of the zlib build system which presently installs
headers and the shared library, but neglects the zlib.pc file.
Several components (e.g. glib, WebKitGtk) look for this, so let's
provide it.
---
 meta/recipes-core/zlib/files/Makefile.am  |    3 +++
 meta/recipes-core/zlib/files/configure.ac |    3 ++-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-core/zlib/files/Makefile.am
b/meta/recipes-core/zlib/files/Makefile.am
index b66d299..0458892 100644
--- a/meta/recipes-core/zlib/files/Makefile.am
+++ b/meta/recipes-core/zlib/files/Makefile.am
@@ -7,3 +7,6 @@ libz_la_SOURCES = adler32.c compress.c crc32.c gzlib.c
gzclose.c gzread.c \
 libz_la_LDFLAGS = -version-number 1:2:5 --version-script zlib.map
 
 include_HEADERS = zconf.h zlib.h zlibdefs.h
+
+pkgconfigdir = ${libdir}/pkgconfig
+pkgconfig_DATA = zlib.pc
diff --git a/meta/recipes-core/zlib/files/configure.ac
b/meta/recipes-core/zlib/files/configure.ac
index 4761b7e..5698175 100644
--- a/meta/recipes-core/zlib/files/configure.ac
+++ b/meta/recipes-core/zlib/files/configure.ac
@@ -43,6 +43,7 @@ cat > zlibdefs.h << EOF
 #endif
 EOF
 
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile
+	         zlib.pc])
 
 AC_OUTPUT
-- 
1.7.6.5

Re: [PATCH] libtool: Put all libltdl headers in the correct libltdl-dev package

[Koen Kooi]

Op 17 jan. 2012, om 16:09 heeft Colin Walters het volgende geschreven:

> On Sun, 2012-01-15 at 20:11 -0800, Saul Wold wrote:
>> On 01/15/2012 10:13 AM, Colin Walters wrote:
>>> See attached.
>>> 
>>> 
>> The current version is 2.4.2 and this requires a PR bump.
> 
> Hm, do you want a new patch that bumps the PR?  What are the rules for
> when a PR should be incremented?
> 
>> Also, can you use "git send-email" directly instead of sending the patch 
>> as an attachment, when sent that way, it requires extra steps to edit 
>> the file before applying.
> 
> Ah...the problem is that I'd have to teach git-send-email how to
> authenticate to my mail server which isn't trivial.  Would a workflow
> where I paste the patch inline (thus creating whitespace damage), but
> also link to my github mirror work?  Let's try it with a new patch:
> 
> https://github.com/cgwalters/poky/commit/0255ac2e95bb5230f7fdf1b861be0b97b01f2ecf

FWIW http://cgit.openembedded.org/openembedded-core/commit/?id=e1312eef88cb0f3f1557d431f0b31520b2a9968e attempts to fix that, but your solution is cleaner

Re: [PATCH] libtool: Put all libltdl headers in the correct libltdl-dev package

[Saul Wold]

On 01/17/2012 07:09 AM, Colin Walters wrote:
> On Sun, 2012-01-15 at 20:11 -0800, Saul Wold wrote:
>> On 01/15/2012 10:13 AM, Colin Walters wrote:
>>> See attached.
>>>
>>>
>> The current version is 2.4.2 and this requires a PR bump.
>
> Hm, do you want a new patch that bumps the PR?  What are the rules for
> when a PR should be incremented?
>
No, I updated your patch for 2.4.2.

The PR bumps required if the output of a package is going to change or a 
dependee needs to get rebuilt due to the change. Other than comments 
changing it's commonly required.

>> Also, can you use "git send-email" directly instead of sending the patch
>> as an attachment, when sent that way, it requires extra steps to edit
>> the file before applying.
>
> Ah...the problem is that I'd have to teach git-send-email how to
> authenticate to my mail server which isn't trivial.  Would a workflow
> where I paste the patch inline (thus creating whitespace damage), but
> also link to my github mirror work?  Let's try it with a new patch:
>
> https://github.com/cgwalters/poky/commit/0255ac2e95bb5230f7fdf1b861be0b97b01f2ecf
>
Yes, this will work better in the future, let me know the github branch 
that contains your patch against oe-core or poky master (which ever you 
prefer).

Thanks
	Sau!


>> From 0255ac2e95bb5230f7fdf1b861be0b97b01f2ecf Mon Sep 17 00:00:00 2001
> From: Colin Walters<walters@verbum.org>
> Date: Tue, 17 Jan 2012 09:06:28 -0500
> Subject: [PATCH] zlib: Build and install zlib.pc
>
> Poky has a fork of the zlib build system which presently installs
> headers and the shared library, but neglects the zlib.pc file.
> Several components (e.g. glib, WebKitGtk) look for this, so let's
> provide it.
> ---
>   meta/recipes-core/zlib/files/Makefile.am  |    3 +++
>   meta/recipes-core/zlib/files/configure.ac |    3 ++-
>   2 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/meta/recipes-core/zlib/files/Makefile.am
> b/meta/recipes-core/zlib/files/Makefile.am
> index b66d299..0458892 100644
> --- a/meta/recipes-core/zlib/files/Makefile.am
> +++ b/meta/recipes-core/zlib/files/Makefile.am
> @@ -7,3 +7,6 @@ libz_la_SOURCES = adler32.c compress.c crc32.c gzlib.c
> gzclose.c gzread.c \
>   libz_la_LDFLAGS = -version-number 1:2:5 --version-script zlib.map
>
>   include_HEADERS = zconf.h zlib.h zlibdefs.h
> +
> +pkgconfigdir = ${libdir}/pkgconfig
> +pkgconfig_DATA = zlib.pc
> diff --git a/meta/recipes-core/zlib/files/configure.ac
> b/meta/recipes-core/zlib/files/configure.ac
> index 4761b7e..5698175 100644
> --- a/meta/recipes-core/zlib/files/configure.ac
> +++ b/meta/recipes-core/zlib/files/configure.ac
> @@ -43,6 +43,7 @@ cat>  zlibdefs.h<<  EOF
>   #endif
>   EOF
>
> -AC_CONFIG_FILES([Makefile])
> +AC_CONFIG_FILES([Makefile
> +	         zlib.pc])
>
>   AC_OUTPUT

Re: [PATCH] libtool: Put all libltdl headers in the correct libltdl-dev package

[Colin Walters]

On Tue, 2012-01-17 at 11:37 -0800, Saul Wold wrote:

> > https://github.com/cgwalters/poky/commit/0255ac2e95bb5230f7fdf1b861be0b97b01f2ecf
> >
> Yes, this will work better in the future, let me know the github branch 
> that contains your patch against oe-core or poky master (which ever you 
> prefer).

I've uploaded all of my current patches to the "edison" branch here:
https://github.com/cgwalters/poky

There's a new one there for bash:

https://github.com/cgwalters/poky/commit/84549cb9435fe1bec38a18e1fe6daf350351cd5a

From 84549cb9435fe1bec38a18e1fe6daf350351cd5a Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 18 Jan 2012 14:45:21 -0500
Subject: [PATCH] bash: Ensure we use glibc getcwd(), not builtin copy

My build system runs in a chroot, and then creates bind mounts
that point outside of the chroot.  The bash implementation of getcwd()
breaks badly on this.

glibc has a perfectly working version which on modern Linux simply
invokes the getcwd() system call.  However, when cross compiling,
bash's configure script gives up, and so defers to its built in
version.

I'm not sure whether dietlibc/uclibc will malloc as bash wants, so
this patch may not be applicable everywhere.  Probably a better fix
would be for bash to detect glibc's get_current_dir_name() and use it.
---
 meta/recipes-extended/bash/bash.inc |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-extended/bash/bash.inc
b/meta/recipes-extended/bash/bash.inc
index 876be1e..f5a480a 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -14,7 +14,11 @@ PARALLEL_MAKE = ""
 bindir = "/bin"
 sbindir = "/sbin"
 
-EXTRA_OECONF = "--enable-job-control"
+# Override getcwd_malloc because the copy of getcwd()
+# in bash blows up when run inside a chroot and a bind
+# mount pointing outside.  This assumes we're using eglibc.
+EXTRA_OECONF = "--enable-job-control bash_cv_getcwd_malloc=yes "
+
 export CC_FOR_BUILD = "${BUILD_CC}"
 
 ALTERNATIVE_NAME = "sh"
-- 
1.7.6.5

Re: [PATCH] libtool: Put all libltdl headers in the correct libltdl-dev package

[Saul Wold]

On 01/18/2012 11:58 AM, Colin Walters wrote:
> On Tue, 2012-01-17 at 11:37 -0800, Saul Wold wrote:
>
>>> https://github.com/cgwalters/poky/commit/0255ac2e95bb5230f7fdf1b861be0b97b01f2ecf
>>>
>> Yes, this will work better in the future, let me know the github branch
>> that contains your patch against oe-core or poky master (which ever you
>> prefer).
>
> I've uploaded all of my current patches to the "edison" branch here:
> https://github.com/cgwalters/poky
>
Colin,

So are you asking that we pull all these changes into oe-core or this is 
the change set you have made for your system?  I guess I am alittle unclear.

Also, if you want items into OE-Core, you should ensure they are based 
against oe-core master.

Thanks

Sau!

> There's a new one there for bash:
>
> https://github.com/cgwalters/poky/commit/84549cb9435fe1bec38a18e1fe6daf350351cd5a
>
>> From 84549cb9435fe1bec38a18e1fe6daf350351cd5a Mon Sep 17 00:00:00 2001
> From: Colin Walters<walters@verbum.org>
> Date: Wed, 18 Jan 2012 14:45:21 -0500
> Subject: [PATCH] bash: Ensure we use glibc getcwd(), not builtin copy
>
> My build system runs in a chroot, and then creates bind mounts
> that point outside of the chroot.  The bash implementation of getcwd()
> breaks badly on this.
>
> glibc has a perfectly working version which on modern Linux simply
> invokes the getcwd() system call.  However, when cross compiling,
> bash's configure script gives up, and so defers to its built in
> version.
>
> I'm not sure whether dietlibc/uclibc will malloc as bash wants, so
> this patch may not be applicable everywhere.  Probably a better fix
> would be for bash to detect glibc's get_current_dir_name() and use it.
> ---
>   meta/recipes-extended/bash/bash.inc |    6 +++++-
>   1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/meta/recipes-extended/bash/bash.inc
> b/meta/recipes-extended/bash/bash.inc
> index 876be1e..f5a480a 100644
> --- a/meta/recipes-extended/bash/bash.inc
> +++ b/meta/recipes-extended/bash/bash.inc
> @@ -14,7 +14,11 @@ PARALLEL_MAKE = ""
>   bindir = "/bin"
>   sbindir = "/sbin"
>
> -EXTRA_OECONF = "--enable-job-control"
> +# Override getcwd_malloc because the copy of getcwd()
> +# in bash blows up when run inside a chroot and a bind
> +# mount pointing outside.  This assumes we're using eglibc.
> +EXTRA_OECONF = "--enable-job-control bash_cv_getcwd_malloc=yes "
> +
>   export CC_FOR_BUILD = "${BUILD_CC}"
>
>   ALTERNATIVE_NAME = "sh"

Re: [PATCH] libtool: Put all libltdl headers in the correct libltdl-dev package

[Colin Walters]

On Wed, 2012-01-18 at 12:32 -0800, Saul Wold wrote:

> So are you asking that we pull all these changes into oe-core or this is 
> the change set you have made for your system?  I guess I am alittle unclear.

Not all of them; I have the hack-around to remove -dev dependency chain
in there for example.  I've been sending here the ones that are pure
bugfixes.

> Also, if you want items into OE-Core, you should ensure they are based 
> against oe-core master.

Ok.  It'll take me a bit to set up a build/test environment for it.