xref: /AOO41X/main/libxslt/libxslt-configure.patch (revision 2d019523a160b07a85abac7c9518f687d09ed5f5)

<<<<<<< .working
diff -ur misc/libxslt-1.1.28/ltmain.sh misc/build/libxslt-1.1.28/ltmain.sh
--- misc/libxslt-1.1.28/ltmain.sh	2012-11-20 23:21:48.000000000 -0800
+++ misc/build/libxslt-1.1.28/ltmain.sh	2016-03-27 11:14:40.564087000 -0700
@@ -7331,13 +7331,13 @@
 	  #
 	  case $version_type in
 	  # correct linux to gnu/linux during the next big refactor
-	  darwin|linux|osf|windows|none)
+	  darwin|freebsd-elf|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
 	    age="$number_minor"
 	    revision="$number_revision"
 	    ;;
-	  freebsd-aout|freebsd-elf|qnx|sunos)
+	  freebsd-aout|qnx|sunos)
 	    current="$number_major"
 	    revision="$number_minor"
 	    age="0"
@@ -7414,8 +7414,8 @@
 	  ;;
diff -ur misc/libxslt-1.1.32/configure misc/build/libxslt-1.1.32/configure
--- misc/libxslt-1.1.32/configure	2017-11-02 13:34:22.000000000 -0700
+++ misc/build/libxslt-1.1.32/configure	2018-08-22 23:00:50.689433000 -0700
@@ -6698,7 +6698,7 @@

 	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current"
+	  major=.$(($current - $age))
+	  versuffix="$major.$age.$revision"
 	  ;;

diff -ur misc/libxslt-1.1.32/xslt-config.in misc/build/libxslt-1.1.32/xslt-config.in
--- misc/libxslt-1.1.32/xslt-config.in	2015-05-10 07:11:30.000000000 -0700
+++ misc/build/libxslt-1.1.32/xslt-config.in	2018-08-22 23:00:50.689988000 -0700
@@ -1,10 +1,15 @@
 #! /bin/sh

-prefix=@prefix@
-exec_prefix=@exec_prefix@
+#prefix=@prefix@
+#exec_prefix=@exec_prefix@
+#exec_prefix_set=no
+#includedir=@includedir@
+#libdir=@libdir@
+prefix=${SOLARVERSION}/${INPATH}
+exec_prefix=${SOLARVERSION}/${INPATH}
 exec_prefix_set=no
-includedir=@includedir@
-libdir=@libdir@
+includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external
+libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}

 usage()
 {
@@ -89,7 +94,8 @@
     shift
 done

-the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@"
+#the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@"
+the_libs="-L${libdir} ${XSLTLIB} -lm"
 if test "$includedir" != "/usr/include"; then
     the_flags="$the_flags -I$includedir `@XML_CONFIG@ --cflags`"
 else
diff -ur misc/libxslt-1.1.28/configure misc/build/libxslt-1.1.28/configure
--- misc/libxslt-1.1.28/configure	2012-11-20 23:11:21.000000000 -0800
+++ misc/build/libxslt-1.1.28/configure	2016-03-27 12:43:44.464670000 -0700
@@ -6462,7 +6462,7 @@

 cygwin*)
   # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
   lt_cv_file_magic_cmd='func_win32_libid'
   ;;

@@ -6472,7 +6472,7 @@
   # unless we find 'file', for example because we are cross-compiling.
   # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
   if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
     lt_cv_file_magic_cmd='func_win32_libid'
   else
     # Keep this pattern in sync with the one in func_win32_libid.
@@ -11635,7 +11635,7 @@
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      library_names_spec='$libname$release$shared_ext$versuffix  $libname$release$shared_ext$major	 $libname$shared_ext'			 soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
       ;;