- fix libraries detection with lib64 or libx32; release 2

[packages/xmlsec1.git] / xmlsec1-nss.patch

diff --git a/xmlsec1-nss.patch b/xmlsec1-nss.patch
index 7bc7c494d2b8d2664a1a587c5284d0447b23d687..dbeefa4aa681a888ef72c922c02d9a71d17dcee3 100644 (file)
--- a/xmlsec1-nss.patch
+++ b/xmlsec1-nss.patch
@@ -1,51 +1,26 @@
---- xmlsec1-1.2.6/configure.in.orig    2004-08-26 04:49:24.000000000 +0200
-+++ xmlsec1-1.2.6/configure.in 2004-10-31 00:56:57.447586088 +0200
-@@ -553,16 +553,11 @@
-       fi
-       NSPR_INCLUDES_FOUND="yes"
-       NSPR_LIBS_FOUND="yes"
--      NSPR_PRINIT_H="$with_nspr/include/prinit.h"
-+      NSPR_PRINIT_H="$with_nspr/include/nspr/prinit.h"
-     else
-       for dir in $ac_nss_inc_dir ; do
-           if test -f $dir/nspr/prinit.h ; then
--              dnl do not add -I/usr/include because compiler does it anyway
--              if test "z$dir" = "z/usr/include" ; then
--                  NSPR_CFLAGS=""
--              else
--                  NSPR_CFLAGS="-I$dir/nspr"
--              fi
-+              NSPR_CFLAGS="-I$dir/nspr"
-               NSPR_INCLUDES_FOUND="yes"
-               NSPR_PRINIT_H="$dir/nspr/prinit.h"
-               break
-@@ -624,16 +619,11 @@
-         fi
-       NSS_INCLUDES_FOUND="yes"
-       NSS_LIBS_FOUND="yes"
--      NSS_NSS_H="$with_nss/include/nss.h"
-+      NSS_NSS_H="$with_nss/include/nss/nss.h"
-     else
-       for dir in $ac_nss_inc_dir ; do
-           if test -f $dir/nss/nss.h ; then
--              dnl do not add -I/usr/include because compiler does it anyway
--              if test "z$dir" = "z/usr/include" ; then
--                  NSS_CFLAGS="$NSS_CFLAGS"
--              else
--                  NSS_CFLAGS="$NSS_CFLAGS -I$dir/nss"
--              fi
-+              NSS_CFLAGS="$NSS_CFLAGS -I$dir/nss"
-               NSS_INCLUDES_FOUND="yes"
-               NSS_NSS_H="$dir/nss/nss.h"
-               break
---- xmlsec1-1.2.14/configure.in~       2010-04-26 09:58:24.901946082 +0200
-+++ xmlsec1-1.2.14/configure.in        2010-04-26 10:01:17.278214712 +0200
-@@ -689,7 +689,7 @@
-     NSS_NSS_H=""
+--- xmlsec1-1.2.26/configure.ac.orig   2018-07-21 18:15:24.743837556 +0200
++++ xmlsec1-1.2.26/configure.ac        2018-07-21 18:46:07.437149856 +0200
+@@ -1052,10 +1052,7 @@
+     NSPR_CFLAGS="$NSPR_CFLAGS -I$NSPR_INCLUDE_PATH -I$NSPR_INCLUDE_PATH/nspr"
+ fi
+ if test "z$NSPR_FOUND" = "zyes" -a "z$NSPR_LIB_PATH" != "z" ; then
+-    if test "z$with_gnu_ld" = "zyes" ; then
+-        NSPR_LIBS="$NSPR_LIBS -Wl,-rpath-link -Wl,$NSPR_LIB_PATH"
+-    fi
+-    NSPR_LIBS="$NSPR_LIBS -L$NSPR_LIB_PATH/lib $NSPR_LIBS_LIST"
++    NSPR_LIBS="$NSPR_LIBS $NSPR_LIBS_LIST"
+ fi
  
-     if test "z$with_nss" != "z" ; then
--      NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include -I$with_nss/include/nss"
-+      NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include -I$with_nss/include/nss -I/usr/include/nspr"
-       if test "z$with_gnu_ld" = "zyes" ; then
-           NSS_LIBS="$NSS_LIBS -Wl,-rpath-link -Wl,$with_nss/lib -L$with_nss/lib $NSS_LIBS_LIST"
-         else
+ dnl Priority 5 (NSS): Just try to compile/link and hope for the best
+@@ -1089,10 +1086,7 @@
+     NSS_CFLAGS="$NSS_CFLAGS -I$NSS_INCLUDE_PATH -I$NSS_INCLUDE_PATH/nss"
+ fi
+ if test "z$NSS_FOUND" = "zyes" -a "z$NSS_LIB_PATH" != "z" ; then
+-    if test "z$with_gnu_ld" = "zyes" ; then
+-        NSS_LIBS="$NSS_LIBS -Wl,-rpath-link -Wl,$NSS_LIB_PATH"
+-    fi
+-    NSS_LIBS="$NSS_LIBS -L$NSS_LIB_PATH/lib $NSS_LIBS_LIST"
++    NSS_LIBS="$NSS_LIBS $NSS_LIBS_LIST"
+ fi
+ 
+ dnl Check NSS and NSPR versions