[csw-devel] SF.net SVN: gar:[17054] csw/mgar/pkg/mysql5/branches/mysql-5.0.x
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Tue Feb 14 17:17:28 CET 2012
Revision: 17054
http://gar.svn.sourceforge.net/gar/?rev=17054&view=rev
Author: wahwah
Date: 2012-02-14 16:17:27 +0000 (Tue, 14 Feb 2012)
Log Message:
-----------
mysql5/branches/mysql-5.0.x: do not try to support multiple version installations, drop alternatives and coreutils dependencies
Modified Paths:
--------------
csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile
csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall
csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2012-02-14 15:52:14 UTC (rev 17053)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2012-02-14 16:17:27 UTC (rev 17054)
@@ -13,8 +13,6 @@
VERSION = $(BASE_VERSION).$(PATCHLEVEL)
CATEGORIES = server
-# PACKAGING_PLATFORMS = solaris9-sparc solaris10-sparc
-
# Useful when making a series of builds on the same day
# GARFLAVOR ?= DBG
@@ -32,7 +30,7 @@
# Existing databases are in this location
localstatedir = /var$(BUILD_PREFIX)/$(NAME)
# To avoid file conflicts
-datadir = $(prefix)/share/mysql/$(BASE_VERSION)
+# datadir = $(prefix)/share/mysql/$(BASE_VERSION)
MYSQL_LIB_VER = 15
@@ -44,24 +42,15 @@
RUNTIME_DEP_PKGS_CSWmysql-dev += CSWlibmysqlclient-r$(MYSQL_LIB_VER)
RUNTIME_DEP_PKGS_CSWmysql-dev += CSWlibmysqlclient$(MYSQL_LIB_VER)
CSWmysql-dev_programs += mysql_config
-PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(call baseisadirs,$(bindir),$(bin_name)-$(BASE_VERSION)))
-PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(mandir)/man1/$(bin_name)\.1-$(BASE_VERSION))
-PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/bin/$(bin_name)-$(BASE_VERSION))
-PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/sbin/$(bin_name)-$(BASE_VERSION))
+PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(call baseisadirs,$(bindir),$(bin_name)))
+PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(mandir)/man1/$(bin_name)\.1)
+PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/bin/$(bin_name))
+PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/sbin/$(bin_name))
PKGFILES_CSWmysql-dev += $(mandir)/man1/mysql_config.*
PKGFILES_CSWmysql-dev += $(prefix)/include.*
PKGFILES_CSWmysql-dev += /opt/csw/include/mysql
OBSOLETED_BY_CSWmysql-dev = CSWmysql5devel
-CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config-$(BASE_VERSION).1
-ALTERNATIVES_CSWmysql-dev = mysql_dev
-ALTERNATIVE_mysql_dev = $(bindir)/$(firstword $(CSWmysql-dev_programs)) mysql_dev $(bindir)/$(firstword $(CSWmysql-dev_programs))-$(BASE_VERSION) $(ALTS_PRIO)
-ALTERNATIVE_mysql_dev += $(bindir)/$(ISA_DEFAULT64)/$(firstword $(CSWmysql-dev_programs)) mysql_dev64 $(bindir)/$(ISA_DEFAULT64)/$(firstword $(CSWmysql-dev_programs))-$(BASE_VERSION) $(ALTS_PRIO)
-ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\
- $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION) \
- $(bindir)/$(ISA_DEFAULT64)/$(C)64 $C $(bindir)/$(ISA_DEFAULT64)/$C-$(BASE_VERSION))
-ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\
- $(mandir)/man1/$(C).1 $C $(mandir)/man1/$(C)-$(BASE_VERSION).1)
-
+CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config.1
PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER)
PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*)
SPKG_DESC_CSWlibmysqlclient$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient.so.$(MYSQL_LIB_VER)
@@ -96,10 +85,10 @@
PACKAGES += CSW$(NAME)client
SPKG_DESC_CSW$(NAME)client = MySQL $(BASE_VERSION) client binaries
PKGFILES_CSW$(NAME)client = $(bindir)
-PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(call baseisadirs,$(bindir),$(bin_name)-$(BASE_VERSION)))
-PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(mandir)/man1/$(bin_name)-$(BASE_VERSION)\.1)
-PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/bin/$(bin_name)-$(BASE_VERSION))
-PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/sbin/$(bin_name)-$(BASE_VERSION))
+PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(call baseisadirs,$(bindir),$(bin_name)))
+PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(mandir)/man1/$(bin_name)\.1)
+PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/bin/$(bin_name))
+PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/sbin/$(bin_name))
RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient$(MYSQL_LIB_VER)
RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibncursesw5
RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibz1
@@ -112,25 +101,19 @@
RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient-r$(MYSQL_LIB_VER)
RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibwrap1
RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibz1
-RUNTIME_DEP_PKGS_CSW$(NAME) += CSWcoreutils
+# RUNTIME_DEP_PKGS_CSW$(NAME) += CSWcoreutils
CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry
CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content
CHECKPKG_OVERRIDES_CSW$(NAME) += surplus-dependency|CSW$(NAME)client
-CHECKPKG_OVERRIDES_CSW$(NAME) += surplus-dependency|CSWcoreutils
+# CHECKPKG_OVERRIDES_CSW$(NAME) += surplus-dependency|CSWcoreutils
EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/mysql-test.*
EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/sql-bench.*
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 += 0004-basedir-and-datadir-in-the-cnf-files.patch
PATCHFILES += 0004-looking-for-ps-use-basename-0.patch
-# Perhaps using sed would be better, but we have a patch for now.
-PATCHFILES += 0006-Use-my_print_defaults-$(BASE_VERSION).patch
-# PATCHFILES += 0007-versioned-mysqld-during-db-init-$(BASE_VERSION).patch
-PATCHFILES += 0008-versioned-mysqld-in-mysql_install_db.patch
-PATCHFILES += 0009-versioned-datadir-in-mysql_install_db-$(BASE_VERSION).patch
# Enable 64 bits build
BUILD64 = 1
@@ -138,7 +121,7 @@
EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
-MASTER_SITES = http://ftp.heanet.ie/mirrors/www.mysql.com/Downloads/MySQL-$(BASE_VERSION)/
+MASTER_SITES = http://ftp.heanet.ie/mirrors/www.mysql.com/Downloads/MySQL/
DISTFILES = mysql-$(VERSION).tar.gz
DISTFILES += csw$(NAME).tpl
DISTFILES += quick_start-csw
@@ -151,7 +134,6 @@
# TODO: Do the proper prerequsite pkgs.
BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS)
-
# Set ./configure options
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --disable-assembler
@@ -175,7 +157,7 @@
CONFIGURE_ARGS += --enable-thread-safe-client
CONFIGURE_ARGS_DBG = --with-debug
CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
-CONFIGURE_ARGS += --program-suffix=-$(BASE_VERSION)
+# CONFIGURE_ARGS += --program-suffix=
CONFIGURE_ARGS += --with-federated-storage-engine
# TODO: Make the tests pass. They don't at the moment.
@@ -197,7 +179,7 @@
CHECKPKG_OVERRIDES_CSW$(NAME)test += file-with-bad-content
CHECKPKG_OVERRIDES_CSW$(NAME)test += surplus-dependency|CSW$(NAME)
-CHECKPKG_OVERRIDES_CSW$(NAME)client += file-with-bad-content|/usr/local|root$(prefix)/share/man/man1/mysqlaccess-$(BASE_VERSION).1
+CHECKPKG_OVERRIDES_CSW$(NAME)client += file-with-bad-content|/usr/local|root$(prefix)/share/man/man1/mysqlaccess.1
# This could be reviewed.
CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content
@@ -246,22 +228,6 @@
EXECUTABLES += resolve_stack_dump
EXECUTABLES += resolveip
-ALTERNATIVES_CSW$(NAME) = mysql$(BASE_VERSION)_main
-ALTERNATIVE_mysql$(BASE_VERSION)_main = $(bindir)/$(firstword $(EXECUTABLES)) mysql_main $(bindir)/$(firstword $(EXECUTABLES))-$(BASE_VERSION) $(ALTS_PRIO)
-ALTERNATIVE_mysql$(BASE_VERSION)_main += $(bindir)/$(ISA_DEFAULT64)/$(firstword $(EXECUTABLES)) mysql_main64 $(bindir)/$(ISA_DEFAULT64)/$(firstword $(EXECUTABLES))-$(BASE_VERSION) $(ALTS_PRIO)
-ALTERNATIVE_mysql$(BASE_VERSION)_main += $(foreach C,$(wordlist 2,$(words $(EXECUTABLES)),$(EXECUTABLES)),\
- $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION) \
- $(bindir)/$(ISA_DEFAULT64)/$C $(C)64 $(bindir)/$(ISA_DEFAULT64)/$C-$(BASE_VERSION))
-
-ALTERNATIVES_CSW$(NAME)client = mysql$(BASE_VERSION)_client
-ALTERNATIVE_mysql$(BASE_VERSION)_client = $(bindir)/$(firstword $(client_programs)) mysql_client $(bindir)/$(firstword $(client_programs)) $(ALTS_PRIO)
-ALTERNATIVE_mysql$(BASE_VERSION)_client += $(bindir)/$(ISA_DEFAULT64)/$(firstword $(client_programs)) mysql_client64 $(bindir)/$(ISA_DEFAULT64)/$(firstword $(client_programs)) $(ALTS_PRIO)
-ALTERNATIVE_mysql$(BASE_VERSION)_client += $(foreach C,$(wordlist 2,$(words $(client_programs)),$(client_programs)),\
- $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION) \
- $(bindir)/$(ISA_DEFAULT64)/$C $(C)64 $(bindir)/$(ISA_DEFAULT64)/$C-$(BASE_VERSION))
-ALTERNATIVE_mysql$(BASE_VERSION)_client += $(foreach C,$(wordlist 2,$(words $(client_programs)),$(client_programs)),\
- $(mandir)/man1/$(C).1 $C $(mandir)/man1/$(C)-$(BASE_VERSION).1)
-
# These are harmless, although it would be nice to clean them up eventually.
# Help appreciated?
CHECKPKG_OVERRIDES_CSWmysql51 += file-collision|/opt/csw/share/doc/mysql5devel_stub/README.CSW|CSWmysql5|CSWmysql51
@@ -317,17 +283,6 @@
ginstall -m 755 -d $(PKGROOT)$(sysconfdir)/pkg/CSW$(NAME)
ginstall -m 644 $(FILEDIR)/cswusergroup \
$(PKGROOT)$(sysconfdir)/pkg/CSW$(NAME)
- # Create symlinks to binaries
- # ginstall -m 755 -d $(PKGROOT)$(bindir)
- #for f in $(PKGROOT)$(bindir)/*; do \
- # if echo $$f | grep amd64$$; then continue; fi; \
- # if echo $$f | grep sparcv9$$; then continue; fi; \
- # ln -s ../$(NAME)/bin/`basename $$f` \
- # $(PKGROOT)$(bindir)/`basename $$f`; \
- #done
# http://www.opencsw.org/bugtrack/view.php?id=4149
ginstall -m 755 -d $(PKGROOT)$(sysconfdir)
@$(MAKECOOKIE)
-
-# We need the GNU userland (nobody knows why)
-PATH := /opt/csw/gnu:$(PATH)
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall 2012-02-14 15:52:14 UTC (rev 17053)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall 2012-02-14 16:17:27 UTC (rev 17054)
@@ -15,7 +15,7 @@
MYSQL_HOME="/var${prefix}/mysql5"
sysconfdir="/etc${prefix}"
# https://www.opencsw.org/mantis/view.php?id=4646
-DEFAULTS_FILE="${prefix}/share/mysql/5.0/mysql/my-small.cnf"
+DEFAULTS_FILE="${prefix}/share/mysql/my-small.cnf"
MYSQLD_USER="mysql"
# Provide the default data directory
MYSQLD_DATADIR="${MYSQL_HOME}"
@@ -64,7 +64,7 @@
echo "Creating MySQL core database in $MYSQLD_DATADIR"
echo
echo "### The following messages are from mysql_install_db."
-"$BASEDIR/bin/mysql_install_db-5.0" \
+"$BASEDIR/bin/mysql_install_db" \
--defaults-extra-file="$DEFAULTS_FILE" \
--user="$MYSQLD_USER" \
--basedir="$BASEDIR" \
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl 2012-02-14 15:52:14 UTC (rev 17053)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl 2012-02-14 16:17:27 UTC (rev 17054)
@@ -26,7 +26,6 @@
MYSQLD_DATADIR=$MYSQL_VAR
MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid
CONFFILE=${sysconfdir}/my.cnf
-MYSQLD_PROG=${MYSQLD_PROG:-mysqld-${BASE_VERSION}}
# Source the configuration
[ -r /opt/csw/mysql5/etc/mysql5rc ] && . /opt/csw/mysql5/etc/mysql5rc
@@ -98,8 +97,7 @@
# fi
# 2006-04-16 --defaults-file is changed to --defaults-extra-file
- ${BINDIR}/mysqld_safe-${BASE_VERSION} \
- --mysqld-version=${BASE_VERSION} \
+ ${BINDIR}/mysqld_safe \
`[ -n "$CONFFILE" ] && echo "--defaults-extra-file=$CONFFILE"` \
--pid-file=$MYSQLD_PID_FILE \
`[ -n "$MYSQLD_PROG" ] && echo "--mysqld=$MYSQLD_PROG"` \
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