* [PATCH 0/1] Add dependency back for glib-2.0
@ 2015-12-29 9:43 kai.kang
2015-12-29 9:43 ` [PATCH 1/1] Revert "glib-2.0: build dependency cleanup" kai.kang
0 siblings, 1 reply; 6+ messages in thread
From: kai.kang @ 2015-12-29 9:43 UTC (permalink / raw)
To: ross.burton; +Cc: openembedded-core
From: Kai Kang <kai.kang@windriver.com>
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(-)
--
2.6.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/1] Revert "glib-2.0: build dependency cleanup"
2015-12-29 9:43 [PATCH 0/1] Add dependency back for glib-2.0 kai.kang
@ 2015-12-29 9:43 ` kai.kang
2015-12-31 8:50 ` Khem Raj
2016-01-04 10:47 ` Burton, Ross
0 siblings, 2 replies; 6+ messages in thread
From: kai.kang @ 2015-12-29 9:43 UTC (permalink / raw)
To: ross.burton; +Cc: openembedded-core
From: Kai Kang <kai.kang@windriver.com>
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.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
meta/recipes-core/glib-2.0/glib.inc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 86f7e0e..8e4dcd7 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -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"
--
2.6.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] Revert "glib-2.0: build dependency cleanup"
2015-12-29 9:43 ` [PATCH 1/1] Revert "glib-2.0: build dependency cleanup" kai.kang
@ 2015-12-31 8:50 ` Khem Raj
2016-01-04 2:09 ` Kang Kai
2016-01-04 10:47 ` Burton, Ross
1 sibling, 1 reply; 6+ messages in thread
From: Khem Raj @ 2015-12-31 8:50 UTC (permalink / raw)
To: kai.kang; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 1938 bytes --]
> On Dec 29, 2015, at 1:43 AM, kai.kang@windriver.com wrote:
>
> From: Kai Kang <kai.kang@windriver.com>
>
> 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'
> with error:
>
> | /bin/sh: --prefix=test_marshal: command not found
> | make[4]: *** [testmarshal.c] Error 127
>
> So add the dependency back.
I ran into the regression as well. So this patch is good.
>
> Signed-off-by: Kai Kang <kai.kang@windriver.com>
> ---
> meta/recipes-core/glib-2.0/glib.inc | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
> index 86f7e0e..8e4dcd7 100644
> --- a/meta/recipes-core/glib-2.0/glib.inc
> +++ b/meta/recipes-core/glib-2.0/glib.inc
> @@ -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"
>
> --
> 2.6.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] Revert "glib-2.0: build dependency cleanup"
2015-12-31 8:50 ` Khem Raj
@ 2016-01-04 2:09 ` Kang Kai
0 siblings, 0 replies; 6+ messages in thread
From: Kang Kai @ 2016-01-04 2:09 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-core
On 2015年12月31日 16:50, Khem Raj wrote:
>> On Dec 29, 2015, at 1:43 AM, kai.kang@windriver.com wrote:
>>
>> From: Kai Kang <kai.kang@windriver.com>
>>
>> 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
>
>> with error:
>>
>> | /bin/sh: --prefix=test_marshal: command not found
>> | make[4]: *** [testmarshal.c] Error 127
>>
>> So add the dependency back.
> I ran into the regression as well. So this patch is good.
>
>> Signed-off-by: Kai Kang <kai.kang@windriver.com>
>> ---
>> meta/recipes-core/glib-2.0/glib.inc | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
>> index 86f7e0e..8e4dcd7 100644
>> --- a/meta/recipes-core/glib-2.0/glib.inc
>> +++ b/meta/recipes-core/glib-2.0/glib.inc
>> @@ -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"
>>
>> --
>> 2.6.1
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Regards,
Neil | Kai Kang
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] Revert "glib-2.0: build dependency cleanup"
2015-12-29 9:43 ` [PATCH 1/1] Revert "glib-2.0: build dependency cleanup" kai.kang
2015-12-31 8:50 ` Khem Raj
@ 2016-01-04 10:47 ` Burton, Ross
2016-01-06 2:33 ` Kang Kai
1 sibling, 1 reply; 6+ messages in thread
From: Burton, Ross @ 2016-01-04 10:47 UTC (permalink / raw)
To: Kang Kai; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 269 bytes --]
On 29 December 2015 at 09:43, <kai.kang@windriver.com> 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
[-- Attachment #2: Type: text/html, Size: 679 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] Revert "glib-2.0: build dependency cleanup"
2016-01-04 10:47 ` Burton, Ross
@ 2016-01-06 2:33 ` Kang Kai
0 siblings, 0 replies; 6+ messages in thread
From: Kang Kai @ 2016-01-06 2:33 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 541 bytes --]
On 2016年01月04日 18:47, Burton, Ross wrote:
>
> On 29 December 2015 at 09:43, <kai.kang@windriver.com
> <mailto:kai.kang@windriver.com>> 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.
--
Regards,
Neil | Kai Kang
[-- Attachment #2: Type: text/html, Size: 1683 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-01-06 2:33 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-12-29 9:43 [PATCH 0/1] Add dependency back for glib-2.0 kai.kang
2015-12-29 9:43 ` [PATCH 1/1] Revert "glib-2.0: build dependency cleanup" kai.kang
2015-12-31 8:50 ` Khem Raj
2016-01-04 2:09 ` Kang Kai
2016-01-04 10:47 ` Burton, Ross
2016-01-06 2:33 ` Kang Kai
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.