[csw-devel] SF.net SVN: gar:[20350] csw/mgar/pkg/mysql5/branches/mysql-5.6.x
janholzh at users.sourceforge.net
janholzh at users.sourceforge.net
Thu Feb 28 15:27:37 CET 2013
Revision: 20350
http://gar.svn.sourceforge.net/gar/?rev=20350&view=rev
Author: janholzh
Date: 2013-02-28 14:27:35 +0000 (Thu, 28 Feb 2013)
Log Message:
-----------
mysql5/branches/mysql-5.6.x: play around with GA release.
Modified Paths:
--------------
csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile
csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums
Added Paths:
-----------
csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/0002-do_not_use_libstlport.patch
csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/map.mysql
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2013-02-28 10:44:15 UTC (rev 20349)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2013-02-28 14:27:35 UTC (rev 20350)
@@ -13,17 +13,13 @@
PROJ_NAME = mysql
NAME = $(PROJ_NAME)5
BASE_VERSION = 5.6
-PATCHLEVEL = 4-m7
+PATCHLEVEL = 10
ALTS_PRIO = 56
VERSION = $(BASE_VERSION).$(PATCHLEVEL)
-CATEGORIES = server
# Useful when making a series of builds on the same day
# GARFLAVOR ?= DBG
-# There is some assembler code, which doesn't work on sparcv8, and I don't see
-# an easy way to switch it off.
-ISA_DEFAULT_sparc-5.9 = sparcv8plus
DISTNAME = mysql-$(VERSION)
SPKG_SOURCEURL = http://www.mysql.com/
@@ -40,6 +36,11 @@
# EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
GARCOMPILER = GNU
+NOGITPATCH ?= 1
+
+#Mapfile:
+LINKER_MAPS ?= -M "$(abspath $(WORKDIR)/map.mysql)"
+
INITSMF = $(sysconfdir)/init\.d/csw$(NAME)
# Existing databases are in this location
@@ -66,9 +67,10 @@
PKGFILES_CSWmysql-dev += /opt/csw/include/mysql
CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config.1
CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config.1
-PATCHFILES += 0003-I-HATE-CMAKE.patch
+#PATCHFILES += 0003-I-HATE-CMAKE.patch
# PATCHFILES += 0003-WHY-IS-CMAKE-TRYING-TO-BE-SMARTER-THAN-ME.patch
PATCHFILES += 0005-Do-not-strip-RPATH-from-binaries.patch
+#PATCHFILES += 0002-do_not_use_libstlport.patch
PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER)
PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*)
@@ -153,6 +155,7 @@
DISTFILES += CSW$(NAME).preinstall
DISTFILES += CSW$(NAME).postinstall
DISTFILES += cswusergroup
+DISTFILES += map.mysql
# TODO: Do the proper prerequsite pkgs.
BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS)
@@ -188,28 +191,35 @@
CMAKE_ARGS += -DINSTALL_LAYOUT=RPM
CMAKE_ARGS += -DMYSQL_DATADIR=$(localstatedir)
CMAKE_ARGS += -DSYSCONFDIR=$(sysconfdir)
-# CMAKE_ARGS += -DINSTALL_BINDIR=$(subst $(prefix)/,,$(bindir))
-# CMAKE_ARGS += -DINSTALL_SBINDIR=$(subst $(prefix)/,,$(libexecdir))
+CMAKE_ARGS += -DINSTALL_BINDIR=$(subst $(prefix)/,,$(bindir))
+CMAKE_ARGS += -DINSTALL_SBINDIR=$(subst $(prefix)/,,$(libexecdir))
# CMAKE_ARGS += -DINSTALL_MANDIR=$(subst $(prefix)/,,$(mandir))
-# CMAKE_ARGS += -DINSTALL_LIBDIR=$(subst $(prefix)/,,$(libdir))
-CMAKE_ARGS += -DINSTALL_PLUGINDIR=$(subst $(prefix)/,,$(libdir))/$(NAME)/$(MM_LIBDIR)/plugin
+CMAKE_ARGS += -DINSTALL_LIBDIR=$(subst $(prefix)/,,$(libdir))
+CMAKE_ARGS += -DINSTALL_PLUGINDIR=$(subst $(prefix)/,,$(libdir))/$(NAME)/plugin
CMAKE_ARGS += -DWITH_READLINE=1
+CMAKE_ARGS += -DWITH_LIBWRAP=1
CMAKE_ARGS += -DWITH_SSL=system
CMAKE_ARGS += -DWITH_ZLIB=system
CMAKE_ARGS += -DDEFAULT_CHARSET=utf8
CMAKE_ARGS += -DDEFAULT_COLLATION=utf8_general_ci
CMAKE_ARGS += -DWITH_COMMENT='OpenCSW'
-CMAKE_ARGS += -DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_CXX_FLAGS="$(CXXFLAGS)"
+#Hardcode Sunstudio compiler:
+#CMAKE_ARGS += -DCMAKE_C_COMPILER="/opt/solarisstudio12.3/bin/cc"
+#CMAKE_ARGS += -DCMAKE_CXX_COMPILER="/opt/solarisstudio12.3/bin/CC"
+CMAKE_ARGS += -DCMAKE_C_FLAGS="$(CFLAGS)"
+CMAKE_ARGS += -DCMAKE_CXX_FLAGS="$(CXXFLAGS)"
CMAKE_ARGS += -DBUILD_CONFIG=mysql_release
# CMAKE_ARGS += -DOPENSSL_INCLUDE_DIR="$(includedir)"
# CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)"
# CMAKE_ARGS += -DCMAKE_PREFIX_PATH="$(prefix)"
CMAKE_ARGS += -DOPENSSL_ROOT_DIR=$(prefix)
-# CMAKE_ARGS += -DOPENSSL_SSL_LIBRARIES=$(libdir)/$(MM_LIBDIR)/libssl.so
-# CMAKE_ARGS += -DOPENSSL_CRYPTO_LIBRARIES=$(libdir)/$(MM_LIBDIR)/libcrypto.so
+# CMAKE_ARGS += -DOPENSSL_SSL_LIBRARIES=$(libdir)/libssl.so
+# CMAKE_ARGS += -DOPENSSL_CRYPTO_LIBRARIES=$(libdir)/libcrypto.so
CMAKE_ARGS += -DCMAKE_INCLUDE_PATH="$(includedir)"
CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)"
-
+CMAKE_ARGS += "-DCMAKE_C_FLAGS=$(CFLAGS)"
+CMAKE_ARGS += "-DCMAKE_CXX_FLAGS=$(CXXFLAGS)"
+CMAKE_ARGS += -DCMAKE_VERBOSE_MAKEFILE=ON
# TODO: Make the tests pass. They don't at the moment.
SKIPTEST ?= 1
TEST_SCRIPTS = custom
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums 2013-02-28 10:44:15 UTC (rev 20349)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums 2013-02-28 14:27:35 UTC (rev 20350)
@@ -1 +1 @@
-3bba56b37faf33c0b9549bab36fb25f3 mysql-5.6.4-m7.tar.gz
+9dcee911fb4bc7e977a6b63f4d3ffa63 mysql-5.6.10.tar.gz
Added: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/0002-do_not_use_libstlport.patch
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/0002-do_not_use_libstlport.patch (rev 0)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/0002-do_not_use_libstlport.patch 2013-02-28 14:27:35 UTC (rev 20350)
@@ -0,0 +1,57 @@
+From cecc498f6a25b58bfa84f1cb2c63f07220d3825a Mon Sep 17 00:00:00 2001
+From: Jan Holzhueter <jh at opencsw.org>
+Date: Thu, 28 Feb 2013 13:52:11 +0100
+Subject: [PATCH] do_not_use_libstlport
+
+---
+ cmake/build_configurations/compiler_options.cmake | 4 ++--
+ configure.cmake | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/cmake/build_configurations/compiler_options.cmake b/cmake/build_configurations/compiler_options.cmake
+index 521666e..93634f2 100644
+--- a/cmake/build_configurations/compiler_options.cmake
++++ b/cmake/build_configurations/compiler_options.cmake
+@@ -95,7 +95,7 @@ IF(UNIX)
+ IF(CMAKE_C_COMPILER_ID MATCHES "SunPro")
+ IF(CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
+ SET(COMMON_C_FLAGS "-g -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic")
+- SET(COMMON_CXX_FLAGS "-g0 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic -library=stlport4")
++ SET(COMMON_CXX_FLAGS "-g0 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic")
+ # We have to specify "-xO1" for DEBUG flags here,
+ # see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6879978
+ SET(CMAKE_C_FLAGS_DEBUG "-xO1 ${COMMON_C_FLAGS}")
+@@ -110,7 +110,7 @@ IF(UNIX)
+ ELSE()
+ # Assume !x86 is SPARC
+ SET(COMMON_C_FLAGS "-g -Xa -xstrconst -mt")
+- SET(COMMON_CXX_FLAGS "-g0 -mt -library=stlport4")
++ SET(COMMON_CXX_FLAGS "-g0 -mt")
+ IF(32BIT)
+ SET(COMMON_C_FLAGS "${COMMON_C_FLAGS} -xarch=sparc")
+ SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -xarch=sparc")
+diff --git a/configure.cmake b/configure.cmake
+index a9cdc0c..10fdcb3 100644
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -73,7 +73,7 @@ ENDIF()
+ # http://developers.sun.com/solaris/articles/cmp_stlport_libCstd.html
+ # Use stlport rather than Rogue Wave.
+ IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
+- IF(CMAKE_CXX_COMPILER_ID MATCHES "SunPro")
++ IF(CMAKE_CXX_COMPILER_ID MATCHES "SunProNO")
+ SET(CMAKE_CXX_FLAGS
+ "${CMAKE_CXX_FLAGS} -library=stlport4")
+ ENDIF()
+@@ -83,7 +83,7 @@ MACRO(DIRNAME IN OUT)
+ GET_FILENAME_COMPONENT(${OUT} ${IN} PATH)
+ ENDMACRO()
+
+-IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_C_COMPILER_ID MATCHES "SunPro")
++IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_C_COMPILER_ID MATCHES "SunProNO")
+ DIRNAME(${CMAKE_CXX_COMPILER} CXX_PATH)
+ SET(STLPORT_SUFFIX "lib/stlport4")
+ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
+--
+1.8.1.4
+
Added: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/map.mysql
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/map.mysql (rev 0)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/map.mysql 2013-02-28 14:27:35 UTC (rev 20350)
@@ -0,0 +1,7 @@
+# Solaris 10 mapfile with libc Version 1.22.2 which is Update?? Kernel Version
+# http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libc/port/mapfile-vers#301
+libc.so - SUNW_1.22.5 SUNWprivate_1.1 $ADDVERS=SUNW_1.22.5;
+# http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libresolv2/common/mapfile-vers
+libresolv.so - SUNW_2.2 SUNWprivate_2.1 $ADDVERS=SUNW_2.2;
+# http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libnsl/common/mapfile-vers
+libnsl.so - SUNW_1.9.1 SUNWprivate_1.5 $ADDVERS=SUNW_1.9.1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list