dbp/mysql
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add hack for my patchset

Browse Source 
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mysql@2238 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one 2010-05-30 07:20:21 +00:00
parent 898a775dd3
commit 65cc8a6c9e
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
eclass/mysql.eclass
View File

@ -209,7 +209,10 @@ mysql_version_is_at_least "5.1" \
&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling" && IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling"
[[ "${PN}" == "mariadb" ]] \ [[ "${PN}" == "mariadb" ]] \
&& IUSE="${IUSE} libevent pbxt xtradb" && IUSE="${IUSE} libevent"
[[ "${PN}" == "mariadb" ]] \
&& STORAGE_IUSE="${STORAGE_IUSE} pbxt xtradb"
IUSE="${IUSE} ${STORAGE_IUSE}" IUSE="${IUSE} ${STORAGE_IUSE}"

37
eclass/mysql.eclass.diff
View File

@ -1,5 +1,5 @@
--- /var/lib/layman/mysql-overlay/eclass/mysql.eclass 2010-04-29 20:11:37.345620519 +0200 --- /var/lib/layman/mysql-overlay/eclass/mysql.eclass 2010-04-29 20:11:37.345620519 +0200
+++ mysql.eclass 2010-05-30 02:06:43.216440310 +0200 +++ mysql.eclass 2010-05-30 08:45:24.424441764 +0200
@@ -40,6 +40,7 @@ @@ -40,6 +40,7 @@
pkg_preinst pkg_postinst \ pkg_preinst pkg_postinst \
pkg_config pkg_postrm pkg_config pkg_postrm
@ -48,12 +48,10 @@
DESCRIPTION="A fast, multi-threaded, multi-user SQL database server." DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
HOMEPAGE="http://www.mysql.com/" HOMEPAGE="http://www.mysql.com/"
if [[ "${PN}" == "mariadb" ]]; then if [[ "${PN}" == "mariadb" ]]; then
@@ -211,57 +209,9 @@ @@ -213,55 +211,10 @@
&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling"
[[ "${PN}" == "mariadb" ]] \ [[ "${PN}" == "mariadb" ]] \
-&& IUSE="${IUSE} libevent" && IUSE="${IUSE} libevent"
-
-# MariaDB has integrated PBXT -# MariaDB has integrated PBXT
-# PBXT_VERSION means that we have a PBXT patch for this PV -# PBXT_VERSION means that we have a PBXT patch for this PV
-# PBXT was only introduced after 5.1.12 -# PBXT was only introduced after 5.1.12
@ -79,9 +77,10 @@
- && [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]] - && [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]]
- return $? - return $?
-} -}
+&& IUSE="${IUSE} libevent pbxt xtradb"
- -
+[[ "${PN}" == "mariadb" ]] \
+&& STORAGE_IUSE="${STORAGE_IUSE} pbxt xtradb"
-pbxt_patch_available \ -pbxt_patch_available \
-&& PBXT_P="pbxt-${PBXT_VERSION}" \ -&& PBXT_P="pbxt-${PBXT_VERSION}" \
-&& PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz" \ -&& PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz" \
@ -108,7 +107,7 @@
# #
# HELPER FUNCTIONS: # HELPER FUNCTIONS:
@@ -589,7 +539,7 @@ @@ -589,7 +542,7 @@
# not added yet: ibmdb2i # not added yet: ibmdb2i
# Not supporting as examples: example,daemon_example,ftexample # Not supporting as examples: example,daemon_example,ftexample
plugins_sta="${plugins_sta} partition" plugins_sta="${plugins_sta} partition"
@ -117,7 +116,7 @@
if [[ "${PN}" != "mariadb" ]] ; then if [[ "${PN}" != "mariadb" ]] ; then
elog "Before using the Federated storage engine, please be sure to read" elog "Before using the Federated storage engine, please be sure to read"
@@ -623,18 +573,34 @@ @@ -623,18 +576,34 @@
if [[ "${PN}" == "mariadb" ]] ; then if [[ "${PN}" == "mariadb" ]] ; then
# In MariaDB, InnoDB is packaged in the xtradb directory, so it's not # In MariaDB, InnoDB is packaged in the xtradb directory, so it's not
# caught above. # caught above.
@ -158,7 +157,7 @@
use static && \ use static && \
plugins_sta="${plugins_sta} ${plugins_dyn}" && \ plugins_sta="${plugins_sta} ${plugins_dyn}" && \
@@ -653,39 +619,6 @@ @@ -653,39 +622,6 @@
done done
} }
@ -198,7 +197,7 @@
# #
# EBUILD FUNCTIONS # EBUILD FUNCTIONS
# #
@@ -727,15 +660,6 @@ @@ -727,15 +663,6 @@
eerror "${M}" eerror "${M}"
die "${M}" die "${M}"
fi fi
@ -214,7 +213,7 @@
# Bug #290570, 284946, 307251 # Bug #290570, 284946, 307251
# Upstream changes made us need a fairly new GCC4. # Upstream changes made us need a fairly new GCC4.
@@ -778,6 +702,20 @@ @@ -778,6 +705,20 @@
mysql_init_vars mysql_init_vars
unpack ${A} unpack ${A}
@ -235,7 +234,7 @@
# Grab the patches # Grab the patches
[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack
@@ -800,7 +738,7 @@ @@ -800,7 +741,7 @@
EPATCH_SUFFIX="patch" EPATCH_SUFFIX="patch"
mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory" mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
# Clean out old items # Clean out old items
@ -244,7 +243,7 @@
# Now link in right patches # Now link in right patches
mysql_mv_patches mysql_mv_patches
# And apply # And apply
@@ -832,26 +770,48 @@ @@ -832,26 +773,48 @@
local rebuilddirlist d local rebuilddirlist d
@ -308,7 +307,7 @@
fi fi
if mysql_version_is_at_least "5.1.12" ; then if mysql_version_is_at_least "5.1.12" ; then
@@ -954,10 +914,6 @@ @@ -954,10 +917,6 @@
find . -type f -name Makefile -print0 \ find . -type f -name Makefile -print0 \
| xargs -0 -n100 sed -i \ | xargs -0 -n100 sed -i \
-e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|' -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
@ -319,7 +318,7 @@
} }
# @FUNCTION: mysql_src_compile # @FUNCTION: mysql_src_compile
@@ -971,10 +927,6 @@ @@ -971,10 +930,6 @@
esac esac
emake || die "emake failed" emake || die "emake failed"
@ -330,7 +329,7 @@
} }
# @FUNCTION: mysql_src_install # @FUNCTION: mysql_src_install
@@ -990,10 +942,6 @@ @@ -990,10 +945,6 @@
testroot="${MY_SHAREDSTATEDIR}" \ testroot="${MY_SHAREDSTATEDIR}" \
|| die "emake install failed" || die "emake install failed"
@ -341,7 +340,7 @@
# Convenience links # Convenience links
einfo "Making Convenience links for mysqlcheck multi-call binary" einfo "Making Convenience links for mysqlcheck multi-call binary"
dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze" dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
@@ -1146,7 +1094,7 @@ @@ -1146,7 +1097,7 @@
einfo einfo
fi fi