diff mbox

[1/1] libpwquality: Link with zlib when required in static builds

Message ID 20170705104518.23599-1-stefan.sorensen@spectralink.com
State Accepted
Headers show

Commit Message

Sørensen, Stefan July 5, 2017, 10:45 a.m. UTC 
Fixes:
http://autobuild.buildroot.net/results/cfb3a591391d90762a326d91af3ec502a6161ac5

Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
---
 package/libpwquality/libpwquality.mk | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Baruch Siach July 5, 2017, 12:42 p.m. UTC | #1 
Hi Stefan,

On Wed, Jul 05, 2017 at 12:45:18PM +0200, Stefan Sørensen wrote:
> Fixes:
> http://autobuild.buildroot.net/results/cfb3a591391d90762a326d91af3ec502a6161ac5
> 
> Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
> ---
>  package/libpwquality/libpwquality.mk | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/package/libpwquality/libpwquality.mk b/package/libpwquality/libpwquality.mk
> index 66b15d8..5b5c0e0 100644
> --- a/package/libpwquality/libpwquality.mk
> +++ b/package/libpwquality/libpwquality.mk
> @@ -27,6 +27,11 @@ else
>  LIBPWQUALITY_CONF_OPTS += --disable-pam
>  endif
>  
> +# Static link with cracklib requires -lz if zlib is enabled
> +ifeq ($(BR2_STATIC_LIBS):$(BR2_PACKAGE_ZLIB),y:y)

No need for ':', just test equation to 'yy'. The ':' is only useful when you 
want to make sure that one specific variable is 'y' and the other is not set. 
Testing equation to 'y' only means that any variable is set, and the other 
not.

baruch

> +LIBPWQUALITY_CONF_ENV += LIBS="-lz"
> +endif
> +
>  ifeq ($(BR2_PACKAGE_LIBPWQUALITY_TOOLS),)
>  define LIBPWQUALITY_REMOVE_TOOLS
>  	rm -f $(TARGET_DIR)/usr/bin/pwmake
diff mbox

Patch

diff --git a/package/libpwquality/libpwquality.mk b/package/libpwquality/libpwquality.mk
index 66b15d8..5b5c0e0 100644
--- a/package/libpwquality/libpwquality.mk
+++ b/package/libpwquality/libpwquality.mk
@@ -27,6 +27,11 @@  else
 LIBPWQUALITY_CONF_OPTS += --disable-pam
 endif
 
+# Static link with cracklib requires -lz if zlib is enabled
+ifeq ($(BR2_STATIC_LIBS):$(BR2_PACKAGE_ZLIB),y:y)
+LIBPWQUALITY_CONF_ENV += LIBS="-lz"
+endif
+
 ifeq ($(BR2_PACKAGE_LIBPWQUALITY_TOOLS),)
 define LIBPWQUALITY_REMOVE_TOOLS
 	rm -f $(TARGET_DIR)/usr/bin/pwmake