Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7161789 library/python-2/libxml2-27 has dependency on runtime/python-26
authorNorm Jacobs <Norm.Jacobs@Oracle.COM>
Wed, 18 Apr 2012 20:49:03 -0700
changeset 782 285320d34a71
parent 781 6523d2f0e202
child 783 e8713db88509
7161789 library/python-2/libxml2-27 has dependency on runtime/python-26
components/lcms/Makefile file | annotate | diff | comparison | revisions
components/libxml2/Makefile file | annotate | diff | comparison | revisions 
--- a/components/lcms/Makefile	Wed Apr 18 16:31:37 2012 -0700
+++ b/components/lcms/Makefile	Wed Apr 18 20:49:03 2012 -0700
@@ -75,18 +75,13 @@
 
 # After we have configured, make a copy of the python bits so we
 # can build separate python 2.7 support.
-COMPONENT_POST_CONFIGURE_ACTION += ; (cd $(@D) ; cp -rp python python2.7)
+COMPONENT_POST_CONFIGURE_ACTION += ; (cd $(@D) ; cp -rp python python2.7 ; \
+	 		$(GSED) -i -e 's/2[.]6/2.7/g' python2.7/Makefile)
 
 # After we have built/installed lcms, rebuild/install the python
 # support for python 2.7
 COMPONENT_POST_INSTALL_ACTION = \
-    (cd $(@D)/python2.7 ; $(GMAKE) $(COMPONENT_INSTALL_ARGS) \
-                                PYTHON=$(PYTHON.2.7.$(BITS)) \
-                                PYTHON_VERSION=2.7 \
-                                LCMS_PYINCLUDE=/usr/include/python2.7 \
-                                LCMS_PYEXECDIR=$(PYTHON.2.7.VENDOR_PACKAGES) \
-                                LCMS_PYLIB=$(PYTHON.2.7.VENDOR_PACKAGES) \
-                                install)
+    (cd $(@D)/python2.7 ; $(GMAKE) $(COMPONENT_INSTALL_ARGS) install)
 
 LINT_FLAGS += -I$(COMPONENT_DIR)/$(COMPONENT_SRC)/include
 
--- a/components/libxml2/Makefile	Wed Apr 18 16:31:37 2012 -0700
+++ b/components/libxml2/Makefile	Wed Apr 18 20:49:03 2012 -0700
@@ -55,18 +55,13 @@
 
 # After we have configured, make a copy of the python bits so we
 # can build separate python 2.7 support.
-COMPONENT_POST_CONFIGURE_ACTION = (cd $(@D) ; cp -rp python python2.7)
+COMPONENT_POST_CONFIGURE_ACTION = (cd $(@D) ; cp -rp python python2.7 ; \
+			$(GSED) -i -e 's/2[.]6/2.7/g' python2.7/Makefile)
 
 # After we have built/installed libxml2, build/install the python
 # support for python 2.7
 COMPONENT_POST_INSTALL_ACTION = \
-    (cd $(@D)/python2.7 ; $(GMAKE) $(COMPONENT_INSTALL_ARGS) \
-                                PYTHON=$(PYTHON.2.7.$(BITS)) \
-                                PYTHON_VERSION=2.7 \
-                                PYTHON_INCLUDES=/usr/include/python2.7 \
-                                PYTHON_LIBS=$(PYTHON.2.7.VENDOR_PACKAGES) \
-                                PYTHON_SITE_PACKAGES=$(PYTHON.2.7.VENDOR_PACKAGES) \
-                                install)
+    (cd $(@D)/python2.7 ; $(GMAKE) $(COMPONENT_INSTALL_ARGS) install)
 
 
 # common targets
upstream/oracle/userland-gate