provide libc-dev in glibc eglibc

provide libc-dev in glibc eglibc

[Khem Raj]

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

Hi

This patch makes an alias for libc-dev which points to libc6-dev in
glibc and eglibc. This makes this package have same name like uclibc.
This helps in writing recipes which uses these dev packages to use
just one name and do not worry about what system library is in use.

This also fixes  Bug 4509

OK for .dev?

Thanks

-Khem

[-- Attachment #2: diff --]
[-- Type: application/octet-stream, Size: 4137 bytes --]

#
# old_revision [4ce8b0e2eb5e8b07a54fe27fc7f1a050c1d2b006]
#
# patch "packages/eglibc/eglibc_svn.bb"
#  from [175848d8e38b548d456707101f14158a0aef0c9f]
#    to [bceddf7308e0f414a0a72c9673b0a5c60113ab38]
# 
# patch "packages/glibc/glibc_2.5.bb"
#  from [28f2f9a3a57828b85bdecaf06acd329fee9c0b86]
#    to [e1ba28537d17d77ef4d41459b16dd7d03c104eb3]
# 
# patch "packages/glibc/glibc_2.6.1.bb"
#  from [57bf7eb6dae142987a9e81c5916a9181d7ec554a]
#    to [cfa0bf9022d66f74cc3bbef64b2329a4d42737f6]
# 
# patch "packages/glibc/glibc_2.7.bb"
#  from [e91e43390c8241eaa333acc59cfd49359d7979fe]
#    to [50987e2d813b2e913a297d3c3ad19452582de98f]
# 
# patch "packages/tasks/task-native-sdk.bb"
#  from [e9aff3af03f3423a34dcb2853582e08fdd66a6a5]
#    to [591de88962699518213f057f9b89f95cdf500f11]
#
============================================================
--- packages/eglibc/eglibc_svn.bb	175848d8e38b548d456707101f14158a0aef0c9f
+++ packages/eglibc/eglibc_svn.bb	bceddf7308e0f414a0a72c9673b0a5c60113ab38
@@ -1,9 +1,9 @@ PV = "2.8+svnr${SRCREV}"
 require eglibc.inc
 
 # DEFAULT_PREFERENCE = "-1"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn"
 PV = "2.8+svnr${SRCREV}"
-PR = "r9"
+PR = "r10"
 SRC_URI = "svn://svn.eglibc.org;module=trunk \
            file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \
            file://etc/ld.so.conf \
@@ -12,7 +12,7 @@ PACKAGES_DYNAMIC = "libc6*"
 B = "${WORKDIR}/build-${TARGET_SYS}"
 
 PACKAGES_DYNAMIC = "libc6*"
-RPROVIDES_${PN}-dev = "libc6-dev"
+RPROVIDES_${PN}-dev = "libc6-dev libc-dev"
 PROVIDES_${PN}-dbg = "glibc-dbg"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
============================================================
--- packages/glibc/glibc_2.5.bb	28f2f9a3a57828b85bdecaf06acd329fee9c0b86
+++ packages/glibc/glibc_2.5.bb	e1ba28537d17d77ef4d41459b16dd7d03c104eb3
@@ -1,10 +1,10 @@ require glibc.inc
 require glibc.inc
-PR = "r16"
+PR = "r17"
 
 ARM_INSTRUCTION_SET = "arm"
 
 PACKAGES_DYNAMIC = "libc6*"
-RPROVIDES_${PN}-dev = "libc6-dev"
+RPROVIDES_${PN}-dev = "libc6-dev libc-dev"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
============================================================
--- packages/glibc/glibc_2.6.1.bb	57bf7eb6dae142987a9e81c5916a9181d7ec554a
+++ packages/glibc/glibc_2.6.1.bb	cfa0bf9022d66f74cc3bbef64b2329a4d42737f6
@@ -1,8 +1,8 @@ require glibc.inc
 require glibc.inc
-PR = "r10"
+PR = "r11"
 
 PACKAGES_DYNAMIC = "libc6*"
-RPROVIDES_${PN}-dev = "libc6-dev"
+RPROVIDES_${PN}-dev = "libc6-dev libc-dev"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
============================================================
--- packages/glibc/glibc_2.7.bb	e91e43390c8241eaa333acc59cfd49359d7979fe
+++ packages/glibc/glibc_2.7.bb	50987e2d813b2e913a297d3c3ad19452582de98f
@@ -1,11 +1,11 @@ PACKAGES_DYNAMIC = "libc6*"
 require glibc.inc
 
 ARM_INSTRUCTION_SET = "arm"
 
 PACKAGES_DYNAMIC = "libc6*"
-RPROVIDES_${PN}-dev = "libc6-dev"
+RPROVIDES_${PN}-dev = "libc6-dev libc-dev"
 
-PR = "r6"
+PR = "r7"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
============================================================
--- packages/tasks/task-native-sdk.bb	e9aff3af03f3423a34dcb2853582e08fdd66a6a5
+++ packages/tasks/task-native-sdk.bb	591de88962699518213f057f9b89f95cdf500f11
@@ -1,10 +1,11 @@ LICENSE = "MIT"
 DESCRIPTION = "Packages required for native (on-device) SDK"
 LICENSE = "MIT"
-DEPENDS = "gcc binutils make patch patchutils diffstat diffutils automake flex bison gawk sed grep"
-RDEPENDS = "gcc-symlinks g++-symlinks binutils-symlinks make libc6-dev \
+DEPENDS = "virtual/libc gcc binutils make patch patchutils diffstat diffutils automake flex bison gawk sed grep"
+RDEPENDS = "gcc-symlinks g++-symlinks cpp-symlinks binutils-symlinks \
+	    make libc-dev \
 	    flex flex-dev bison gawk sed grep autoconf automake make \
 	    patch patchutils diffstat diffutils libstdc++-dev"
-PR = "r2"
+PR = "r3"
 
 ALLOW_EMPTY = "1"
 PACKAGES = "${PN}"

Re: provide libc-dev in glibc eglibc

[Phil Blundell]

On Thu, 2008-08-21 at 18:25 -0700, Khem Raj wrote:
> This patch makes an alias for libc-dev which points to libc6-dev in
> glibc and eglibc. This makes this package have same name like uclibc.
> This helps in writing recipes which uses these dev packages to use
> just one name and do not worry about what system library is in use.

Is the existing libc-dev package (i.e. the one from uclibc) concrete or
virtual?  If the former then you should call this new alias something
like "virtual-libc-dev" and make uclibc's libc-dev provide it as well.
If libc-dev is already a pure virtual then I guess adding a direct
RPROVIDES for glibc is harmless enough, though it might still be a good
idea to use the "virtual-libc-dev" naming for clarity and to avoid any
future imbroglio with other libraries.

By the way, your diffs always seem to come out with MIME-type
"application/octet-stream" which makes them a bit tedious to view.
Could you send them as something like text/diff or text/plain in future?

p.

Re: provide libc-dev in glibc eglibc

[Khem Raj]

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

On (22/08/08 10:08), Phil Blundell wrote:
> On Thu, 2008-08-21 at 18:25 -0700, Khem Raj wrote:
> > This patch makes an alias for libc-dev which points to libc6-dev in
> > glibc and eglibc. This makes this package have same name like uclibc.
> > This helps in writing recipes which uses these dev packages to use
> > just one name and do not worry about what system library is in use.
> 
> Is the existing libc-dev package (i.e. the one from uclibc) concrete or
> virtual?  If the former then you should call this new alias something
> like "virtual-libc-dev" and make uclibc's libc-dev provide it as well.
> If libc-dev is already a pure virtual then I guess adding a direct
> RPROVIDES for glibc is harmless enough, though it might still be a good
> idea to use the "virtual-libc-dev" naming for clarity and to avoid any
> future imbroglio with other libraries.

libc-dev is not virtual in uclibc, it is concrete package name. So as you suggest I used a different name virtual-libc-dev in the attached patch. 

> 
> By the way, your diffs always seem to come out with MIME-type
> "application/octet-stream" which makes them a bit tedious to view.
> Could you send them as something like text/diff or text/plain in future?

sometimes I use the webclient and that hoses things up. I hope its better this time

Thx

-Khem


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

[-- Attachment #2: diff --]
[-- Type: text/plain, Size: 9195 bytes --]

#
# old_revision [db5edf1d33af46eb85f6703cd580fdbf069f719f]
#
# patch "packages/eglibc/eglibc_svn.bb"
#  from [175848d8e38b548d456707101f14158a0aef0c9f]
#    to [579f64f2be97fb0ccba90c0527996365db04d69b]
# 
# patch "packages/glibc/glibc_2.5.bb"
#  from [28f2f9a3a57828b85bdecaf06acd329fee9c0b86]
#    to [76dfe8533318cb5562fd8d7cc7fb176b60ec8cb0]
# 
# patch "packages/glibc/glibc_2.6.1.bb"
#  from [57bf7eb6dae142987a9e81c5916a9181d7ec554a]
#    to [d1c3a2677ee3782a7c42edf9fc8a1abe269dc4ea]
# 
# patch "packages/glibc/glibc_2.7.bb"
#  from [e91e43390c8241eaa333acc59cfd49359d7979fe]
#    to [4d9139ab5c9440611da75d340fb3cd3623e7b2e5]
# 
# patch "packages/tasks/task-native-sdk.bb"
#  from [e9aff3af03f3423a34dcb2853582e08fdd66a6a5]
#    to [80fba75c8d21780b6f54763256f5828453d33f13]
# 
# patch "packages/uclibc/bfin-uclibc_svn.bb"
#  from [e6c66ba278e5ce02ed11b35bd5f35655d2bee089]
#    to [f5887aff60acb829eb361dbaf20d5948d6fdb684]
# 
# patch "packages/uclibc/uclibc.inc"
#  from [b9731e1c2f88c691c051a5483ea18e8f61e1d9ba]
#    to [87c57651af3b432e1e276e442f06fb540434c6bb]
# 
# patch "packages/uclibc/uclibc_0.9.26.bb"
#  from [8c4ecfedfcea87b3c96dbc1c2c39a80890f8bb42]
#    to [a9c5c7a53dff8b42c1ad2b3439fcf1d5b68c2f49]
# 
# patch "packages/uclibc/uclibc_0.9.27.bb"
#  from [df5f9a00d2118c5b62001047dbcb53adbe3cd3c3]
#    to [d9aad4f438701e3d54c1b13cbc3ac614ad29f946]
# 
# patch "packages/uclibc/uclibc_0.9.28.bb"
#  from [57793a0bc95945f45c0f3916bb2c11edd2d3a217]
#    to [82aad93faa17a5e28331876152cc398f2fd4b7cd]
# 
# patch "packages/uclibc/uclibc_0.9.29.bb"
#  from [8b02df79e5136a8b2833ea26f26f95484bc814ec]
#    to [36b3e0ba61c9b81964d2c2a0a34ac781598ecf46]
# 
# patch "packages/uclibc/uclibc_nptl.bb"
#  from [4999fa82e8cb40cbff3508bf2427ca942ce9fc73]
#    to [85b1eb580e28f1a763097e52412f6e961f7eed1c]
# 
# patch "packages/uclibc/uclibc_svn.bb"
#  from [eaf1abec09168bb845c5cc7719513cfa957f0072]
#    to [da7c4cf07c2da423ae14ee83bc3e9059f0a09962]
#
============================================================
--- packages/eglibc/eglibc_svn.bb	175848d8e38b548d456707101f14158a0aef0c9f
+++ packages/eglibc/eglibc_svn.bb	579f64f2be97fb0ccba90c0527996365db04d69b
@@ -3,7 +3,7 @@ PV = "2.8+svnr${SRCREV}"
 # DEFAULT_PREFERENCE = "-1"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn"
 PV = "2.8+svnr${SRCREV}"
-PR = "r9"
+PR = "r10"
 SRC_URI = "svn://svn.eglibc.org;module=trunk \
            file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \
            file://etc/ld.so.conf \
@@ -12,7 +12,7 @@ PACKAGES_DYNAMIC = "libc6*"
 B = "${WORKDIR}/build-${TARGET_SYS}"
 
 PACKAGES_DYNAMIC = "libc6*"
-RPROVIDES_${PN}-dev = "libc6-dev"
+RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
 PROVIDES_${PN}-dbg = "glibc-dbg"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
@@ -39,7 +39,6 @@ python __anonymous () {
                                    bb.data.getVar('TARGET_OS', d, 1))
 }
 
-           
 EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
                 --without-cvs --disable-profile --disable-debug --without-gd \
                 --enable-clocale=gnu \
============================================================
--- packages/glibc/glibc_2.5.bb	28f2f9a3a57828b85bdecaf06acd329fee9c0b86
+++ packages/glibc/glibc_2.5.bb	76dfe8533318cb5562fd8d7cc7fb176b60ec8cb0
@@ -1,10 +1,10 @@ require glibc.inc
 require glibc.inc
-PR = "r16"
+PR = "r17"
 
 ARM_INSTRUCTION_SET = "arm"
 
 PACKAGES_DYNAMIC = "libc6*"
-RPROVIDES_${PN}-dev = "libc6-dev"
+RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
============================================================
--- packages/glibc/glibc_2.6.1.bb	57bf7eb6dae142987a9e81c5916a9181d7ec554a
+++ packages/glibc/glibc_2.6.1.bb	d1c3a2677ee3782a7c42edf9fc8a1abe269dc4ea
@@ -1,8 +1,8 @@ require glibc.inc
 require glibc.inc
-PR = "r10"
+PR = "r11"
 
 PACKAGES_DYNAMIC = "libc6*"
-RPROVIDES_${PN}-dev = "libc6-dev"
+RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
============================================================
--- packages/glibc/glibc_2.7.bb	e91e43390c8241eaa333acc59cfd49359d7979fe
+++ packages/glibc/glibc_2.7.bb	4d9139ab5c9440611da75d340fb3cd3623e7b2e5
@@ -3,9 +3,9 @@ PACKAGES_DYNAMIC = "libc6*"
 ARM_INSTRUCTION_SET = "arm"
 
 PACKAGES_DYNAMIC = "libc6*"
-RPROVIDES_${PN}-dev = "libc6-dev"
+RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
 
-PR = "r6"
+PR = "r7"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
============================================================
--- packages/tasks/task-native-sdk.bb	e9aff3af03f3423a34dcb2853582e08fdd66a6a5
+++ packages/tasks/task-native-sdk.bb	80fba75c8d21780b6f54763256f5828453d33f13
@@ -1,10 +1,11 @@ LICENSE = "MIT"
 DESCRIPTION = "Packages required for native (on-device) SDK"
 LICENSE = "MIT"
-DEPENDS = "gcc binutils make patch patchutils diffstat diffutils automake flex bison gawk sed grep"
-RDEPENDS = "gcc-symlinks g++-symlinks binutils-symlinks make libc6-dev \
+DEPENDS = "virtual/libc gcc binutils make patch patchutils diffstat diffutils automake flex bison gawk sed grep"
+RDEPENDS = "gcc-symlinks g++-symlinks cpp-symlinks binutils-symlinks \
+	    make virtual-libc-dev \
 	    flex flex-dev bison gawk sed grep autoconf automake make \
 	    patch patchutils diffstat diffutils libstdc++-dev"
-PR = "r2"
+PR = "r3"
 
 ALLOW_EMPTY = "1"
 PACKAGES = "${PN}"
============================================================
--- packages/uclibc/bfin-uclibc_svn.bb	e6c66ba278e5ce02ed11b35bd5f35655d2bee089
+++ packages/uclibc/bfin-uclibc_svn.bb	f5887aff60acb829eb361dbaf20d5948d6fdb684
@@ -7,7 +7,7 @@ UCLIBC_BASE ?= "0.9.29"
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
 UCLIBC_BASE ?= "0.9.29"
-PR = "r2"
+PR = "r3"
 PV = "${UCLIBC_BASE}+svnr${SRCREV}"
 
 require uclibc.inc
============================================================
--- packages/uclibc/uclibc.inc	b9731e1c2f88c691c051a5483ea18e8f61e1d9ba
+++ packages/uclibc/uclibc.inc	87c57651af3b432e1e276e442f06fb540434c6bb
@@ -52,7 +52,7 @@ FILES_uclibc-thread-db = "/lib/libthread
 FILES_uclibc-utils-dbg += "${bindir}/.debug ${sbindir}/.debug"
 FILES_uclibc-gconv = "${libdir}/gconv"
 FILES_uclibc-thread-db = "/lib/libthread_db*"
-RPROVIDES_uclibc-dev += "libc-dev"
+RPROVIDES_uclibc-dev += "libc-dev virtual-libc-dev"
 
 #
 # This locale file gets copied into uClibc-${PV}/extra/locale/ prior to
============================================================
--- packages/uclibc/uclibc_0.9.26.bb	8c4ecfedfcea87b3c96dbc1c2c39a80890f8bb42
+++ packages/uclibc/uclibc_0.9.26.bb	a9c5c7a53dff8b42c1ad2b3439fcf1d5b68c2f49
@@ -1,4 +1,4 @@
-PR = "r10"
+PR = "r11"
 
 require uclibc.inc
 
============================================================
--- packages/uclibc/uclibc_0.9.27.bb	df5f9a00d2118c5b62001047dbcb53adbe3cd3c3
+++ packages/uclibc/uclibc_0.9.27.bb	d9aad4f438701e3d54c1b13cbc3ac614ad29f946
@@ -1,5 +1,5 @@ DEFAULT_PREFERENCE = "1"
 DEFAULT_PREFERENCE = "1"
-PR = "r10"
+PR = "r11"
 
 require uclibc.inc
 
============================================================
--- packages/uclibc/uclibc_0.9.28.bb	57793a0bc95945f45c0f3916bb2c11edd2d3a217
+++ packages/uclibc/uclibc_0.9.28.bb	82aad93faa17a5e28331876152cc398f2fd4b7cd
@@ -1,5 +1,5 @@ DEFAULT_PREFERENCE = "1"
 DEFAULT_PREFERENCE = "1"
-PR = "r14"
+PR = "r15"
 
 require uclibc.inc
 
============================================================
--- packages/uclibc/uclibc_0.9.29.bb	8b02df79e5136a8b2833ea26f26f95484bc814ec
+++ packages/uclibc/uclibc_0.9.29.bb	36b3e0ba61c9b81964d2c2a0a34ac781598ecf46
@@ -7,7 +7,7 @@ UCLIBC_BASE ?= "0.9.29"
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
 UCLIBC_BASE ?= "0.9.29"
-PR = "r24"
+PR = "r25"
 DEFAULT_PREFERENCE = "1"
 
 require uclibc.inc
============================================================
--- packages/uclibc/uclibc_nptl.bb	4999fa82e8cb40cbff3508bf2427ca942ce9fc73
+++ packages/uclibc/uclibc_nptl.bb	85b1eb580e28f1a763097e52412f6e961f7eed1c
@@ -8,8 +8,8 @@ PV = "${UCLIBC_BASE}+svnr${SRCREV}"
 #
 UCLIBC_BASE ?= "0.9.29"
 PV = "${UCLIBC_BASE}+svnr${SRCREV}"
-PR = "r0"
-#DEFAULT_PREFERENCE = "2"
+PR = "r1"
+DEFAULT_PREFERENCE = "2"
 #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take
 # precedence.
 
============================================================
--- packages/uclibc/uclibc_svn.bb	eaf1abec09168bb845c5cc7719513cfa957f0072
+++ packages/uclibc/uclibc_svn.bb	da7c4cf07c2da423ae14ee83bc3e9059f0a09962
@@ -8,7 +8,7 @@ PV = "${UCLIBC_BASE}+svnr${SRCREV}"
 #
 UCLIBC_BASE ?= "0.9.29"
 PV = "${UCLIBC_BASE}+svnr${SRCREV}"
-PR = "r13"
+PR = "r14"
 #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take
 # precedence.
 

Re: provide libc-dev in glibc eglibc

[Phil Blundell]

On Fri, 2008-08-22 at 10:27 -0700, Khem Raj wrote:
> On (22/08/08 10:08), Phil Blundell wrote:
> > On Thu, 2008-08-21 at 18:25 -0700, Khem Raj wrote:
> > > This patch makes an alias for libc-dev which points to libc6-dev in
> > > glibc and eglibc. This makes this package have same name like uclibc.
> > > This helps in writing recipes which uses these dev packages to use
> > > just one name and do not worry about what system library is in use.
> > 
> > Is the existing libc-dev package (i.e. the one from uclibc) concrete or
> > virtual?  If the former then you should call this new alias something
> > like "virtual-libc-dev" and make uclibc's libc-dev provide it as well.
> > If libc-dev is already a pure virtual then I guess adding a direct
> > RPROVIDES for glibc is harmless enough, though it might still be a good
> > idea to use the "virtual-libc-dev" naming for clarity and to avoid any
> > future imbroglio with other libraries.
> 
> libc-dev is not virtual in uclibc, it is concrete package name. So as you suggest I used a different name virtual-libc-dev in the attached patch. 

OK, great.  This new patch looks good to me.

For what it's worth, it is almost never the right thing to have a single
package name with both virtual and concrete instantiations.  Doing this
can make it difficult or impossible to persuade ipkg/opkg to install the
concrete package that is being shadowed by the virtual one.  The only
time it is appropriate for one package to Provide: the name of another
concrete package is when one package is being replaced by or subsumed
into another one.

> > By the way, your diffs always seem to come out with MIME-type
> > "application/octet-stream" which makes them a bit tedious to view.
> > Could you send them as something like text/diff or text/plain in future?
> 
> sometimes I use the webclient and that hoses things up. I hope its
> better this time

Yes, thanks, that time it was fine.

p.