[18/20] eglibc: refactor packages for staticdev

Submitted by Saul Wold on Jan. 21, 2012, 5:18 a.m.

Details

Message ID 4236e557f38c0e4c3e7088fd528face5b74f60a8.1327123057.git.sgw@linux.intel.com
State New
Headers show

Commit Message

Saul Wold Jan. 21, 2012, 5:18 a.m.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-core/eglibc/eglibc-package.inc |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index 020f558..9259593 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -20,13 +20,14 @@  USE_LDCONFIG ?= "1"
 PKGSUFFIX = ""
 PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
 
-PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-utils eglibc-extra-nss${PKGSUFFIX} eglibc-thread-db${PKGSUFFIX} ${PN}-pic ${PN}-dev ${PN}-doc libcidn${PKGSUFFIX} libmemusage${PKGSUFFIX} libsegfault${PKGSUFFIX} ${PN}-pcprofile libsotruss${PKGSUFFIX}"
+PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-utils eglibc-extra-nss${PKGSUFFIX} eglibc-thread-db${PKGSUFFIX} ${PN}-pic ${PN}-dev ${PN}-staticdev ${PN}-doc libcidn${PKGSUFFIX} libmemusage${PKGSUFFIX} libsegfault${PKGSUFFIX} ${PN}-pcprofile libsotruss${PKGSUFFIX}"
 
 # The ld.so in this eglibc supports the GNU_HASH
 RPROVIDES_${PN} = "glibc${PKGSUFFIX} rtld(GNU_HASH)"
 RPROVIDES_${PN}-utils = "glibc${PKGSUFFIX}-utils"
 RPROVIDES_${PN}-pic = "glibc${PKGSUFFIX}-pic"
 RPROVIDES_${PN}-dev = "glibc${PKGSUFFIX}-dev"
+RPROVIDES_${PN}-staticdev = "glibc${PKGSUFFIX}-staticdev"
 RPROVIDES_${PN}-doc = "glibc${PKGSUFFIX}-doc"
 RPROVIDES_eglibc-extra-nss${PKGSUFFIX} = "glibc-extra-nss${PKGSUFFIX}"
 RPROVIDES_eglibc-thread-db${PKGSUFFIX} = "glibc-thread-db${PKGSUFFIX}"
@@ -43,8 +44,9 @@  FILES_eglibc-extra-nss${PKGSUFFIX} = "${base_libdir}/libnss_*-*.so ${base_libdir
 FILES_sln${PKGSUFFIX} = "/sbin/sln"
 FILES_${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/"
 FILES_libsotruss${PKGSUFFIX} = "${libdir}/audit/sotruss-lib.so"
-FILES_${PN}-dev_append += "${bindir}/rpcgen ${libdir}/*.a \
-	${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal"
+FILES_${PN}-dev_append += "${bindir}/rpcgen ${libdir}/*_nonshared.a \
+	${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal"
+FILES_${PN}-staticdev_append += "${libdir}/*.a ${base_libdir}/*.a"
 FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*"
 FILES_${PN}-utils = "${bindir}/* ${sbindir}/*"
 FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug"
@@ -54,6 +56,7 @@  RDEPENDS_${PN}-utils += "bash"
 FILES_${PN}-pcprofile = "${base_libdir}/libpcprofile.so"
 FILES_eglibc-thread-db${PKGSUFFIX} = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so"
 RPROVIDES_${PN}-dev += "libc-dev"
+RPROVIDES_${PN}-dev += "libc-staticdev"
 
 SUMMARY_sln = "The static ln."
 DESCRIPTION_sln = "Similar to the 'ln' utility, but statically linked.  sln is useful to make symbolic links to dynamic libraries if the dynamic linking system, for some reason, is not functional."

Comments

Phil Blundell Jan. 22, 2012, 8:30 p.m.
On Fri, 2012-01-20 at 21:18 -0800, Saul Wold wrote:
> @@ -54,6 +56,7 @@ RDEPENDS_${PN}-utils += "bash"
>  FILES_${PN}-pcprofile = "${base_libdir}/libpcprofile.so"
>  FILES_eglibc-thread-db${PKGSUFFIX} = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so"
>  RPROVIDES_${PN}-dev += "libc-dev"
> +RPROVIDES_${PN}-dev += "libc-staticdev"

Is that really what you wanted?

More generally, I'm not very convinced that all these RPROVIDES in the
eglibc recipes are serving any useful purpose anymore.  I think we
should be trying to get rid of them, not adding new ones.  Does anybody
know of anything which currently depends on them?

p.
Saul Wold Jan. 23, 2012, 4:28 p.m.
On 01/22/2012 12:30 PM, Phil Blundell wrote:
> On Fri, 2012-01-20 at 21:18 -0800, Saul Wold wrote:
>> @@ -54,6 +56,7 @@ RDEPENDS_${PN}-utils += "bash"
>>   FILES_${PN}-pcprofile = "${base_libdir}/libpcprofile.so"
>>   FILES_eglibc-thread-db${PKGSUFFIX} = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so"
>>   RPROVIDES_${PN}-dev += "libc-dev"
>> +RPROVIDES_${PN}-dev += "libc-staticdev"
>
> Is that really what you wanted?
>
> More generally, I'm not very convinced that all these RPROVIDES in the
> eglibc recipes are serving any useful purpose anymore.  I think we
> should be trying to get rid of them, not adding new ones.  Does anybody
> know of anything which currently depends on them?
>
Nothing in OE-Core, meta-oe or OE Classic seems to depend on these, but 
I thought part of that was the translation from eglibc to the generic "libc"

Sau!



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