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.
18125113 mysql Python module needs updates for MySQL 5.5 and 64-bit s11-update
authorJohn Beck <John.Beck@Oracle.COM>
Wed, 29 Jan 2014 13:44:48 -0800
branchs11-update
changeset 3794 4c9c1c3e5031
parent 3793 7befd73326eb
child 3795 cfd59dfe98a2
18125113 mysql Python module needs updates for MySQL 5.5 and 64-bit
components/pylint/pylint-GENFRAG.p5m file | annotate | diff | comparison | revisions
components/pylint/pylint-PYVER.p5m file | annotate | diff | comparison | revisions
components/python/mysql/Makefile file | annotate | diff | comparison | revisions
components/python/mysql/mysql-PYVER.p5m file | annotate | diff | comparison | revisions
components/python/mysql/resolve.deps file | annotate | diff | comparison | revisions 
--- a/components/python/mysql/Makefile	Tue Jan 27 14:00:37 2015 -0800
+++ b/components/python/mysql/Makefile	Wed Jan 29 13:44:48 2014 -0800
@@ -38,7 +38,7 @@
 TPNO=			9533
 
 # Syntax issues: not Python 3 ready.
-PYTHON_VERSIONS = 2.7 2.6
+PYTHON_VERSIONS=	2.7 2.6
 
 include $(WS_TOP)/make-rules/prep.mk
 include $(WS_TOP)/make-rules/setup.py.mk
@@ -54,9 +54,9 @@
 CFLAGS +=	$(CFLAGS_$(BITS))
 
 # common targets
-build:          $(BUILD_32)
+build:          $(BUILD_32_and_64)
 
-install:        $(INSTALL_32)
+install:        $(INSTALL_32_and_64)
 
 test:           $(NO_TESTS)
 
--- a/components/python/mysql/mysql-PYVER.p5m	Tue Jan 27 14:00:37 2015 -0800
+++ b/components/python/mysql/mysql-PYVER.p5m	Wed Jan 29 13:44:48 2014 -0800
@@ -36,6 +36,7 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2008/081
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/lib/python$(PYVER)/vendor-packages/64/_mysql.so
 file path=usr/lib/python$(PYVER)/vendor-packages/MySQL_python-1.2.2-py$(PYVER).egg-info/PKG-INFO
 file path=usr/lib/python$(PYVER)/vendor-packages/MySQL_python-1.2.2-py$(PYVER).egg-info/SOURCES.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/MySQL_python-1.2.2-py$(PYVER).egg-info/dependency_links.txt
--- a/components/python/mysql/resolve.deps	Tue Jan 27 14:00:37 2015 -0800
+++ b/components/python/mysql/resolve.deps	Wed Jan 29 13:44:48 2014 -0800
@@ -1,4 +1,4 @@
-database/mysql-51/library
+database/mysql-55/library
 library/zlib
 runtime/python-26
 runtime/python-27
upstream/oracle/userland-gate