diff options
author | William Thomson <wltjr@gentoo.org> | 2007-05-14 02:56:10 +0000 |
---|---|---|
committer | William Thomson <wltjr@gentoo.org> | 2007-05-14 02:56:10 +0000 |
commit | 39a9929260d1b4299939be94f2ceecf044d5b9b9 (patch) | |
tree | a8d52a679677cbc412c3edc69cd78c585e634ff8 /dev-db | |
parent | Fix whitespace in install.sh patch. Remove deprecated patch. (diff) | |
download | gentoo-2-39a9929260d1b4299939be94f2ceecf044d5b9b9.tar.gz gentoo-2-39a9929260d1b4299939be94f2ceecf044d5b9b9.tar.bz2 gentoo-2-39a9929260d1b4299939be94f2ceecf044d5b9b9.zip |
Switch to using $(get_libdir) in symlinks, should resolve bug #177916. Added backwards compat symlinks for 2.0.1.
(Portage version: 2.1.2.7)
Diffstat (limited to 'dev-db')
-rw-r--r-- | dev-db/firebird/files/digest-firebird-1.5.4-r2 (renamed from dev-db/firebird/files/digest-firebird-1.5.4-r1) | 0 | ||||
-rw-r--r-- | dev-db/firebird/files/digest-firebird-2.0.1.12855.0-r2 (renamed from dev-db/firebird/files/digest-firebird-2.0.1.12855.0-r1) | 0 | ||||
-rw-r--r-- | dev-db/firebird/firebird-1.5.4-r2.ebuild (renamed from dev-db/firebird/firebird-1.5.4-r1.ebuild) | 24 | ||||
-rw-r--r-- | dev-db/firebird/firebird-2.0.1.12855.0-r2.ebuild (renamed from dev-db/firebird/firebird-2.0.1.12855.0-r1.ebuild) | 28 |
4 files changed, 34 insertions, 18 deletions
diff --git a/dev-db/firebird/files/digest-firebird-1.5.4-r1 b/dev-db/firebird/files/digest-firebird-1.5.4-r2 index b3e31cc48311..b3e31cc48311 100644 --- a/dev-db/firebird/files/digest-firebird-1.5.4-r1 +++ b/dev-db/firebird/files/digest-firebird-1.5.4-r2 diff --git a/dev-db/firebird/files/digest-firebird-2.0.1.12855.0-r1 b/dev-db/firebird/files/digest-firebird-2.0.1.12855.0-r2 index 04a90efef089..04a90efef089 100644 --- a/dev-db/firebird/files/digest-firebird-2.0.1.12855.0-r1 +++ b/dev-db/firebird/files/digest-firebird-2.0.1.12855.0-r2 diff --git a/dev-db/firebird/firebird-1.5.4-r1.ebuild b/dev-db/firebird/firebird-1.5.4-r2.ebuild index c444e56471c1..6a2590adcfbc 100644 --- a/dev-db/firebird/firebird-1.5.4-r1.ebuild +++ b/dev-db/firebird/firebird-1.5.4-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.5.4-r1.ebuild,v 1.1 2007/05/12 05:52:12 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.5.4-r2.ebuild,v 1.1 2007/05/14 02:56:09 wltjr Exp $ inherit flag-o-matic eutils @@ -123,19 +123,21 @@ src_install() { for i in include lib UDF intl; do chmod a=r ${D}/opt/firebird/${i}/*; done chmod ug=rx,o= ${D}/opt/firebird/{intl/fbintl,UDF/fbudf.so,UDF/ib_udf.so} + local my_lib=$(get_libdir) + # create links for back compatibility - dosym ../../opt/firebird/lib/libfbclient.so /usr/lib/libgds.so - dosym ../../opt/firebird/lib/libfbclient.so /usr/lib/libgds.so.0 - dosym ./libfbclient.so /opt/firebird/lib/libgds.so - dosym ./libfbclient.so /opt/firebird/lib/libgds.so.0 + dosym ../../opt/firebird/${my_lib}/libfbclient.so /usr/${my_lib}/libgds.so + dosym ../../opt/firebird/${my_lib}/libfbclient.so /usr/${my_lib}/libgds.so.0 + dosym ./libfbclient.so /opt/firebird/${my_lib}/libgds.so + dosym ./libfbclient.so /opt/firebird/${my_lib}/libgds.so.0 # we want relative symlinks... - rm /usr/lib/libfbclient.so - rm /usr/lib/libfbclient.so.1 - rm /usr/lib/libfbclient.so.1.5.4 - dosym ../../opt/firebird/lib/libfbclient.so /usr/lib/libfbclient.so - dosym ../../opt/firebird/lib/libfbclient.so.1 /usr/lib/libfbclient.so.1 - dosym ../../opt/firebird/lib/libfbclient.so.1.5.4 /usr/lib/libfbclient.so.1.5.4 + rm /usr/${my_lib}/libfbclient.so + rm /usr/${my_lib}/libfbclient.so.1 + rm /usr/${my_lib}/libfbclient.so.1.5.4 + dosym ../../opt/firebird/${my_lib}/libfbclient.so /usr/${my_lib}/libfbclient.so + dosym ../../opt/firebird/${my_lib}/libfbclient.so.1 /usr/${my_lib}/libfbclient.so.1 + dosym ../../opt/firebird/${my_lib}/libfbclient.so.1.5.4 /usr/${my_lib}/libfbclient.so.1.5.4 # move and link config files to /etc/firebird so they'll be protected dodir /etc/firebird diff --git a/dev-db/firebird/firebird-2.0.1.12855.0-r1.ebuild b/dev-db/firebird/firebird-2.0.1.12855.0-r2.ebuild index 5775a50fcb4e..8912b3c9adfa 100644 --- a/dev-db/firebird/firebird-2.0.1.12855.0-r1.ebuild +++ b/dev-db/firebird/firebird-2.0.1.12855.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.0.1.12855.0-r1.ebuild,v 1.1 2007/05/12 05:52:12 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.0.1.12855.0-r2.ebuild,v 1.1 2007/05/14 02:56:09 wltjr Exp $ inherit flag-o-matic eutils autotools versionator @@ -111,18 +111,32 @@ src_install() { touch "${D}"/var/log/firebird/firebird.log chown firebird:firebird "${D}"/var/log/firebird/firebird.log - if [ ${ARCH} == "amd64" ] ; then - cd "${D}/opt/firebird/" - ln -s lib64 lib - cd "${S}/gen/firebird" - fi - # create links for split config & log file dosym /etc/firebird/aliases.conf /opt/firebird/aliases.conf dosym /etc/firebird/security2.fdb /opt/firebird/security2.fdb dosym /etc/firebird/firebird.conf /opt/firebird/firebird.conf dosym /var/log/firebird/firebird.log /opt/firebird/firebird.log + local my_lib=$(get_libdir) + + # firebird has a problem with lib64 dir name, bug? + if [ ${my_lib} == "lib64" ] ; then + dosym ./lib64 /opt/firebird/lib + fi + + # create links for backwards compatibility dosym puts link in / :( + cd "${D}/opt/firebird/${my_lib}/" + ln -s libfbclient.so libgds.so + ln -s libfbclient.so libgds.so.0 + ln -s libfbclient.so libfbclient.so.1 + + # create system links for ld + dosym ../../opt/firebird/${my_lib}/libfbclient.so /usr/${my_lib}/libgds.so + dosym ../../opt/firebird/${my_lib}/libfbclient.so /usr/${my_lib}/libgds.so.0 + dosym ../../opt/firebird/${my_lib}/libfbclient.so /usr/${my_lib}/libfbclient.so + dosym ../../opt/firebird/${my_lib}/libfbclient.so.1 /usr/${my_lib}/libfbclient.so.1 + dosym ../../opt/firebird/${my_lib}/libfbclient.so.2 /usr/${my_lib}/libfbclient.so.2 + if use xinetd ; then insinto /etc/xinetd.d newins "${S}/gen/install/misc/${PN}.xinetd" "${PN}" || die "newins xinetd file failed" |