Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/libxml2/patches/15.lib-run-path-fix.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 11 Mar 2013 10:38:09 -0700
branchs11-update
changeset 2520 ceec631e74d1
parent 2452 9dc4dfa4b04d
permissions -rw-r--r--
Close of build 10.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2452
9dc4dfa4b04d 15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents: 713
diff changeset 
     1
 
--- libxml2-2.9.0/xml2-config.in	Mon Sep 10 20:52:46 2012
9dc4dfa4b04d 15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents: 713
diff changeset 
     2
 
+++ libxml2-2.9.0/xml2-config.in	Fri Oct 26 04:03:45 2012
713
49ef3f4a3990 7087645 xml2-config always emits 32-bit default library run paths
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     3
 
@@ -91,7 +91,7 @@
2452
9dc4dfa4b04d 15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents: 713
diff changeset 
     4
 
 		echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@
713
49ef3f4a3990 7087645 xml2-config always emits 32-bit default library run paths
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     5
 
 	    fi
49ef3f4a3990 7087645 xml2-config always emits 32-bit default library run paths
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     6
 
 	else
2452
9dc4dfa4b04d 15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents: 713
diff changeset 
     7
 
-	    echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@ @WIN32_EXTRA_LIBADD@
713
49ef3f4a3990 7087645 xml2-config always emits 32-bit default library run paths
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     8
 
+	    echo -lxml2
49ef3f4a3990 7087645 xml2-config always emits 32-bit default library run paths
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     9
 
 	fi
49ef3f4a3990 7087645 xml2-config always emits 32-bit default library run paths
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    10
 
        	;;
49ef3f4a3990 7087645 xml2-config always emits 32-bit default library run paths
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    11
upstream/oracle/userland-gate