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/01.configure.in.patch
author doug leavitt <doug.leavitt@oracle.com>
Wed, 22 May 2013 10:12:33 -0700
branchs11-update
changeset 2632 af488b226b98
parent 284 ca417a821aee
permissions -rw-r--r--
16763104 backport 15998664 to 11.2 - berkeleydb doesn't build with jdk 1.7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
148
33ca3897ae25 7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     1
 
# fix configure so that we can override the site-packages directory to match
33ca3897ae25 7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     2
 
# the way we deliver python modules in Solaris.
33ca3897ae25 7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     3
 
#
33ca3897ae25 7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     4
 
--- libxml2-2.7.6/configure.in.orig	Tue Oct  6 09:28:58 2009
33ca3897ae25 7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     5
 
+++ libxml2-2.7.6/configure.in	Mon Mar 21 00:39:24 2011
33ca3897ae25 7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     6
 
@@ -757,6 +757,10 @@
33ca3897ae25 7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     7
 
 if test "$PYTHON_INCLUDES" != ""
33ca3897ae25 7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     8
 
 then
33ca3897ae25 7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     9
 
     PYTHON_SUBDIR=python
33ca3897ae25 7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    10
 
+    if test "${PYTHON_VENDOR_PACKAGES}" != ""
33ca3897ae25 7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    11
 
+    then
33ca3897ae25 7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    12
 
+        PYTHON_SITE_PACKAGES=$PYTHON_VENDOR_PACKAGES
33ca3897ae25 7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    13
 
+    fi
33ca3897ae25 7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    14
 
 else
33ca3897ae25 7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    15
 
     PYTHON_SUBDIR=
33ca3897ae25 7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    16
 
 fi
33ca3897ae25 7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    17
 














upstream/oracle/userland-gate