Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 215321 Details for
Bug 299796
Make postgresql compatible with multilib-native
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch for postgresql-{base,server}-8.4.2 for multilib-native compatibility
postgresql-multilib-compat.diff (text/plain), 4.95 KB, created by
Bernhard Frauendienst
on 2010-01-05 18:12:17 UTC
(
hide
)
Description:
patch for postgresql-{base,server}-8.4.2 for multilib-native compatibility
Filename:
MIME Type:
Creator:
Bernhard Frauendienst
Created:
2010-01-05 18:12:17 UTC
Size:
4.95 KB
patch
obsolete
>diff -Naur portage/dev-db/postgresql-base/postgresql-base-8.4.2.ebuild portage.multilib/dev-db/postgresql-base/postgresql-base-8.4.2.ebuild >--- portage/dev-db/postgresql-base/postgresql-base-8.4.2.ebuild 2010-01-05 18:56:39.914040755 +0100 >+++ portage.multilib/dev-db/postgresql-base/postgresql-base-8.4.2.ebuild 2010-01-05 18:58:13.580790268 +0100 >@@ -68,6 +68,7 @@ > > src_compile() { > econf --prefix=/usr/$(get_libdir)/postgresql-${SLOT} \ >+ --bindir=/usr/libexec/postgresql-${SLOT} \ > --datadir=/usr/share/postgresql-${SLOT} \ > --docdir=/usr/share/doc/postgresql-${SLOT} \ > --sysconfdir=/etc/postgresql-${SLOT} \ >@@ -119,7 +120,7 @@ > postgres_ebuilds="\${postgres_ebuilds} ${PF}" > postgres_prefix=/usr/$(get_libdir)/postgresql-${SLOT} > postgres_datadir=/usr/share/postgresql-${SLOT} >-postgres_bindir=/usr/$(get_libdir)/postgresql-${SLOT}/bin >+postgres_bindir=/usr/libexec/postgresql-${SLOT} > postgres_symlinks=( > ${IDIR} /usr/include/postgresql > ${IDIR}/libpq-fe.h /usr/include/libpq-fe.h >diff -Naur portage/dev-db/postgresql-server/files/postgresql.init-8.4 portage.multilib/dev-db/postgresql-server/files/postgresql.init-8.4 >--- portage/dev-db/postgresql-server/files/postgresql.init-8.4 2010-01-05 19:04:15.130790200 +0100 >+++ portage.multilib/dev-db/postgresql-server/files/postgresql.init-8.4 2010-01-05 19:05:48.840092849 +0100 >@@ -34,7 +34,7 @@ > local retval > > su -l ${PGUSER} \ >- -c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl start ${WAIT_FOR_START} -o '--silent-mode=true ${PGOPTS}'" >+ -c "env PGDATA=\"${PGDATA}\" /usr/libexec/postgresql-8.4/pg_ctl start ${WAIT_FOR_START} -o '--silent-mode=true ${PGOPTS}'" > retval=$? > [ $retval -ne 0 ] && eend $retval && return $retval > >@@ -59,7 +59,7 @@ > local retval > > su -l ${PGUSER} \ >- -c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl stop -t ${WAIT_FOR_DISCONNECT} -m smart" >+ -c "env PGDATA=\"${PGDATA}\" /usr/libexec/postgresql-8.4/pg_ctl stop -t ${WAIT_FOR_DISCONNECT} -m smart" > > retval=$? > [ $retval -eq 0 ] && eend $retval && return $retval >@@ -68,7 +68,7 @@ > ewarn "Going to shutdown the server anyway." > > su -l ${PGUSER} \ >- -c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl stop -m fast" >+ -c "env PGDATA=\"${PGDATA}\" /usr/libexec/postgresql-8.4/pg_ctl stop -m fast" > > retval=$? > [ $retval -eq 0 ] && eend $retval && return $retval >@@ -83,7 +83,7 @@ > ewarn "Forcing it to shutdown which leads to a recover-run on next startup." > > su -l ${PGUSER} \ >- -c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl stop -m immediate" >+ -c "env PGDATA=\"${PGDATA}\" /usr/libexec/postgresql-8.4/pg_ctl stop -m immediate" > > retval=$? > [ $retval -eq 0 ] && eend $retval && return $retval >@@ -95,6 +95,6 @@ > reload() { > ebegin "Reloading PostgreSQL configuration" > su -l ${PGUSER} \ >- -c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl reload" >+ -c "env PGDATA=\"${PGDATA}\" /usr/libexec/postgresql-8.4/pg_ctl reload" > eend $? > } >diff -Naur portage/dev-db/postgresql-server/postgresql-server-8.4.2.ebuild portage.multilib/dev-db/postgresql-server/postgresql-server-8.4.2.ebuild >--- portage/dev-db/postgresql-server/postgresql-server-8.4.2.ebuild 2010-01-05 18:56:50.071800424 +0100 >+++ portage.multilib/dev-db/postgresql-server/postgresql-server-8.4.2.ebuild 2010-01-05 18:57:17.644790239 +0100 >@@ -71,7 +71,7 @@ > # use ppc && CFLAGS="-pipe -fsigned-char" > > # eval is needed to get along with pg_config quotation of space-rich entities. >- eval econf "$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \ >+ eval econf "$(/usr/libexec/postgresql-${SLOT}/pg_config --configure)" \ > --disable-thread-safety \ > $(use_with perl) \ > $(use_with python) \ >@@ -86,7 +86,7 @@ > || die "configure failed" > > for bd in . contrib $(use xml && echo contrib/xml2); do >- PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \ >+ PATH="/usr/libexec/postgresql-${SLOT}:${PATH}" \ > emake -C $bd -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "emake in $bd failed" > done > } >@@ -99,7 +99,7 @@ > fi > > for bd in . contrib $(use xml && echo contrib/xml2) ; do >- PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \ >+ PATH="/usr/libexec/postgresql-${SLOT}:${PATH}" \ > emake install -C $bd -j1 DESTDIR="${D}" || die "emake install in $bd failed" > done > >@@ -220,7 +220,7 @@ > > einfo "Initializing the database ..." > >- su postgres -c "/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb --pgdata \"${PGDATA}\" ${PG_INITDB_OPTS}" >+ su postgres -c "/usr/libexec/postgresql-${SLOT}/initdb --pgdata \"${PGDATA}\" ${PG_INITDB_OPTS}" > > einfo > einfo "You can use the '${ROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL instead of 'pg_ctl'." >@@ -234,7 +234,7 @@ > > src_test() { > einfo ">>> Test phase [check]: ${CATEGORY}/${PF}" >- PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \ >+ PATH="/usr/libexec/postgresql-${SLOT}:${PATH}" \ > emake -j1 check || die "Make check failed. See above for details." > > einfo "Yes, there are other tests which could be run."
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 299796
:
215321