Patchwork cracklib: cracklib-native should not depend on zlib

login
register
mail settings
Submitter Konrad Scherer
Date Oct. 24, 2013, 3:17 p.m.
Message ID <1382627820-3165-2-git-send-email-konrad.scherer@windriver.com>
Download mbox | patch
Permalink /patch/60475/
State Accepted
Commit 9ad26e3ca05b5aef6e27d7ab7aead8a3bbc16e4f
Headers show

Comments

Konrad Scherer - Oct. 24, 2013, 3:17 p.m.
From: Konrad Scherer <Konrad.Scherer@windriver.com>

Signed-off-by: Konrad Scherer <Konrad.Scherer@windriver.com>
---
 meta/recipes-extended/cracklib/cracklib_2.9.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Saul Wold - Oct. 24, 2013, 9:56 p.m.
On 10/24/2013 08:17 AM, Konrad Scherer wrote:
> From: Konrad Scherer <Konrad.Scherer@windriver.com>
>
> Signed-off-by: Konrad Scherer <Konrad.Scherer@windriver.com>
> ---
>   meta/recipes-extended/cracklib/cracklib_2.9.0.bb | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-extended/cracklib/cracklib_2.9.0.bb b/meta/recipes-extended/cracklib/cracklib_2.9.0.bb
> index 34c2ff1..bbf88bb 100644
> --- a/meta/recipes-extended/cracklib/cracklib_2.9.0.bb
> +++ b/meta/recipes-extended/cracklib/cracklib_2.9.0.bb
> @@ -5,7 +5,7 @@ LICENSE = "LGPLv2.1+"
>   LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06"
>
>   DEPENDS = "cracklib-native zlib"
> -DEPENDS_class-native = "zlib"
> +DEPENDS_class-native = "zlib-native"
>
This is actually needed since cracklib has a configure test for zlib.h, 
with no way to disable it. So without the zlib-native the build will be 
non-determinstic, since depending on the existance of zlib.h configure 
output will be different.

Thanks
	Sau!



>   EXTRA_OECONF = "--without-python --libdir=${base_libdir}"
>
>
Saul Wold - Oct. 24, 2013, 10:03 p.m.
On 10/24/2013 02:56 PM, Saul Wold wrote:
> On 10/24/2013 08:17 AM, Konrad Scherer wrote:
>> From: Konrad Scherer <Konrad.Scherer@windriver.com>
>>
>> Signed-off-by: Konrad Scherer <Konrad.Scherer@windriver.com>
>> ---
>>   meta/recipes-extended/cracklib/cracklib_2.9.0.bb | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta/recipes-extended/cracklib/cracklib_2.9.0.bb
>> b/meta/recipes-extended/cracklib/cracklib_2.9.0.bb
>> index 34c2ff1..bbf88bb 100644
>> --- a/meta/recipes-extended/cracklib/cracklib_2.9.0.bb
>> +++ b/meta/recipes-extended/cracklib/cracklib_2.9.0.bb
>> @@ -5,7 +5,7 @@ LICENSE = "LGPLv2.1+"
>>   LIC_FILES_CHKSUM =
>> "file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06"
>>
>>   DEPENDS = "cracklib-native zlib"
>> -DEPENDS_class-native = "zlib"
>> +DEPENDS_class-native = "zlib-native"
>>
> This is actually needed since cracklib has a configure test for zlib.h,
> with no way to disable it. So without the zlib-native the build will be
> non-determinstic, since depending on the existance of zlib.h configure
> output will be different.
>
Never mind, I mis-read what you where doing.

I will pull it into mut!

Serves me right for doing this late at night!

Sau!

> Thanks
>      Sau!
>
>
>
>>   EXTRA_OECONF = "--without-python --libdir=${base_libdir}"
>>
>>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>

Patch

diff --git a/meta/recipes-extended/cracklib/cracklib_2.9.0.bb b/meta/recipes-extended/cracklib/cracklib_2.9.0.bb
index 34c2ff1..bbf88bb 100644
--- a/meta/recipes-extended/cracklib/cracklib_2.9.0.bb
+++ b/meta/recipes-extended/cracklib/cracklib_2.9.0.bb
@@ -5,7 +5,7 @@  LICENSE = "LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06"
 
 DEPENDS = "cracklib-native zlib"
-DEPENDS_class-native = "zlib"
+DEPENDS_class-native = "zlib-native"
 
 EXTRA_OECONF = "--without-python --libdir=${base_libdir}"