|
Lines 108-114
Link Here
|
| 108 |
myconf="${myconf} --with-extra-charsets=all" |
108 |
myconf="${myconf} --with-extra-charsets=all" |
| 109 |
myconf="${myconf} --with-mysqld-user=mysql" |
109 |
myconf="${myconf} --with-mysqld-user=mysql" |
| 110 |
myconf="${myconf} --with-server" |
110 |
myconf="${myconf} --with-server" |
| 111 |
myconf="${myconf} --with-unix-socket-path=/var/run/mysqld/mysqld.sock" |
111 |
myconf="${myconf} --with-unix-socket-path=${EPREFIX}/var/run/mysqld/mysqld.sock" |
| 112 |
myconf="${myconf} --without-libwrap" |
112 |
myconf="${myconf} --without-libwrap" |
| 113 |
|
113 |
|
| 114 |
if use static ; then |
114 |
if use static ; then |
|
Lines 160-172
Link Here
|
| 160 |
# TODO: !!!! readd --without-readline |
160 |
# TODO: !!!! readd --without-readline |
| 161 |
# the failure depend upon config/ac-macros/readline.m4 checking into |
161 |
# the failure depend upon config/ac-macros/readline.m4 checking into |
| 162 |
# readline.h instead of history.h |
162 |
# readline.h instead of history.h |
| 163 |
myconf="${myconf} $(use_with ssl ssl /usr)" |
163 |
myconf="${myconf} $(use_with ssl ssl "${EPREFIX}"/usr)" |
| 164 |
myconf="${myconf} --enable-assembler" |
164 |
myconf="${myconf} --enable-assembler" |
| 165 |
myconf="${myconf} --with-geometry" |
165 |
myconf="${myconf} --with-geometry" |
| 166 |
myconf="${myconf} --with-readline" |
166 |
myconf="${myconf} --with-readline" |
| 167 |
myconf="${myconf} --with-zlib-dir=/usr/" |
167 |
myconf="${myconf} --with-zlib-dir=${EPREFIX}/usr/" |
| 168 |
myconf="${myconf} --without-pstack" |
168 |
myconf="${myconf} --without-pstack" |
| 169 |
myconf="${myconf} --with-plugindir=/usr/$(get_libdir)/mysql/plugin" |
169 |
myconf="${myconf} --with-plugindir=${EPREFIX}/usr/$(get_libdir)/mysql/plugin" |
| 170 |
|
170 |
|
| 171 |
# This is an explict die here, because if we just forcibly disable it, then the |
171 |
# This is an explict die here, because if we just forcibly disable it, then the |
| 172 |
# user's data is not accessible. |
172 |
# user's data is not accessible. |
|
Lines 320-326
Link Here
|
| 320 |
eautoreconf |
320 |
eautoreconf |
| 321 |
|
321 |
|
| 322 |
local myconf="" |
322 |
local myconf="" |
| 323 |
myconf="${myconf} --with-mysql=${S} --libdir=/usr/$(get_libdir)" |
323 |
myconf="${myconf} --with-mysql=${S} --libdir=${EPREFIX}/usr/$(get_libdir)" |
| 324 |
use debug && myconf="${myconf} --with-debug=full" |
324 |
use debug && myconf="${myconf} --with-debug=full" |
| 325 |
econf ${myconf} || die "Problem configuring PBXT storage engine" |
325 |
econf ${myconf} || die "Problem configuring PBXT storage engine" |
| 326 |
} |
326 |
} |
|
Lines 376-382
Link Here
|
| 376 |
|
376 |
|
| 377 |
# Make charsets install in the right place |
377 |
# Make charsets install in the right place |
| 378 |
find . -name 'Makefile.am' \ |
378 |
find . -name 'Makefile.am' \ |
| 379 |
-exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \; |
379 |
-exec sed --in-place -e 's!$(pkgdatadir)!'"${EPREFIX}"${MY_SHAREDSTATEDIR}'!g' {} \; |
| 380 |
|
380 |
|
| 381 |
# Remove what needs to be recreated, so we're sure it's actually done |
381 |
# Remove what needs to be recreated, so we're sure it's actually done |
| 382 |
einfo "Cleaning up old buildscript files" |
382 |
einfo "Cleaning up old buildscript files" |
|
Lines 477-488
Link Here
|
| 477 |
filter-flags -fomit-frame-pointer |
477 |
filter-flags -fomit-frame-pointer |
| 478 |
|
478 |
|
| 479 |
econf \ |
479 |
econf \ |
| 480 |
--libexecdir="/usr/sbin" \ |
480 |
--libexecdir="${EPREFIX}/usr/sbin" \ |
| 481 |
--sysconfdir="${MY_SYSCONFDIR}" \ |
481 |
--sysconfdir="${EPREFIX}${MY_SYSCONFDIR}" \ |
| 482 |
--localstatedir="${MY_LOCALSTATEDIR}" \ |
482 |
--localstatedir="${EPREFIX}${MY_LOCALSTATEDIR}" \ |
| 483 |
--sharedstatedir="${MY_SHAREDSTATEDIR}" \ |
483 |
--sharedstatedir="${EPREFIX}${MY_SHAREDSTATEDIR}" \ |
| 484 |
--libdir="${MY_LIBDIR}" \ |
484 |
--libdir="${EPREFIX}${MY_LIBDIR}" \ |
| 485 |
--includedir="${MY_INCLUDEDIR}" \ |
485 |
--includedir="${EPREFIX}${MY_INCLUDEDIR}" \ |
| 486 |
--with-low-memory \ |
486 |
--with-low-memory \ |
| 487 |
--with-client-ldflags=-lstdc++ \ |
487 |
--with-client-ldflags=-lstdc++ \ |
| 488 |
--enable-thread-safe-client \ |
488 |
--enable-thread-safe-client \ |
|
Lines 523-530
Link Here
|
| 523 |
|
523 |
|
| 524 |
emake install \ |
524 |
emake install \ |
| 525 |
DESTDIR="${D}" \ |
525 |
DESTDIR="${D}" \ |
| 526 |
benchdir_root="${MY_SHAREDSTATEDIR}" \ |
526 |
benchdir_root="${EPREFIX}${MY_SHAREDSTATEDIR}" \ |
| 527 |
testroot="${MY_SHAREDSTATEDIR}" \ |
527 |
testroot="${EPREFIX}${MY_SHAREDSTATEDIR}" \ |
| 528 |
|| die "emake install failed" |
528 |
|| die "emake install failed" |
| 529 |
|
529 |
|
| 530 |
if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then |
530 |
if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then |
|
Lines 570-576
Link Here
|
| 570 |
insinto "${MY_SYSCONFDIR}" |
570 |
insinto "${MY_SYSCONFDIR}" |
| 571 |
doins scripts/mysqlaccess.conf |
571 |
doins scripts/mysqlaccess.conf |
| 572 |
mycnf_src="my.cnf-${mysql_mycnf_version}" |
572 |
mycnf_src="my.cnf-${mysql_mycnf_version}" |
| 573 |
sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ |
573 |
sed -e "s!@DATADIR@!${EPREFIX}${MY_DATADIR}!g" \ |
|
|
574 |
-e "s!/tmp!${EPREFIX}/tmp!" \ |
| 575 |
-e "s!/usr!${EPREFIX}/usr!" \ |
| 576 |
-e "s!= /var!= ${EPREFIX}/var!" \ |
| 574 |
"${FILESDIR}/${mycnf_src}" \ |
577 |
"${FILESDIR}/${mycnf_src}" \ |
| 575 |
> "${TMPDIR}/my.cnf.ok" |
578 |
> "${TMPDIR}/my.cnf.ok" |
| 576 |
if use latin1 ; then |
579 |
if use latin1 ; then |
