mesa depending on samba or samba depending on extern talloc?

mesa depending on samba or samba depending on extern talloc?

[Martin Jansa]

On 2010-10-20 I've pushed newer mesa-7.9
http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=30a3ea891d4511059a51882674f33aff2dddb96e
which depends on talloc
http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=fabce288e40037d28c70f0f034185176f85e8664
and separate talloc recipe (because building whole samba just to provide talloc for mesa seems wrong
and samba produced ICE before khem's fix) 
http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=afce52663d6b5b79c097136fa794dd3f76a4afff

Today I noticed, that usr/lib/pkgconfig/talloc.pc from talloc recipe was enough for mesa to compile, 
but because there was no libtalloc.so link it wasn't used in the end (as ldd confirms).

so talloc stages:
bitbake@jama ~ $ ll tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.*
-rwxr-xr-x 1 bitbake bitbake  32K Dec 21 13:30 tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.a
-rwxr-xr-x 1 bitbake bitbake  73K Dec 21 13:30 tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.so.2.0.1
bitbake@jama ~ $ ll tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/pkgconfig/talloc.pc
-rw-r--r-- 1 bitbake bitbake 251 Dec 21 13:30 tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/pkgconfig/talloc.pc

samba adds:
bitbake@jama ~ $ ll tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.*
lrwxrwxrwx 1 bitbake bitbake   14 Dec 14 13:33 tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.so -> libtalloc.so.1
-rwxr-xr-x 1 bitbake bitbake 123K Dec 14 13:33 tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.so.1

now for sure I don't want to install whole samba on target (just for libtalloc) so I have few options

1) fix talloc to install libtalloc.so -> libtalloc.so.2.0.1 (conflicts with samba in sysroot)
2a) move libtalloc to separate package in samba recipe and make mesa depending on samba
2b) move libtalloc to separate package in samba recipe in case someone builds 
    it before mesa, but still depend only on fixed talloc
3) fix talloc + force samba build to use already installed libtalloc instead of building own version

Option 3) looks best, but I'm not sure how tightly samba depends on talloc 
and don't have time to test all samba versions we currently have
(3.0.23c, 3.0.34, 3.2.15, 3.3.0, 3.3.9, 3.5.6), so 2b) looks as easier fix.

CCed 2 samba maintainers (wrt MAINTAINERS file) or if there is someone who cares about samba
recipes: can you clean recipes/samba a bit and provide some feedback on talloc issue?

Regards,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[PATCH 1/2] talloc: install .so links

[Martin Jansa]

* otherwise mesa finds talloc.pc, but doesn't link to libtalloc.so.2 in the end
---
 recipes/talloc/talloc_2.0.1.bb |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/recipes/talloc/talloc_2.0.1.bb b/recipes/talloc/talloc_2.0.1.bb
index 9514a15..80f4b37 100644
--- a/recipes/talloc/talloc_2.0.1.bb
+++ b/recipes/talloc/talloc_2.0.1.bb
@@ -10,8 +10,17 @@ SRC_URI[sha256sum] = "5b810527405f29d54f50efd78bf2c89e318f2cd8bed001f22f2a1412fd
 
 TARGET_CC_ARCH += "${LDFLAGS}"
 
+PR = "r1"
+
 # autoreconf doesn't work well while reconfiguring included libreplace
 do_configure () {
        gnu-configize
        oe_runconf
 }
+
+do_install_append() {
+       install -d ${D}${libdir}
+       ln -s libtalloc.so.2.0.1 ${D}${libdir}/libtalloc.so.2.0
+       ln -s libtalloc.so.2.0 ${D}${libdir}/libtalloc.so.2
+       ln -s libtalloc.so.2 ${D}${libdir}/libtalloc.so
+}
-- 
1.7.3.4

Re: [PATCH 1/2] talloc: install .so links

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Acked-by: Koen Kooi <koen@openembedded.org>

On 21-12-10 15:09, Martin Jansa wrote:
> * otherwise mesa finds talloc.pc, but doesn't link to libtalloc.so.2 in the end
> ---
>  recipes/talloc/talloc_2.0.1.bb |    9 +++++++++
>  1 files changed, 9 insertions(+), 0 deletions(-)
> 
> diff --git a/recipes/talloc/talloc_2.0.1.bb b/recipes/talloc/talloc_2.0.1.bb
> index 9514a15..80f4b37 100644
> --- a/recipes/talloc/talloc_2.0.1.bb
> +++ b/recipes/talloc/talloc_2.0.1.bb
> @@ -10,8 +10,17 @@ SRC_URI[sha256sum] = "5b810527405f29d54f50efd78bf2c89e318f2cd8bed001f22f2a1412fd
>  
>  TARGET_CC_ARCH += "${LDFLAGS}"
>  
> +PR = "r1"
> +
>  # autoreconf doesn't work well while reconfiguring included libreplace
>  do_configure () {
>         gnu-configize
>         oe_runconf
>  }
> +
> +do_install_append() {
> +       install -d ${D}${libdir}
> +       ln -s libtalloc.so.2.0.1 ${D}${libdir}/libtalloc.so.2.0
> +       ln -s libtalloc.so.2.0 ${D}${libdir}/libtalloc.so.2
> +       ln -s libtalloc.so.2 ${D}${libdir}/libtalloc.so
> +}

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNENUYMkyGM64RGpERAipoAJwO7iq3HesWj8x9o4vnW3v2aNEirACgvDn9
QaeCjBOjMtbmsD1cd+T+1P0=
=Vb7w
-----END PGP SIGNATURE-----

[PATCH 2/2] samba: use external talloc instead of building own

[Martin Jansa]

* libtalloc now conflicts with libtalloc from talloc recipe
* tested only with samba-3.2.15
---
 recipes/samba/samba.inc       |    3 ++-
 recipes/samba/samba_3.2.15.bb |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/recipes/samba/samba.inc b/recipes/samba/samba.inc
index a95106d..e5fa06e 100644
--- a/recipes/samba/samba.inc
+++ b/recipes/samba/samba.inc
@@ -1,6 +1,6 @@
 SECTION = "console/network"
 LICENSE = "GPL"
-DEPENDS = "readline virtual/libiconv"
+DEPENDS = "readline virtual/libiconv talloc"
 
 SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
            file://volatiles.03_samba \
@@ -37,6 +37,7 @@ EXTRA_OECONF='--disable-cups \
               --with-mandir=${mandir} \
               --with-swatdir=${datadir}/swat \
               --with-aio-support \
+              --without-libtalloc \
               samba_cv_struct_timespec=yes \
               libreplace_cv_HAVE_MMAP=${SAMBAMMAP}'
 
diff --git a/recipes/samba/samba_3.2.15.bb b/recipes/samba/samba_3.2.15.bb
index 3f535b6..ef2707e 100644
--- a/recipes/samba/samba_3.2.15.bb
+++ b/recipes/samba/samba_3.2.15.bb
@@ -9,7 +9,7 @@ SRC_URI += "file://configure-3.2.8.patch \
 SRC_URI[md5sum] = "5a3bcc4927c9643b9f42970d0815b18f"
 SRC_URI[sha256sum] = "84281fd1faeffee8558e49dff865dd382abbf78bc1be00f8cb5aa70aeea67d46"
 
-PR = "r2"
+PR = "r3"
 
 EXTRA_OECONF += "\
 	SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \
-- 
1.7.3.4

Re: [PATCH 2/2] samba: use external talloc instead of building own

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Acked-by: Koen Kooi <koen@openembedded.org>

On 21-12-10 15:09, Martin Jansa wrote:
> * libtalloc now conflicts with libtalloc from talloc recipe
> * tested only with samba-3.2.15
> ---
>  recipes/samba/samba.inc       |    3 ++-
>  recipes/samba/samba_3.2.15.bb |    2 +-
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/recipes/samba/samba.inc b/recipes/samba/samba.inc
> index a95106d..e5fa06e 100644
> --- a/recipes/samba/samba.inc
> +++ b/recipes/samba/samba.inc
> @@ -1,6 +1,6 @@
>  SECTION = "console/network"
>  LICENSE = "GPL"
> -DEPENDS = "readline virtual/libiconv"
> +DEPENDS = "readline virtual/libiconv talloc"
>  
>  SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
>             file://volatiles.03_samba \
> @@ -37,6 +37,7 @@ EXTRA_OECONF='--disable-cups \
>                --with-mandir=${mandir} \
>                --with-swatdir=${datadir}/swat \
>                --with-aio-support \
> +              --without-libtalloc \
>                samba_cv_struct_timespec=yes \
>                libreplace_cv_HAVE_MMAP=${SAMBAMMAP}'
>  
> diff --git a/recipes/samba/samba_3.2.15.bb b/recipes/samba/samba_3.2.15.bb
> index 3f535b6..ef2707e 100644
> --- a/recipes/samba/samba_3.2.15.bb
> +++ b/recipes/samba/samba_3.2.15.bb
> @@ -9,7 +9,7 @@ SRC_URI += "file://configure-3.2.8.patch \
>  SRC_URI[md5sum] = "5a3bcc4927c9643b9f42970d0815b18f"
>  SRC_URI[sha256sum] = "84281fd1faeffee8558e49dff865dd382abbf78bc1be00f8cb5aa70aeea67d46"
>  
> -PR = "r2"
> +PR = "r3"
>  
>  EXTRA_OECONF += "\
>  	SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNENUhMkyGM64RGpERAlOOAJ9y27X2rICdmXw/uija6QDTyFEzyQCeMcac
wsIjyIKY6gnmpIbwvh9qjrw=
=8Xom
-----END PGP SIGNATURE-----

Re: mesa depending on samba or samba depending on extern talloc?

[Khem Raj]

On (21/12/10 14:35), Martin Jansa wrote:
> On 2010-10-20 I've pushed newer mesa-7.9
> http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=30a3ea891d4511059a51882674f33aff2dddb96e
> which depends on talloc
> http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=fabce288e40037d28c70f0f034185176f85e8664
> and separate talloc recipe (because building whole samba just to provide talloc for mesa seems wrong
> and samba produced ICE before khem's fix) 
> http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=afce52663d6b5b79c097136fa794dd3f76a4afff
> 
> Today I noticed, that usr/lib/pkgconfig/talloc.pc from talloc recipe was enough for mesa to compile, 
> but because there was no libtalloc.so link it wasn't used in the end (as ldd confirms).
> 
> so talloc stages:
> bitbake@jama ~ $ ll tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.*
> -rwxr-xr-x 1 bitbake bitbake  32K Dec 21 13:30 tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.a
> -rwxr-xr-x 1 bitbake bitbake  73K Dec 21 13:30 tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.so.2.0.1
> bitbake@jama ~ $ ll tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/pkgconfig/talloc.pc
> -rw-r--r-- 1 bitbake bitbake 251 Dec 21 13:30 tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/pkgconfig/talloc.pc
> 
> samba adds:
> bitbake@jama ~ $ ll tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.*
> lrwxrwxrwx 1 bitbake bitbake   14 Dec 14 13:33 tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.so -> libtalloc.so.1
> -rwxr-xr-x 1 bitbake bitbake 123K Dec 14 13:33 tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.so.1
> 
> now for sure I don't want to install whole samba on target (just for libtalloc) so I have few options
> 
> 1) fix talloc to install libtalloc.so -> libtalloc.so.2.0.1 (conflicts with samba in sysroot)
> 2a) move libtalloc to separate package in samba recipe and make mesa depending on samba
> 2b) move libtalloc to separate package in samba recipe in case someone builds 
>     it before mesa, but still depend only on fixed talloc
> 3) fix talloc + force samba build to use already installed libtalloc instead of building own version
> 
> Option 3) looks best, but I'm not sure how tightly samba depends on talloc 
> and don't have time to test all samba versions we currently have
> (3.0.23c, 3.0.34, 3.2.15, 3.3.0, 3.3.9, 3.5.6), so 2b) looks as easier fix.
> 
> CCed 2 samba maintainers (wrt MAINTAINERS file) or if there is someone who cares about samba
> recipes: can you clean recipes/samba a bit and provide some feedback on talloc issue?

I think its the same problem as described here 
http://lists-archives.org/samba/39218-re-re-libtalloc-on-samba-3-2-0.html

I think disabling the use of shared libs would be an ok solutions to. Try
that out.

> 
> Regards,
> 
> -- 
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Re: mesa depending on samba or samba depending on extern talloc?

[Martin Jansa]

On Tue, Dec 21, 2010 at 07:11:13AM -0800, Khem Raj wrote:
> On (21/12/10 14:35), Martin Jansa wrote:
> > On 2010-10-20 I've pushed newer mesa-7.9
> > http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=30a3ea891d4511059a51882674f33aff2dddb96e
> > which depends on talloc
> > http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=fabce288e40037d28c70f0f034185176f85e8664
> > and separate talloc recipe (because building whole samba just to provide talloc for mesa seems wrong
> > and samba produced ICE before khem's fix) 
> > http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=afce52663d6b5b79c097136fa794dd3f76a4afff
> > 
> > Today I noticed, that usr/lib/pkgconfig/talloc.pc from talloc recipe was enough for mesa to compile, 
> > but because there was no libtalloc.so link it wasn't used in the end (as ldd confirms).
> > 
> > so talloc stages:
> > bitbake@jama ~ $ ll tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.*
> > -rwxr-xr-x 1 bitbake bitbake  32K Dec 21 13:30 tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.a
> > -rwxr-xr-x 1 bitbake bitbake  73K Dec 21 13:30 tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.so.2.0.1
> > bitbake@jama ~ $ ll tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/pkgconfig/talloc.pc
> > -rw-r--r-- 1 bitbake bitbake 251 Dec 21 13:30 tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/pkgconfig/talloc.pc
> > 
> > samba adds:
> > bitbake@jama ~ $ ll tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.*
> > lrwxrwxrwx 1 bitbake bitbake   14 Dec 14 13:33 tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.so -> libtalloc.so.1
> > -rwxr-xr-x 1 bitbake bitbake 123K Dec 14 13:33 tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.so.1
> > 
> > now for sure I don't want to install whole samba on target (just for libtalloc) so I have few options
> > 
> > 1) fix talloc to install libtalloc.so -> libtalloc.so.2.0.1 (conflicts with samba in sysroot)
> > 2a) move libtalloc to separate package in samba recipe and make mesa depending on samba
> > 2b) move libtalloc to separate package in samba recipe in case someone builds 
> >     it before mesa, but still depend only on fixed talloc
> > 3) fix talloc + force samba build to use already installed libtalloc instead of building own version
> > 
> > Option 3) looks best, but I'm not sure how tightly samba depends on talloc 
> > and don't have time to test all samba versions we currently have
> > (3.0.23c, 3.0.34, 3.2.15, 3.3.0, 3.3.9, 3.5.6), so 2b) looks as easier fix.
> > 
> > CCed 2 samba maintainers (wrt MAINTAINERS file) or if there is someone who cares about samba
> > recipes: can you clean recipes/samba a bit and provide some feedback on talloc issue?
> 
> I think its the same problem as described here 
> http://lists-archives.org/samba/39218-re-re-libtalloc-on-samba-3-2-0.html
> 
> I think disabling the use of shared libs would be an ok solutions to. Try
> that out.

Hi,

after reading
http://lists.freedesktop.org/archives/mesa-dev/2010-August/002523.html
and checking how is this solved in gentoo, I have tried Option 3) 
(see resulting 2 patches sent here)

and resulting /usr/sbin/smbd is not linked to libtalloc
(--without-talloc seems enough).

Regards,
-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com