Add dependency back for glib-2.0
cover Add dependency back for glib-2.0
From: Kai Kang <[email protected]>
If no command glib-genmarshal on host, build glib-2.0 will fail.
The following changes since commit 2cd061a29a94fdcdfec86732e6bcbb71c12c4afc:
bluez5: include the patch only for 5.36 (2015-12-28 13:02:11 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib kangkai/glib-2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/glib-2
Kai Kang (1):
Revert "glib-2.0: build dependency cleanup"
meta/recipes-core/glib-2.0/glib.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Signature · 1 line
2.6.1
PATCH 1/1 Revert "glib-2.0: build dependency cleanup"
From: Kai Kang <[email protected]>
This reverts commit fcd7494b347423185c883b2897c4908929843a71.
It uses command glib-genmarshal to build glib-2.0 which is from glibc-2.0-native. If the command doesn't exist on host, build fails with error:
| /bin/sh: --prefix=test_marshal: command not found | make[4]: *** [testmarshal.c] Error 127
So add the dependency back.
--- meta/recipes-core/glib-2.0/glib.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-core/glib-2.0/glib.inc +3 -3
@@ -17,10 +17,10 @@ SECTION = "libs" BBCLASSEXTEND = "native nativesdk" -DEPENDS = "virtual/libiconv libffi zlib" -DEPENDS_append = " ${@bb.utils.contains('PTEST_ENABLED', '1', ' glib-2.0-native dbus', '', d)}" +DEPENDS = "glib-2.0-native virtual/libiconv libffi zlib" +DEPENDS_append_class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', ' dbus', '', d)}" DEPENDS_class-native = "pkgconfig-native gettext-native libffi-native zlib-native" -DEPENDS_class-nativesdk = "nativesdk-libtool nativesdk-gettext nativesdk-libffi nativesdk-zlib" +DEPENDS_class-nativesdk = "nativesdk-libtool nativesdk-gettext nativesdk-libffi nativesdk-zlib ${BPN}-native" PACKAGES =+ "${PN}-utils ${PN}-bash-completion ${PN}-codegen"
Signature · 1 line
2.6.1
Re: [PATCH 1/1] Revert "glib-2.0: build dependency cleanup"
Quoted 9 lines · On Dec 29, 2015, at 1:43 AM, [email protected] wrote:
From: Kai Kang <[email protected]>
This reverts commit
fcd7494b347423185c883b2897c4908929843a71.It uses command glib-genmarshal to build glib-2.0 which is from glibc-2.0-native. If the command doesn't exist on host, build fails
typo 'glib-2.0-native'
Quoted 6 lines
with error:
|
/bin/sh: --prefix=test_marshal: command not found | make[4]: *** [testmarshal.c] Error 127So add the dependency back.
I ran into the regression as well. So this patch is good.
Quoted 32 lines
Signed-off-by Kai Kang <[email protected]>---
meta/recipes-core/glib-2.0/glib.inc | 6 +++---1 file changed, 3 insertions(+), 3 deletions(-)meta/recipes-core/glib-2.0/glib.inc +0
-0@@ -17,10 +17,10 @@ SECTION = "libs"BBCLASSEXTEND = "native nativesdk"
meta/recipes-core/glib-2.0/glib.inc +2
-2-DEPENDS = "virtual/libiconv libffi zlib" -DEPENDS_append = " ${@bb.utils.contains('PTEST_ENABLED', '1', ' glib-2.0-native dbus', '', d)}" +DEPENDS = "glib-2.0-native virtual/libiconv libffi zlib" +DEPENDS_append_class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', ' dbus', '', d)}"DEPENDS_class-native = "pkgconfig-native gettext-native libffi-native zlib-native"
meta/recipes-core/glib-2.0/glib.inc +1
-1-DEPENDS_class-nativesdk = "nativesdk-libtool nativesdk-gettext nativesdk-libffi nativesdk-zlib" +DEPENDS_class-nativesdk = "nativesdk-libtool nativesdk-gettext nativesdk-libffi nativesdk-zlib ${BPN}-native"PACKAGES =+ "${PN}-utils ${PN}-bash-completion ${PN}-codegen"
--
2.6.1--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [PATCH 1/1] Revert "glib-2.0: build dependency cleanup"
Quoted 9 lines · Khem Raj
Quoted 8 lines · On Dec 29, 2015, at 1:43 AM, [email protected] wrote:
From: Kai Kang <[email protected]>
This reverts commit
fcd7494b347423185c883b2897c4908929843a71.It uses command glib-genmarshal to build glib-2.0 which is from glibc-2.0-native. If the command doesn't exist on host, build fails
typo 'glib-2.0-native'
Correct it in pull branch on poky-contrib. Thanks.
--Kai
Quoted 40 lines
Quoted 7 lines
with error:
|
/bin/sh: --prefix=test_marshal: command not found | make[4]: *** [testmarshal.c] Error 127So add the dependency back.
I ran into the regression as well. So this patch is good.
Quoted 31 lines
Signed-off-by Kai Kang <[email protected]>---
meta/recipes-core/glib-2.0/glib.inc | 6 +++---1 file changed, 3 insertions(+), 3 deletions(-)meta/recipes-core/glib-2.0/glib.inc +0
-0@@ -17,10 +17,10 @@ SECTION = "libs"BBCLASSEXTEND = "native nativesdk"
meta/recipes-core/glib-2.0/glib.inc +2
-2-DEPENDS = "virtual/libiconv libffi zlib" -DEPENDS_append = " ${@bb.utils.contains('PTEST_ENABLED', '1', ' glib-2.0-native dbus', '', d)}" +DEPENDS = "glib-2.0-native virtual/libiconv libffi zlib" +DEPENDS_append_class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', ' dbus', '', d)}"DEPENDS_class-native = "pkgconfig-native gettext-native libffi-native zlib-native"
meta/recipes-core/glib-2.0/glib.inc +1
-1-DEPENDS_class-nativesdk = "nativesdk-libtool nativesdk-gettext nativesdk-libffi nativesdk-zlib" +DEPENDS_class-nativesdk = "nativesdk-libtool nativesdk-gettext nativesdk-libffi nativesdk-zlib ${BPN}-native"PACKAGES =+ "${PN}-utils ${PN}-bash-completion ${PN}-codegen"
--
2.6.1--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 2 lines
Regards, Neil | Kai Kang
Re: [PATCH 1/1] Revert "glib-2.0: build dependency cleanup"
In reply to [email protected]Quoted 2 lines · On 29 December 2015 at 09:43, <[email protected]> wrote:
This reverts commit
fcd7494b347423185c883b2897c4908929843a71.
Why revert? Just adding glib-2.0-native to DEPENDS is sufficient, no need to revert the other improvements in that commit.
Ross
Re: [PATCH 1/1] Revert "glib-2.0: build dependency cleanup"
Quoted 9 lines · Ross
On 29 December 2015 at 09:43, <[email protected] <mailto:[email protected]>> wrote:
This reverts commit fcd7494b347423185c883b2897c4908929843a71.Why revert? Just adding glib-2.0-native to DEPENDS is sufficient, no need to revert the other improvements in that commit.
Ross
It also needs to be removed from DEPENDS_append. I didn't build for nativesdk, but I suppose glib-2.0-native is required too.
Signature · 2 lines
Regards, Neil | Kai Kang