/[gentoo-x86]/eclass/mysql.eclass
Gentoo

Diff of /eclass/mysql.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.42 Revision 1.51
1# Copyright 1999-2006 Gentoo Foundation 1# Copyright 1999-2006 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.42 2006/10/21 14:32:21 chtekk Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.51 2006/12/29 20:34:02 vivo Exp $
4 4
5# Author: Francesco Riosa <vivo@gentoo.org> 5# Author: Francesco Riosa <vivo@gentoo.org>
6# Maintainer: Luca Longinotti <chtekk@gentoo.org> 6# Maintainer: Luca Longinotti <chtekk@gentoo.org>
7 7
8# Both MYSQL_VERSION_ID and MYSQL_PATCHSET_REV must be set in the ebuild too 8# Both MYSQL_VERSION_ID and MYSQL_PATCHSET_REV must be set in the ebuild too
… …
33 >=sys-apps/sed-4 33 >=sys-apps/sed-4
34 >=sys-apps/texinfo-4.7-r1 34 >=sys-apps/texinfo-4.7-r1
35 >=sys-libs/readline-4.1 35 >=sys-libs/readline-4.1
36 >=sys-libs/zlib-1.2.3" 36 >=sys-libs/zlib-1.2.3"
37 37
38# LEAVE THE SURROUNDING SPACES THERE
39MYSQL_MUTUALLY_EXCLUSIVE=" !dev-db/mysql !dev-db/mysql-community "
40DEPEND="${DEPEND} ${MYSQL_MUTUALLY_EXCLUSIVE/ !${CATEGORY}\/${PN} /}"
41
38mysql_version_is_at_least "5.01.00.00" \ 42mysql_version_is_at_least "5.01.00.00" \
39|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )" 43|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"
40 44
41RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-mysql )" 45RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-mysql )"
42 46
43# dev-perl/DBD-mysql is needed by some scripts installed by MySQL 47# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
44PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" 48PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
45 49
46# Shorten the path because the socket path length must be shorter than 107 chars 50# Shorten the path because the socket path length must be shorter than 107 chars
47# and we will run a mysql server during test phase 51# and we will run a mysql server during test phase
48S="${WORKDIR}/${PN/_alpha/-bk-}" # BitKeeper ebuilds 52S="${WORKDIR}/mysql" # BitKeeper ebuilds
49 53
50# Define $MY_FIXED_PV for MySQL patchsets 54# Define $MY_FIXED_PV for MySQL patchsets
51MY_FIXED_PV="${PV/_alpha/}" 55MY_FIXED_PV="${PV/_alpha/}"
52#MY_FIXED_PV="${MY_FIXED_PV/_beta/}" 56#MY_FIXED_PV="${MY_FIXED_PV/_beta/}"
53#MY_FIXED_PV="${MY_FIXED_PV/_rc/}" 57#MY_FIXED_PV="${MY_FIXED_PV/_rc/}"
54 58
55MY_P="${P/_/-}" 59MY_P="${P/_/-}"
56MY_P="${MY_P/-alpha/-bk-}" # BitKeeper ebuilds 60MY_P="${MY_P/-alpha/-bk-}" # BitKeeper ebuilds
61MY_P="${MY_P/-community/}"
57 62
58# Define correct SRC_URIs 63# Define correct SRC_URIs
59SRC_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/${MY_P}${MYSQL_RERELEASE}.tar.gz" 64SRC_URI="${BASE_URI}/${MY_P}${MYSQL_RERELEASE}.tar.gz"
60if [[ -n "${MYSQL_PATCHSET_REV}" ]] ; then 65if [[ -n "${MYSQL_PATCHSET_REV}" ]] ; then
61 MYSQL_PATCHSET_FILENAME="${PN}-patchset-${MY_FIXED_PV}-r${MYSQL_PATCHSET_REV}.tar.bz2" 66 MYSQL_PATCHSET_FILENAME="${PN}-patchset-${MY_FIXED_PV}-r${MYSQL_PATCHSET_REV}.tar.bz2"
62 # We add the Gentoo mirror here, as we only use primaryuri for the MySQL tarball 67 # We add the Gentoo mirror here, as we only use primaryuri for the MySQL tarball
63 SRC_URI="${SRC_URI} http://gentoo.longitekk.com/${MYSQL_PATCHSET_FILENAME}" 68 SRC_URI="${SRC_URI} http://g3nt8.org/patches/${MYSQL_PATCHSET_FILENAME}"
64fi 69fi
65 70
66DESCRIPTION="A fast, multi-threaded, multi-user SQL database server." 71DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
67HOMEPAGE="http://www.mysql.com/" 72HOMEPAGE="http://www.mysql.com/"
68SLOT="0" 73SLOT="0"
… …
92 pkg_postinst pkg_config pkg_postrm 97 pkg_postinst pkg_config pkg_postrm
93 98
94# 99#
95# HELPER FUNCTIONS: 100# HELPER FUNCTIONS:
96# 101#
102
103bitkeeper_fetch() {
104
105 local tpv=( ${PV//[-._]/ } )
106 local reposuf="${tpv[0]}.${tpv[1]}"
107 useq "cluster" && reposuf="${reposuf}-ndb"
108 local repo_uri="bk://mysql.bkbits.net/mysql-${reposuf}"
109 ## -- ebk_store_dir: bitkeeper sources store directory
110 local ebk_store_dir="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/bk-src"
111 ## -- ebk_fetch_cmd: bitkeeper fetch command
112 # always fetch the latest revision, use -r<revision> if a specified revision is wanted
113 # hint: does not work
114 local ebk_fetch_cmd="sfioball"
115 ## -- ebk_update_cmd: bitkeeper update command
116 local ebk_update_cmd="update"
117
118 #addread "/etc/bitkeeper"
119 addwrite "${ebk_store_dir}"
120
121 if [[ ! -d "${ebk_store_dir}" ]]; then
122 debug-print "${FUNCNAME}: initial checkout. creating bitkeeper directory"
123 mkdir -p "${ebk_store_dir}" || die "${EBK}: can't mkdir ${ebk_store_dir}."
124 fi
125
126 pushd "${ebk_store_dir}" || die "${EBK}: can't chdir to ${ebk_store_dir}"
127
128 local wc_path=mysql-${reposuf}
129
130 if [[ ! -d "${wc_path}" ]]; then
131 local options="-r+"
132 # first check out
133 einfo "bitkeeper check out start -->"
134 einfo " repository: ${repo_uri}"
135 ${ebk_fetch_cmd} ${options} "${repo_uri}" ${wc_path} \
136 || die "${EBK}: can't fetch from ${repo_uri}."
137 else
138 if [[ ! -d "${wc_path}/BK" ]]; then
139 popd
140 die "Look like ${wc_path} is not a bitkeeper path."
141 fi
142
143 # update working copy
144 einfo "bitkeeper update start -->"
145 einfo " repository: ${repo_uri}"
146
147 ${ebk_update_cmd} "${repo_uri}" "${wc_path}" \
148 || die "BK: can't update from ${repo_uri} to ${wc_path}."
149
150 fi
151
152 einfo " working copy: ${wc_path}"
153 cd "${wc_path}"
154 rsync -rlpgo --exclude="BK/" . "${S}" || die "BK: can't export to ${S}."
155
156 echo
157 popd
158
159}
160
161mysql_disable_test() {
162 local testname="${1}" ; shift
163 local reason="${@}"
164 local mysql_disable_file="${S}/mysql-test/t/disabled.def"
165 echo ${testname} : ${reason} >> "${mysql_disable_file}"
166 ewarn "test \"${testname}\" disabled because: \"${reason}\""
167}
97 168
98# void mysql_init_vars() 169# void mysql_init_vars()
99# 170#
100# Initialize global variables 171# Initialize global variables
101# 2005-11-19 <vivo@gentoo.org> 172# 2005-11-19 <vivo@gentoo.org>
… …
150 export MY_INCLUDEDIR 221 export MY_INCLUDEDIR
151 export DATADIR 222 export DATADIR
152} 223}
153 224
154configure_minimal() { 225configure_minimal() {
155 # These are things we exclude from a minimal build, please 226 # These are things we exclude from a minimal build, please
156 # note that the server actually does get built and installed, 227 # note that the server actually does get built and installed,
157 # but we then delete it before packaging. 228 # but we then delete it before packaging.
158 local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication" 229 local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication"
159 230
160 for i in ${minimal_exclude_list} ; do 231 for i in ${minimal_exclude_list} ; do
161 myconf="${myconf} --without-${i}" 232 myconf="${myconf} --without-${i}"
162 done 233 done
163 myconf="${myconf} --with-extra-charsets=none" 234 myconf="${myconf} --with-extra-charsets=none"
235 myconf="${myconf} --enable-local-infile"
236
237 if useq "static" ; then
238 myconf="${myconf} --with-client-ldflags=-all-static"
239 myconf="${myconf} --disable-shared"
240 else
241 myconf="${myconf} --enable-shared --enable-static"
242 fi
243
244 if mysql_version_is_at_least "4.01.00.00" && ! useq "latin1" ; then
245 myconf="${myconf} --with-charset=utf8"
246 myconf="${myconf} --with-collation=utf8_general_ci"
247 else
248 myconf="${myconf} --with-charset=latin1"
249 myconf="${myconf} --with-collation=latin1_swedish_ci"
250 fi
164} 251}
165 252
166configure_common() { 253configure_common() {
167 myconf="${myconf} $(use_with big-tables)" 254 myconf="${myconf} $(use_with big-tables)"
168 myconf="${myconf} --enable-local-infile" 255 myconf="${myconf} --enable-local-infile"
169 myconf="${myconf} --with-extra-charsets=all" 256 myconf="${myconf} --with-extra-charsets=all"
170 myconf="${myconf} --with-mysqld-user=mysql" 257 myconf="${myconf} --with-mysqld-user=mysql"
171 myconf="${myconf} --with-server" 258 myconf="${myconf} --with-server"
172 myconf="${myconf} --with-unix-socket-path='/var/run/mysqld/mysqld.sock'" 259 myconf="${myconf} --with-unix-socket-path=/var/run/mysqld/mysqld.sock"
173 myconf="${myconf} --without-libwrap" 260 myconf="${myconf} --without-libwrap"
174 261
175 if useq "static" ; then 262 if useq "static" ; then
176 myconf="${myconf} --with-mysqld-ldflags=-all-static" 263 myconf="${myconf} --with-mysqld-ldflags=-all-static"
177 myconf="${myconf} --with-client-ldflags=-all-static" 264 myconf="${myconf} --with-client-ldflags=-all-static"
… …
182 269
183 if useq "debug" ; then 270 if useq "debug" ; then
184 myconf="${myconf} --with-debug=full" 271 myconf="${myconf} --with-debug=full"
185 else 272 else
186 myconf="${myconf} --without-debug" 273 myconf="${myconf} --without-debug"
187 mysql_version_is_at_least "4.01.03.00" \ 274 mysql_version_is_at_least "4.1.3" \
188 && useq "cluster" \ 275 && useq "cluster" \
189 && myconf="${myconf} --without-ndb-debug" 276 && myconf="${myconf} --without-ndb-debug"
190 fi 277 fi
191 278
192 if mysql_version_is_at_least "4.01.00.00" && ! useq "latin1" ; then 279 if mysql_version_is_at_least "4.1" && ! useq "latin1" ; then
193 myconf="${myconf} --with-charset=utf8" 280 myconf="${myconf} --with-charset=utf8"
194 myconf="${myconf} --with-collation=utf8_general_ci" 281 myconf="${myconf} --with-collation=utf8_general_ci"
195 else 282 else
196 myconf="${myconf} --with-charset=latin1" 283 myconf="${myconf} --with-charset=latin1"
197 myconf="${myconf} --with-collation=latin1_swedish_ci" 284 myconf="${myconf} --with-collation=latin1_swedish_ci"
… …
211 myconf="${myconf} $(use_with perl bench)" 298 myconf="${myconf} $(use_with perl bench)"
212 myconf="${myconf} --enable-assembler" 299 myconf="${myconf} --enable-assembler"
213 myconf="${myconf} --with-extra-tools" 300 myconf="${myconf} --with-extra-tools"
214 myconf="${myconf} --with-innodb" 301 myconf="${myconf} --with-innodb"
215 myconf="${myconf} --without-readline" 302 myconf="${myconf} --without-readline"
216 mysql_version_is_at_least "5.00.00.00" || myconf="${myconf} $(use_with raid)" 303 mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)"
217 304
218 if useq "ssl" ; then 305 if useq "ssl" ; then
219 # --with-vio is not needed anymore, it's on by default and 306 # --with-vio is not needed anymore, it's on by default and
220 # has been removed from configure 307 # has been removed from configure
221 mysql_version_is_at_least "5.00.04.00" || myconf="${myconf} --with-vio" 308 mysql_version_is_at_least "5.0.4" || myconf="${myconf} --with-vio"
222 if mysql_version_is_at_least "5.00.06.00" ; then 309 if mysql_version_is_at_least "5.0.6" ; then
223 # myconf="${myconf} --with-yassl" 310 # myconf="${myconf} --with-yassl"
224 myconf="${myconf} --with-openssl" 311 myconf="${myconf} --with-openssl"
225 else 312 else
226 myconf="${myconf} --with-openssl" 313 myconf="${myconf} --with-openssl"
227 fi 314 fi
… …
241 else 328 else
242 myconf="${myconf} --without-berkeley-db" 329 myconf="${myconf} --without-berkeley-db"
243 fi 330 fi
244 fi 331 fi
245 332
246 if mysql_version_is_at_least "4.01.03.00" ; then 333 if mysql_version_is_at_least "4.1.3" ; then
247 myconf="${myconf} --with-geometry" 334 myconf="${myconf} --with-geometry"
248 myconf="${myconf} $(use_with cluster ndbcluster)" 335 myconf="${myconf} $(use_with cluster ndbcluster)"
249 fi 336 fi
250 337
251 if mysql_version_is_at_least "4.01.03.00" && useq "extraengine" ; then 338 if mysql_version_is_at_least "4.1.3" && useq "extraengine" ; then
252 # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html 339 # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
253 myconf="${myconf} --with-archive-storage-engine" 340 myconf="${myconf} --with-archive-storage-engine"
254 341
255 # http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html 342 # http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html
256 myconf="${myconf} --with-csv-storage-engine" 343 myconf="${myconf} --with-csv-storage-engine"
… …
259 myconf="${myconf} --with-blackhole-storage-engine" 346 myconf="${myconf} --with-blackhole-storage-engine"
260 347
261 # http://dev.mysql.com/doc/mysql/en/federated-storage-engine.html 348 # http://dev.mysql.com/doc/mysql/en/federated-storage-engine.html
262 # http://dev.mysql.com/doc/mysql/en/federated-description.html 349 # http://dev.mysql.com/doc/mysql/en/federated-description.html
263 # http://dev.mysql.com/doc/mysql/en/federated-limitations.html 350 # http://dev.mysql.com/doc/mysql/en/federated-limitations.html
264 if mysql_version_is_at_least "5.00.03.00" ; then 351 if mysql_version_is_at_least "5.0.3" ; then
265 elog "Before using the Federated storage engine, please be sure to read" 352 elog "Before using the Federated storage engine, please be sure to read"
266 elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html" 353 elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
267 myconf="${myconf} --with-federated-storage-engine" 354 myconf="${myconf} --with-federated-storage-engine"
268 fi 355 fi
269 fi 356 fi
270 357
271 mysql_version_is_at_least "5.00.18.00" \ 358 mysql_version_is_at_least "5.0.18" \
272 && useq "max-idx-128" \ 359 && useq "max-idx-128" \
273 && myconf="${myconf} --with-max-indexes=128" 360 && myconf="${myconf} --with-max-indexes=128"
274} 361}
275 362
276configure_51() { 363configure_51() {
… …
308 fi 395 fi
309 396
310 myconf="${myconf} --with-plugins=${plugins}" 397 myconf="${myconf} --with-plugins=${plugins}"
311} 398}
312 399
400pbxt_src_compile() {
401 mysql_init_vars
402
403 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
404
405 einfo "Reconfiguring dir '${PWD}'"
406 AT_GNUCONF_UPDATE="yes" eautoreconf
407
408 local myconf
409 myconf="${myconf} --with-mysql=${S}"
410 mkdir -p ${T}/lib
411 myconf="${myconf} --libdir=${D}/${MY_LIBDIR}"
412 useq "debug" && myconf="${myconf} --with-debug=full"
413 # TODO is safe/needed to use econf here ?
414 ./configure ${myconf} || die "problem configuring pbxt storage engine"
415 # TODO is safe/needed to use emake here ?
416 make || die "problem making pbxt storage engine (${myconf})"
417
418 popd
419 # TODO: modify test suite
420}
421
422pbxt_src_install() {
423 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
424 make install || die "failed pbxt install"
425 popd
426}
427
313# 428#
314# EBUILD FUNCTIONS 429# EBUILD FUNCTIONS
315# 430#
316 431
317mysql_pkg_setup() { 432mysql_pkg_setup() {
318 enewgroup mysql 60 || die "problem adding 'mysql' group" 433 enewgroup mysql 60 || die "problem adding 'mysql' group"
319 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" 434 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
320 435
321 if mysql_version_is_at_least "5.01.12.00" && useq "innodb" ; then
322 eerror "InnoDB now uses cmake to build, this is a TODO item, will be fixed shortly!"
323 die "InnoDB now uses cmake to build, this is a TODO item, will be fixed shortly!"
324 fi
325
326 # Check for USE flag problems in pkg_setup 436 # Check for USE flag problems in pkg_setup
327 if useq "static" && useq "ssl" ; then 437 if useq "static" && useq "ssl" ; then
328 eerror "MySQL does not support being built statically with SSL support enabled!" 438 eerror "MySQL does not support being built statically with SSL support enabled!"
329 die "MySQL does not support being built statically with SSL support enabled!" 439 die "MySQL does not support being built statically with SSL support enabled!"
330 fi 440 fi
331 441
332 if ! mysql_version_is_at_least "5.00.00.00" \ 442 if ! mysql_version_is_at_least "5.0" \
333 && useq "raid" \ 443 && useq "raid" \
334 && useq "static" ; then 444 && useq "static" ; then
335 eerror "USE flags 'raid' and 'static' conflict, you cannot build MySQL statically" 445 eerror "USE flags 'raid' and 'static' conflict, you cannot build MySQL statically"
336 eerror "with RAID support enabled." 446 eerror "with RAID support enabled."
337 die "USE flags 'raid' and 'static' conflict!" 447 die "USE flags 'raid' and 'static' conflict!"
338 fi 448 fi
339 449
340 if mysql_version_is_at_least "4.01.03.00" \ 450 if mysql_version_is_at_least "4.1.3" \
341 && ( useq "cluster" || useq "extraengine" ) \ 451 && ( useq "cluster" || useq "extraengine" ) \
342 && useq "minimal" ; then 452 && useq "minimal" ; then
343 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 453 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
344 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 454 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
345 fi 455 fi
346 456
347 mysql_check_version_range "4.00.00.00 to 5.00.99.99" \ 457 mysql_check_version_range "4.0 to 5.0.99.99" \
348 && useq "berkdb" \ 458 && useq "berkdb" \
349 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 459 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
350} 460}
351 461
352mysql_src_unpack() { 462mysql_src_unpack() {
… …
386 -exec rm -f {} \; 496 -exec rm -f {} \;
387 rm -f "ltmain.sh" 497 rm -f "ltmain.sh"
388 rm -f "scripts/mysqlbug" 498 rm -f "scripts/mysqlbug"
389 fi 499 fi
390 500
391 local rebuilddirlist bdbdir d 501 local rebuilddirlist d
392 502
393 if mysql_version_is_at_least "5.01.12.00" ; then 503 if mysql_version_is_at_least "5.1.12" ; then
394 # TODO: innodb is using cmake now?
395 rebuilddirlist="." 504 rebuilddirlist="."
396 bdbdir='' 505 # TODO IMPO! Check this with a cmake expert
506 useq "innodb" \
507 && cmake \
508 -DCMAKE_C_COMPILER=$(which $(tc-getCC)) \
509 -DCMAKE_CXX_COMPILER=$(which $(tc-getCC)) \
510 "storage/innobase"
397 else 511 else
398 rebuilddirlist=". innobase" 512 rebuilddirlist=". innobase"
399 bdbdir='bdb/dist'
400 fi 513 fi
401 514
402 for d in ${rebuilddirlist} ; do 515 for d in ${rebuilddirlist} ; do
403 einfo "Reconfiguring dir '${d}'" 516 einfo "Reconfiguring dir '${d}'"
404 pushd "${d}" &>/dev/null 517 pushd "${d}" &>/dev/null
405 AT_GNUCONF_UPDATE="yes" eautoreconf 518 AT_GNUCONF_UPDATE="yes" eautoreconf
406 popd &>/dev/null 519 popd &>/dev/null
407 done 520 done
408 521
409 if mysql_check_version_range "4.01.00.00 to 5.00.99.99" \ 522 if mysql_check_version_range "4.1 to 5.0.99.99" \
410 && useq "berkdb" ; then 523 && useq "berkdb" ; then
411 [[ -w "${bdbdir}/ltmain.sh" ]] && cp -f "ltmain.sh" "${bdbdir}/ltmain.sh" 524 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
412 pushd "${bdbdir}" \ 525 pushd "bdb/dist" \
413 && sh s_all \ 526 && sh s_all \
414 || die "Failed bdb reconfigure" \ 527 || die "Failed bdb reconfigure" \
415 &>/dev/null 528 &>/dev/null
416 popd &>/dev/null 529 popd &>/dev/null
417 fi 530 fi
… …
426 539
427 if useq "minimal" ; then 540 if useq "minimal" ; then
428 configure_minimal 541 configure_minimal
429 else 542 else
430 configure_common 543 configure_common
431 if mysql_version_is_at_least "5.01.10.00" ; then 544 if mysql_version_is_at_least "5.1.10" ; then
432 configure_51 545 configure_51
433 else 546 else
434 configure_40_41_50 547 configure_40_41_50
435 fi 548 fi
436 fi 549 fi
… …
439 filter-flags "-O" "-O[01]" 552 filter-flags "-O" "-O[01]"
440 553
441 # glib-2.3.2_pre fix, bug #16496 554 # glib-2.3.2_pre fix, bug #16496
442 append-flags "-DHAVE_ERRNO_AS_DEFINE=1" 555 append-flags "-DHAVE_ERRNO_AS_DEFINE=1"
443 556
444 append-flags "-fno-exceptions -fno-strict-aliasing" 557 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing"
445 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti" 558 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
446 mysql_version_is_at_least "5.00.00.00" \ 559 mysql_version_is_at_least "5.0" \
447 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" 560 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
448 export CXXFLAGS 561 export CXXFLAGS
449 562
450 econf \ 563 econf \
451 --libexecdir="/usr/sbin" \ 564 --libexecdir="/usr/sbin" \
… …
498 rm -f "${D}/usr/sbin/mysqld" 611 rm -f "${D}/usr/sbin/mysqld"
499 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a 612 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
500 fi 613 fi
501 614
502 # Configuration stuff 615 # Configuration stuff
503 if mysql_version_is_at_least "4.01.00.00" ; then 616 if mysql_version_is_at_least "4.1" ; then
504 mysql_mycnf_version="4.1" 617 mysql_mycnf_version="4.1"
505 else 618 else
506 mysql_mycnf_version="4.0" 619 mysql_mycnf_version="4.0"
507 fi 620 fi
508 insinto "${MY_SYSCONFDIR}" 621 insinto "${MY_SYSCONFDIR}"
509 doins "scripts/mysqlaccess.conf" 622 doins "scripts/mysqlaccess.conf"
510 sed -e "s!@DATADIR@!${DATADIR}!g" \ 623 sed -e "s!@DATADIR@!${DATADIR}!g" \
511 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \ 624 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \
512 > "${TMPDIR}/my.cnf.ok" 625 > "${TMPDIR}/my.cnf.ok"
513 if mysql_version_is_at_least "4.01.00.00" && useq "latin1" ; then 626 if mysql_version_is_at_least "4.1" && useq "latin1" ; then
514 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok" 627 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok"
515 fi 628 fi
516 newins "${TMPDIR}/my.cnf.ok" my.cnf 629 newins "${TMPDIR}/my.cnf.ok" my.cnf
517 630
518 insinto "/etc/conf.d" 631 insinto "/etc/conf.d"
… …
595 elog "if this is a new install." 708 elog "if this is a new install."
596 einfo 709 einfo
597 mysql_version_is_at_least "5.01.00.00" \ 710 mysql_version_is_at_least "5.01.00.00" \
598 || elog "InnoDB is *not* optional as of MySQL-4.0.24, at the request of upstream." 711 || elog "InnoDB is *not* optional as of MySQL-4.0.24, at the request of upstream."
599 fi 712 fi
600 mysql_check_version_range "4.00.00.00 to 5.00.99.99" \ 713 mysql_check_version_range "4.0 to 5.0.99.99" \
601 && useq "berkdb" \ 714 && useq "berkdb" \
602 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 715 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
603} 716}
604 717
605mysql_pkg_config() { 718mysql_pkg_config() {
606 # Make sure the vars are correctly initialized 719 # Make sure the vars are correctly initialized
607 mysql_init_vars 720 mysql_init_vars
608 721
609 [[ -z "${DATADIR}" ]] && die "Sorry, unable to find DATADIR" 722 [[ -z "${DATADIR}" ]] && die "Sorry, unable to find DATADIR"
610 723
611 if built_with_use dev-db/mysql minimal ; then 724 if built_with_use ${CATEGORY}/${PN} minimal ; then
612 die "Minimal builds do NOT include the MySQL server" 725 die "Minimal builds do NOT include the MySQL server"
613 fi 726 fi
614 727
615 local pwd1="a" 728 local pwd1="a"
616 local pwd2="b" 729 local pwd2="b"
… …
652 [[ -f "${ROOT}/${DATADIR}/mysql/user.frm" ]] \ 765 [[ -f "${ROOT}/${DATADIR}/mysql/user.frm" ]] \
653 || die "MySQL databases not installed" 766 || die "MySQL databases not installed"
654 chown -R mysql:mysql "${ROOT}/${DATADIR}" 2> /dev/null 767 chown -R mysql:mysql "${ROOT}/${DATADIR}" 2> /dev/null
655 chmod 0750 "${ROOT}/${DATADIR}" 2> /dev/null 768 chmod 0750 "${ROOT}/${DATADIR}" 2> /dev/null
656 769
657 if mysql_version_is_at_least "4.01.03.00" ; then 770 if mysql_version_is_at_least "4.1.3" ; then
658 options="--skip-ndbcluster" 771 options="--skip-ndbcluster"
659 772
660 # Filling timezones, see 773 # Filling timezones, see
661 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html 774 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
662 "${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null 775 "${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
… …
711 wait %1 824 wait %1
712 einfo "Done" 825 einfo "Done"
713} 826}
714 827
715mysql_pkg_postrm() { 828mysql_pkg_postrm() {
716 mysql_lib_symlinks 829 : #mysql_lib_symlinks
717} 830}
Legend:
Removed from v.1.42  
changed lines
  Added in v.1.51
  ViewVC Help
Powered by ViewVC 1.1.13