Patchwork libgcrypt workaround

login
register
mail settings
Submitter stephen.arnold42
Date July 17, 2014, 1:47 a.m.
Message ID <CAOLEWZXde+2T1bS4ARKMv0cy4KGEZtXHVhtaab0E--49q6wsHA@mail.gmail.com>
Download mbox | patch
Permalink /patch/75867/
State New
Headers show

Comments

stephen.arnold42 - July 17, 2014, 1:47 a.m.
OE-devs/Tim:

Here's the basic recipe patch; not sure if I should submit it formally or
not.  Maybe a configure patch is preferred?  Feedback welcome.

Thanks, Steve
Tim Orling - July 17, 2014, 5:34 p.m.
Steve,

That workaround fixes the problem, but I think there is something
fundamentally wrong deeper in. Looks like the culprit is pkgconfig.patch
for libgpg-error. Testing and will send patch.


On Wed, Jul 16, 2014 at 6:47 PM, Stephen Arnold <stephen.arnold42@gmail.com>
wrote:

> OE-devs/Tim:
>
> Here's the basic recipe patch; not sure if I should submit it formally or
> not.  Maybe a configure patch is preferred?  Feedback welcome.
>
> Thanks, Steve
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
stephen.arnold42 - July 17, 2014, 6:23 p.m.
Yeah, I kinda suspected pkgconfig but I guess I was busy/distracted with
the biz stuff and didn't dig any deeper than the one recipe...  Sounds like
this patch won't be needed if the pc stuff is clean.

Steve


On Thu, Jul 17, 2014 at 10:34 AM, Tim Orling <ticotimo@gmail.com> wrote:

> Steve,
>
> That workaround fixes the problem, but I think there is something
> fundamentally wrong deeper in. Looks like the culprit is pkgconfig.patch
> for libgpg-error. Testing and will send patch.
>
>
> On Wed, Jul 16, 2014 at 6:47 PM, Stephen Arnold <
> stephen.arnold42@gmail.com> wrote:
>
>> OE-devs/Tim:
>>
>> Here's the basic recipe patch; not sure if I should submit it formally or
>> not.  Maybe a configure patch is preferred?  Feedback welcome.
>>
>> Thanks, Steve
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>
>>
>

Patch

diff --git a/meta/recipes-support/libgcrypt/libgcrypt.inc b/meta/recipes-support/libgcrypt/libgcrypt.inc
index bba4a79..bd4eedd 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt.inc
+++ b/meta/recipes-support/libgcrypt/libgcrypt.inc
@@ -22,11 +22,17 @@  inherit autotools-brokensep texinfo binconfig-disabled pkgconfig
 
 ASFLAGS="--divide"
 CPPFLAGS_append = " -DPIC -fPIC"
+
 EXTRA_OECONF = "--without-capabilities --disable-padlock-support"
 
 do_configure_prepend () {
 	# Else these could be used in prefernce to those in aclocal-copy
 	rm -f ${S}/m4/*.m4
+	export GPG_ERROR_LIBS="-L${STAGING_LIBDIR} -lgpg-error "
+}
+
+do_configure_prepend_class-native() {
+	export GPG_ERROR_LIBS="-L${STAGING_LIBDIR_NATIVE} -lgpg-error "
 }
 
 # libgcrypt.pc is added locally and thus installed here