[jhbuild/wip/path-env] libpwquality: expand LIBINTL link patch



commit 16c0f2575173b39818da71115de385c7009d1fb2
Author: Ryan Lortie <desrt desrt ca>
Date:   Wed Mar 12 23:03:57 2014 -0400

    libpwquality: expand LIBINTL link patch
    
    The programs use gettext as well and therefore should be directly linked.  I'm
    not sure why this wasn't a problem before.

 patches/libpwquality.libintl-link.patch |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/patches/libpwquality.libintl-link.patch b/patches/libpwquality.libintl-link.patch
index db0ccf3..42c3399 100644
--- a/patches/libpwquality.libintl-link.patch
+++ b/patches/libpwquality.libintl-link.patch
@@ -17,10 +17,24 @@ diff -r -u libpwquality-1.2.2/src/Makefile.am libpwquality-1.2.2+/src/Makefile.a
    pam_pwquality_la_SOURCES = pam_pwquality.c
  else
    pam_pwquality_la_LDFLAGS =
+@@ -41,11 +41,11 @@
+ 
+ pwscore_SOURCES = pwscore.c
+ 
+-pwscore_LDADD = libpwquality.la
++pwscore_LDADD = libpwquality.la $(LIBINTL)
+ 
+ pwmake_SOURCES = pwmake.c
+ 
+-pwmake_LDADD = libpwquality.la
++pwmake_LDADD = libpwquality.la $(LIBINTL)
+ 
+ lib_LTLIBRARIES = libpwquality.la
+ 
 diff -r -u libpwquality-1.2.2/src/Makefile.in libpwquality-1.2.2+/src/Makefile.in
 --- libpwquality-1.2.2/src/Makefile.in 2013-06-19 11:41:37.000000000 -0400
 +++ libpwquality-1.2.2+/src/Makefile.in        2014-03-05 22:38:01.938157558 -0500
-@@ -308,12 +308,12 @@
+@@ -308,18 +308,18 @@
  libpwquality_la_LDFLAGS = -no-undefined $(libpwquality_version_script) \
        -version-info @PWQUALITY_LT_CURRENT@:@PWQUALITY_LT_REVISION@:@PWQUALITY_LT_AGE@
  
@@ -35,3 +49,11 @@ diff -r -u libpwquality-1.2.2/src/Makefile.in libpwquality-1.2.2+/src/Makefile.i
  @HAVE_PAM_FALSE pam_pwquality_la_SOURCES = 
  @HAVE_PAM_TRUE pam_pwquality_la_SOURCES = pam_pwquality.c
  pwscore_SOURCES = pwscore.c
+-pwscore_LDADD = libpwquality.la
++pwscore_LDADD = libpwquality.la $(LIBINTL)
+ pwmake_SOURCES = pwmake.c
+-pwmake_LDADD = libpwquality.la
++pwmake_LDADD = libpwquality.la $(LIBINTL)
+ lib_LTLIBRARIES = libpwquality.la
+ @HAVE_PAM_FALSE securelib_LTLIBRARIES = 
+ @HAVE_PAM_TRUE securelib_LTLIBRARIES = pam_pwquality.la


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]