Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 290537 Details for
Bug 388125
dev-db/mysql-5.1.59 fails to emerge on prefixed systems due to new eclasses
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
eprefixified mysql-autotools.eclass
mysql-autotools.eclass.patch (text/plain), 3.30 KB, created by
nietonfir
on 2011-10-22 17:38:57 UTC
(
hide
)
Description:
eprefixified mysql-autotools.eclass
Filename:
MIME Type:
Creator:
nietonfir
Created:
2011-10-22 17:38:57 UTC
Size:
3.30 KB
patch
obsolete
>--- old/mysql-autotools.eclass 2011-10-22 19:21:56.000000000 +0200 >+++ new/mysql-autotools.eclass 2011-10-22 19:16:42.000000000 +0200 >@@ -108,7 +108,7 @@ > myconf="${myconf} --with-extra-charsets=all" > myconf="${myconf} --with-mysqld-user=mysql" > myconf="${myconf} --with-server" >- myconf="${myconf} --with-unix-socket-path=/var/run/mysqld/mysqld.sock" >+ myconf="${myconf} --with-unix-socket-path=${EPREFIX}/var/run/mysqld/mysqld.sock" > myconf="${myconf} --without-libwrap" > > if use static ; then >@@ -160,13 +160,13 @@ > # TODO: !!!! readd --without-readline > # the failure depend upon config/ac-macros/readline.m4 checking into > # readline.h instead of history.h >- myconf="${myconf} $(use_with ssl ssl /usr)" >+ myconf="${myconf} $(use_with ssl ssl "${EPREFIX}"/usr)" > myconf="${myconf} --enable-assembler" > myconf="${myconf} --with-geometry" > myconf="${myconf} --with-readline" >- myconf="${myconf} --with-zlib-dir=/usr/" >+ myconf="${myconf} --with-zlib-dir=${EPREFIX}/usr/" > myconf="${myconf} --without-pstack" >- myconf="${myconf} --with-plugindir=/usr/$(get_libdir)/mysql/plugin" >+ myconf="${myconf} --with-plugindir=${EPREFIX}/usr/$(get_libdir)/mysql/plugin" > > # This is an explict die here, because if we just forcibly disable it, then the > # user's data is not accessible. >@@ -320,7 +320,7 @@ > eautoreconf > > local myconf="" >- myconf="${myconf} --with-mysql=${S} --libdir=/usr/$(get_libdir)" >+ myconf="${myconf} --with-mysql=${S} --libdir=${EPREFIX}/usr/$(get_libdir)" > use debug && myconf="${myconf} --with-debug=full" > econf ${myconf} || die "Problem configuring PBXT storage engine" > } >@@ -376,7 +376,7 @@ > > # Make charsets install in the right place > find . -name 'Makefile.am' \ >- -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \; >+ -exec sed --in-place -e 's!$(pkgdatadir)!'"${EPREFIX}"${MY_SHAREDSTATEDIR}'!g' {} \; > > # Remove what needs to be recreated, so we're sure it's actually done > einfo "Cleaning up old buildscript files" >@@ -477,12 +477,12 @@ > filter-flags -fomit-frame-pointer > > econf \ >- --libexecdir="/usr/sbin" \ >- --sysconfdir="${MY_SYSCONFDIR}" \ >- --localstatedir="${MY_LOCALSTATEDIR}" \ >- --sharedstatedir="${MY_SHAREDSTATEDIR}" \ >- --libdir="${MY_LIBDIR}" \ >- --includedir="${MY_INCLUDEDIR}" \ >+ --libexecdir="${EPREFIX}/usr/sbin" \ >+ --sysconfdir="${EPREFIX}${MY_SYSCONFDIR}" \ >+ --localstatedir="${EPREFIX}${MY_LOCALSTATEDIR}" \ >+ --sharedstatedir="${EPREFIX}${MY_SHAREDSTATEDIR}" \ >+ --libdir="${EPREFIX}${MY_LIBDIR}" \ >+ --includedir="${EPREFIX}${MY_INCLUDEDIR}" \ > --with-low-memory \ > --with-client-ldflags=-lstdc++ \ > --enable-thread-safe-client \ >@@ -523,8 +523,8 @@ > > emake install \ > DESTDIR="${D}" \ >- benchdir_root="${MY_SHAREDSTATEDIR}" \ >- testroot="${MY_SHAREDSTATEDIR}" \ >+ benchdir_root="${EPREFIX}${MY_SHAREDSTATEDIR}" \ >+ testroot="${EPREFIX}${MY_SHAREDSTATEDIR}" \ > || die "emake install failed" > > if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then >@@ -570,7 +570,10 @@ > insinto "${MY_SYSCONFDIR}" > doins scripts/mysqlaccess.conf > mycnf_src="my.cnf-${mysql_mycnf_version}" >- sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ >+ sed -e "s!@DATADIR@!${EPREFIX}${MY_DATADIR}!g" \ >+ -e "s!/tmp!${EPREFIX}/tmp!" \ >+ -e "s!/usr!${EPREFIX}/usr!" \ >+ -e "s!= /var!= ${EPREFIX}/var!" \ > "${FILESDIR}/${mycnf_src}" \ > > "${TMPDIR}/my.cnf.ok" > if use latin1 ; then
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 388125
:
290535
|
290537
|
290539
|
291977
|
292037
|
296349