gdbm: Package compat libs in ${PN}-compat
v2 cover gdbm: Package compat libs in ${PN}-compat
Thanks to: Martin Jansa
The following changes since commit f720b01586bf19bf6f00d705d0d4a2d2a3786780:
python: Add patch to avoid warning about sunaudiodev module (2012-04-11 16:53:57 +0300)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib ag/pythonbug2
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ag/pythonbug2
Andrei Gherzan (1):
gdbm: Activate -enable-libgdbm-compat and add symlinks to headers in
include/gdbm
meta/recipes-support/gdbm/gdbm_1.10.bb | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-)
Signature · 1 line
1.7.5.4
PATCH v2 1/1 gdbm: Activate -enable-libgdbm-compat and add symlinks to headers in include/gdbm
ndbm.h is needed by python for dbm module. This is why -enable-libgdbm-compat was added to configure.
The second change is because python is looking for the gdbm headers in include/gdbm. The easiest way to solve this issue is to add symlinks in include/gdbm.
In order to avoid breaking packages which depend on old package name libgdbm4 (>= 1.10), compat libs are packaged into a separate package named gdbm-compat.
[YOCTO #1937]
--- meta/recipes-support/gdbm/gdbm_1.10.bb | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-)
meta/recipes-support/gdbm/gdbm_1.10.bb +17 -1
@@ -4,7 +4,7 @@ SECTION = "libs" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=241da1b9fe42e642cbb2c24d5e0c4d24" -PR = "r1" +PR = "r2" SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz"
@@ -13,4 +13,20 @@ SRC_URI[sha256sum] = "23f8134c5b94bbfb06d756a6b78f074fba6e6028cf2fe01341d40b26db inherit autotools gettext lib_package +# Needed for dbm python module +EXTRA_OECONF = "-enable-libgdbm-compat" + BBCLASSEXTEND = "native nativesdk" + +do_install_append () { + # Create a symlink to ndbm.h and gdbm.h in include/gdbm to let other packages to find + # these headers + install -d ${D}${includedir}/gdbm + ln -sf ../ndbm.h ${D}/${includedir}/gdbm/ndbm.h + ln -sf ../gdbm.h ${D}/${includedir}/gdbm/gdbm.h +} + +PACKAGES =+ "${PN}-compat \ + " +FILES_${PN}-compat = "${libdir}/libgdbm_compat${SOLIBS} \ + "
Signature · 1 line
1.7.5.4
Re: [PATCH 1/1] gdbm: Activate -enable-libgdbm-compat and add symlinks to headers in include/gdbm
Quoted 36 lines · Andrei Gherzan
ndbm.his needed by python for dbm module. This is why -enable-libgdbm-compat was added to configure.
The second change is because python is looking for the gdbm headers ininclude/gdbm. The easiest way to solve this issue is to add symlinks ininclude/gdbm.In order to avoid breaking packages which depend on old package name libgdbm4 (>= 1.10), compat libs are packaged into a separate package named gdbm-compat.
[YOCTO #1937]
Signed-off-by Andrei Gherzan <[email protected]>---
meta/recipes-support/gdbm/gdbm_1.10.bb | 18 +++++++++++++++++-1 files changed, 17 insertions(+), 1 deletions(-)meta/recipes-support/gdbm/gdbm_1.10.bb +0
-0@@ -4,7 +4,7 @@ SECTION = "libs"LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=241da1b9fe42e642cbb2c24d5e0c4d24"meta/recipes-support/gdbm/gdbm_1.10.bb +1
-1-PR = "r1" +PR = "r2"SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz"
meta/recipes-support/gdbm/gdbm_1.10.bb +0
-0@@ -13,4 +13,20 @@ SRC_URI[sha256sum] = "23f8134c5b94bbfb06d756a6b78f074fba6e6028cf2fe01341d40b26dbinherit autotools gettext
lib_packagemeta/recipes-support/gdbm/gdbm_1.10.bb +3
-0+# Needed for dbm python module +EXTRA_OECONF = "-enable-libgdbm-compat" +BBCLASSEXTEND = "native nativesdk"
meta/recipes-support/gdbm/gdbm_1.10.bb SRC_URI[sha256sum] = "23f8134c5b94bbfb06d756a6b78f074fba6e6028cf2fe01341d40b26db · line 28
Quoted 9 lines
meta/recipes-support/gdbm/gdbm_1.10.bb +9
-0+ +do_install_append () { + # Create a symlink to ndbm.h and gdbm.h in include/gdbm to let other packages to find + # these headers + install -d ${D}${includedir}/gdbm + ln -sf ../ndbm.h ${D}/${includedir}/gdbm/ndbm.h + ln -sf ../gdbm.h ${D}/${includedir}/gdbm/gdbm.h +} +
^^ whole part above was already applied in
http://git.openembedded.org/openembedded-core/commit/?id=e4d2ee00419f675ba8b7fb5d75256762253d8b32
So you should rebase this patch on top of master and add another PR bump to it (and depending recipes).
Quoted 12 lines
meta/recipes-support/gdbm/gdbm_1.10.bb +4
-1+PACKAGES =+ "${PN}-compat \ + " +FILES_${PN}-compat = "${libdir}/libgdbm_compat${SOLIBS} \ + " --1.7.5.4
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [PATCH 1/1] gdbm: Activate -enable-libgdbm-compat and add symlinks to headers in include/gdbm
Quoted 55 lines · Martin Jansa
Quoted 1 line · Andrei Gherzan
ndbm.his needed by python for dbm module. This is why-enable-libgdbm-compat was added
Quoted 2 lines
to configure.
The second change is because python is looking for the gdbm headers in
include/gdbm.Quoted 3 lines
The easiest way to solve this issue is to add symlinks in
include/gdbm.In order to avoid breaking packages which depend on old package name
libgdbm4 (>= 1.10),
Review
Quoted 10 lines
compat libs are packaged into a separate package named gdbm-compat.
[YOCTO #1937]
Signed-off-by Andrei Gherzan <[email protected]>--- meta/recipes-support/gdbm/gdbm_1.10.bb | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-)(quoted diff) +0
-0gdbm_1.10.bb
meta/recipes-support/gdbm/gdbm_1.10.bb SRC_URI[sha256sum] =
Quoted 13 lines
index 9b2fde4..40bdd86 100644
meta/recipes-support/gdbm/gdbm_1.10.bb +1
-1@@ -4,7 +4,7 @@ SECTION = "libs" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=241da1b9fe42e642cbb2c24d5e0c4d24" -PR = "r1" +PR = "r2" SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz"@@ -13,4 +13,20 @@ SRC_URI[sha256sum] ="
23f8134c5b94bbfb06d756a6b78f074fba6e6028cf2fe01341d40b26dbmeta/recipes-support/gdbm/gdbm_1.10.bb SRC_URI[sha256sum] = "23f8134c5b94bbfb06d756a6b78f074fba6e6028cf2fe01341d40b26db
Quoted 10 lines
meta/recipes-support/gdbm/gdbm_1.10.bb +6
-0inherit autotools gettext lib_package +# Needed for dbm python module +EXTRA_OECONF = "-enable-libgdbm-compat" + BBCLASSEXTEND = "native nativesdk" + +do_install_append () { + # Create a symlink to ndbm.h and gdbm.h in include/gdbm to letother packages to find
meta/recipes-support/gdbm/gdbm_1.10.bb SRC_URI[sha256sum] = "23f8134c5b94bbfb06d756a6b78f074fba6e6028cf2fe01341d40b26db · line 28
Quoted 6 lines
meta/recipes-support/gdbm/gdbm_1.10.bb +6
-0+ # these headers + install -d ${D}${includedir}/gdbm + ln -sf ../ndbm.h ${D}/${includedir}/gdbm/ndbm.h + ln -sf ../gdbm.h ${D}/${includedir}/gdbm/gdbm.h +} +^^ whole part above was already applied in
Quoted 4 lines
http://git.openembedded.org/openembedded-core/commit/?id=e4d2ee00419f675ba8b7fb5d75256762253d8b32
Thanks. Didn't see that. Rebased.
@g