[csw-devel] SF.net SVN: gar:[15778] csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Tue Sep 27 15:43:07 CEST 2011
Revision: 15778
http://gar.svn.sourceforge.net/gar/?rev=15778&view=rev
Author: wahwah
Date: 2011-09-27 13:43:06 +0000 (Tue, 27 Sep 2011)
Log Message:
-----------
pkg/mysql5/branches/mysql-5.1.x-optcsw: upgrade; doesn't build.
Modified Paths:
--------------
csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile
csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/checksums
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2011-09-27 10:51:51 UTC (rev 15777)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2011-09-27 13:43:06 UTC (rev 15778)
@@ -5,7 +5,7 @@
PROJ_NAME = mysql
NAME = $(PROJ_NAME)51
BASE_VERSION = 5.1
-PATCHLEVEL = 49
+PATCHLEVEL = 59
VERSION = $(BASE_VERSION).$(PATCHLEVEL)
CATEGORIES = server
@@ -52,7 +52,7 @@
PATCHFILES = 0001-Use-libc-not-libcrypt.patch
PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch
-PATCHFILES += 0003-OpenCSW-perl-for-tests.patch
+# PATCHFILES += 0003-OpenCSW-perl-for-tests.patch
PATCHFILES += 0004-basedir-and-datadir-in-the-cnf-files.patch
SPKG_DESC_CSW$(NAME) = Multithreaded SQL database
@@ -153,14 +153,24 @@
EXTRA_INC = /opt/csw/include
EXTRA_LIB = /opt/csw/lib
-# The following EXTRA_CFLAGS are necessary to compile on Solaris 8. Otherwise
-# the following problem occurs:
-#
-# "handler/i_s.cc", line 159: Error: The function "localtime_r" must have a
-# prototype.
-EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
-EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
+# We're building on Solaris 9 now.
+# # The following EXTRA_CFLAGS are necessary to compile on Solaris 8. Otherwise
+# # the following problem occurs:
+# #
+# # "handler/i_s.cc", line 159: Error: The function "localtime_r" must have a
+# # prototype.
+# EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
+# EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
+# --with-server-suffix="-3ubuntu12.3" \
+# --with-system-type="debian-linux-gnu" \
+# --with-pstack \
+# --with-unix-socket-path=/var/run/mysqld/mysqld.sock \
+# --without-readline \
+# \
+# --without-ndbcluster \
+
+
# Set ./configure options
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --disable-assembler
@@ -175,7 +185,10 @@
CONFIGURE_ARGS += --with-zlib-dir=/opt/csw
CONFIGURE_ARGS += --with-ssl=/opt/csw
CONFIGURE_ARGS += --with-plugins=max-no-ndb
-CONFIGURE_ARGS += --with-comment
+CONFIGURE_ARGS += --with-comment="(OpenCSW)"
+CONFIGURE_ARGS += --with-mysqld-user=mysql
+CONFIGURE_ARGS += --with-fast-mutexes
+CONFIGURE_ARGS += --with-libwrap
CONFIGURE_ARGS += --with-mysqld-libs=-lmtmalloc
CONFIGURE_ARGS += --with-big-tables
CONFIGURE_ARGS += --enable-thread-safe-client
@@ -210,14 +223,14 @@
perl mysql-test-run.pl --mem --big-test --force \
--skip-test=archive-big --skip-test=/gis/
-# pre-configure-modulated:
-# # To work around the following libtool version mismatch problem:
-# # libtool: Version mismatch error. This is libtool 2.2.6, but the
-# # libtool: definition of this LT_INIT comes from libtool 2.2.6b.
-# # libtool: You should recreate aclocal.m4 with macros from libtool 2.2.6
-# # http://lists.opencsw.org/pipermail/maintainers/2009-December/005066.html
-# cd $(WORKSRC) && autoreconf --force --install --symlink
-# @$(MAKECOOKIE)
+pre-configure-modulated:
+ # To work around the following libtool version mismatch problem:
+ # libtool: Version mismatch error. This is libtool 2.2.6, but the
+ # libtool: definition of this LT_INIT comes from libtool 2.2.6b.
+ # libtool: You should recreate aclocal.m4 with macros from libtool 2.2.6
+ # http://lists.opencsw.org/pipermail/maintainers/2009-December/005066.html
+ cd $(WORKSRC) && autoreconf --force --install --symlink
+ @$(MAKECOOKIE)
post-merge:
ginstall -m 755 -d $(PKGROOT)$(localstatedir)
@@ -232,7 +245,7 @@
ginstall -m 755 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql
ginstall -m 755 -d $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(NAME)
ginstall -m 644 $(FILEDIR)/cswusergroup \
- $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(NAME)
+ $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(NAME)
# A symlink for mysql5 include files
# ginstall -m 755 -d $(PKGROOT)/opt/csw/include
# ln -s ../$(NAME)/include/mysql $(PKGROOT)/opt/csw/include/mysql
@@ -242,7 +255,7 @@
if echo $$f | grep amd64$$; then continue; fi; \
if echo $$f | grep sparcv9$$; then continue; fi; \
ln -s ../..$(bindir)/`basename $$f` \
- $(PKGROOT)$(global_bindir)/`basename $$f`; \
+ $(PKGROOT)$(global_bindir)/`basename $$f`; \
done
# /opt/csw/$(NAME)/lib/sparc9/mysql -- by GAR, it's logical
# /opt/csw/$(NAME)/lib/mysql/sparcv9 -- expected by other packages
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/checksums
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/checksums 2011-09-27 10:51:51 UTC (rev 15777)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/checksums 2011-09-27 13:43:06 UTC (rev 15778)
@@ -1,12 +1 @@
-8940e0673e599689932e94fec906aec9 0001-Use-libc-not-libcrypt.patch
-1414d06fab1530484a508927a0de4154 0002-cast-user_info-pw_gid-to-gid_t.patch
-5415f365f1b0f7a179d1efc25f45bbee 0003-OpenCSW-perl-for-tests.patch
-8ab232cd4d232b3cda3bbced93f80237 0004-basedir-and-datadir-in-the-cnf-files.patch
-9c2c43fa308488e28b2ca79167220c4e CSWmysql51.postinstall
-1dcbbf2341ad8d75de3d0e99d7995c3e CSWmysql51.preinstall
-e691b0cf00a3925ac55c1844045d6e30 ChangeLog
-e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW
-7124b641ff82ee17033ce8f573700c89 cswmysql51
-67228e1f096fe08a94f4267439a4ec36 cswusergroup
-a90d87a71fa3c23dff6d78afc8e3184c mysql-5.1.49.tar.gz
-90b7cfcd11ab56e021a195a6a085fa21 quick_start-csw
+1e89816164692f44f768024db4bc05f6 mysql-5.1.59.tar.gz
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