libxslt-configure.patch (193e2a48) | libxslt-configure.patch (fb46da01) |
---|---|
1diff -ur misc/libxslt-1.1.33/configure misc/build/libxslt-1.1.33/configure 2--- misc/libxslt-1.1.33/configure 2017-11-02 13:34:22.000000000 -0700 3+++ misc/build/libxslt-1.1.33/configure 2018-08-22 23:00:50.689433000 -0700 4@@ -6698,7 +6698,7 @@ | 1diff -ur misc/libxslt-1.1.34/configure misc/build/libxslt-1.1.34/configure 2--- misc/libxslt-1.1.34/configure 2017-11-02 13:34:22.000000000 -0700 3+++ misc/build/libxslt-1.1.34/configure 2018-08-22 23:00:50.689433000 -0700 4@@ -6701,7 +6701,7 @@ |
5 6 cygwin*) 7 # func_win32_libid is a shell function defined in ltmain.sh 8- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 9+ lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL' 10 lt_cv_file_magic_cmd='func_win32_libid' 11 ;; 12 | 5 6 cygwin*) 7 # func_win32_libid is a shell function defined in ltmain.sh 8- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 9+ lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL' 10 lt_cv_file_magic_cmd='func_win32_libid' 11 ;; 12 |
13diff -ur misc/libxslt-1.1.33/xslt-config.in misc/build/libxslt-1.1.33/xslt-config.in 14--- misc/libxslt-1.1.33/xslt-config.in 2015-05-10 07:11:30.000000000 -0700 15+++ misc/build/libxslt-1.1.33/xslt-config.in 2018-08-22 23:00:50.689988000 -0700 | 13--- misc/libxslt-1.1.34/xslt-config.in 2015-05-10 07:11:30.000000000 -0700 14+++ misc/build/libxslt-1.1.34/xslt-config.in 2019-11-07 22:55:48.005472511 -0800 |
16@@ -1,10 +1,15 @@ 17 #! /bin/sh 18 19-prefix=@prefix@ 20-exec_prefix=@exec_prefix@ 21+#prefix=@prefix@ 22+#exec_prefix=@exec_prefix@ 23+#exec_prefix_set=no --- 4 unchanged lines hidden (view full) --- 28 exec_prefix_set=no 29-includedir=@includedir@ 30-libdir=@libdir@ 31+includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external 32+libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT} 33 34 usage() 35 { | 15@@ -1,10 +1,15 @@ 16 #! /bin/sh 17 18-prefix=@prefix@ 19-exec_prefix=@exec_prefix@ 20+#prefix=@prefix@ 21+#exec_prefix=@exec_prefix@ 22+#exec_prefix_set=no --- 4 unchanged lines hidden (view full) --- 27 exec_prefix_set=no 28-includedir=@includedir@ 29-libdir=@libdir@ 30+includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external 31+libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT} 32 33 usage() 34 { |
36@@ -89,7 +94,8 @@ 37 shift 38 done | 35@@ -81,18 +86,19 @@ 36 ;; |
39 | 37 |
40-the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@" 41+#the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@" 42+the_libs="-L${libdir} ${XSLTLIB} -lm" 43 if test "$includedir" != "/usr/include"; then 44 the_flags="$the_flags -I$includedir `@XML_CONFIG@ --cflags`" 45 else | 38 --libs) 39- if [ "$2" = "--dynamic" ]; then 40- shift 41- libs="@XSLT_LIBS@" 42- else 43- libs="@XSLT_LIBS@ @XSLT_PRIVATE_LIBS@" 44- fi 45- 46- if [ "@XSLT_LIBDIR@" != "-L/usr/lib" -a "@XSLT_LIBDIR@" != "-L/usr/lib64" ]; then 47- libs="@XSLT_LIBDIR@ $libs" 48- fi 49- 50- libs="$libs @EXTRA_LIBS@" 51+ libs="-L${libdir} ${XSLTLIB} -lm" 52+# if [ "$2" = "--dynamic" ]; then 53+# shift 54+# libs="@XSLT_LIBS@" 55+# else 56+# libs="@XSLT_LIBS@ @XSLT_PRIVATE_LIBS@" 57+# fi 58+# 59+# if [ "@XSLT_LIBDIR@" != "-L/usr/lib" -a "@XSLT_LIBDIR@" != "-L/usr/lib64" ]; then 60+# libs="@XSLT_LIBDIR@ $libs" 61+# fi 62+# 63+# libs="$libs @EXTRA_LIBS@" 64 ;; 65 66 *) |