summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2005-09-05 10:08:08 +0000
committerMartin Schlemmer <azarah@gentoo.org>2005-09-05 10:08:08 +0000
commit18d528e1594a5eb6119d43a7f15b38f05a960d7b (patch)
treecd34c4e1dcc806e498037842249a16c727f004c9 /sys-apps/baselayout
parentStable on alpha (diff)
downloadgentoo-2-18d528e1594a5eb6119d43a7f15b38f05a960d7b.tar.gz
gentoo-2-18d528e1594a5eb6119d43a7f15b38f05a960d7b.tar.bz2
gentoo-2-18d528e1594a5eb6119d43a7f15b38f05a960d7b.zip
Fix /sbin/runscript for no-symlink profiles.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'sys-apps/baselayout')
-rw-r--r--sys-apps/baselayout/ChangeLog6
-rw-r--r--sys-apps/baselayout/baselayout-1.12.0_pre8-r2.ebuild8
2 files changed, 11 insertions, 3 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index ebb6ca08a934..806c42a68dc2 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,14 @@
# ChangeLog for sys-apps/baselayout
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.275 2005/09/04 19:38:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.276 2005/09/05 10:08:08 azarah Exp $
# See the gentoo-src rc-scripts ChangeLog for up-to-date release information:
# http://www.gentoo.org/cgi-bin/viewcvs.cgi/rc-scripts/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup
+ 05 Sep 2005; Martin Schlemmer <azarah@gentoo.org>
+ baselayout-1.12.0_pre8-r2.ebuild:
+ Fix /sbin/runscript for no-symlink profiles.
+
04 Sep 2005; Mike Frysinger <vapier@gentoo.org>
baselayout-1.11.13-r1.ebuild, baselayout-1.12.0_pre8-r2.ebuild:
Wrap symlink creation like we do with dir creation so readonly file systems
diff --git a/sys-apps/baselayout/baselayout-1.12.0_pre8-r2.ebuild b/sys-apps/baselayout/baselayout-1.12.0_pre8-r2.ebuild
index 9a868de53cdd..dcf3f9fb0116 100644
--- a/sys-apps/baselayout/baselayout-1.12.0_pre8-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.0_pre8-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre8-r2.ebuild,v 1.2 2005/09/04 19:38:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre8-r2.ebuild,v 1.3 2005/09/05 10:08:08 azarah Exp $
inherit flag-o-matic eutils toolchain-funcs multilib
@@ -57,13 +57,17 @@ src_unpack() {
}
src_compile() {
+ local libdir="lib"
+
use static && append-ldflags -static
+ [[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
+
make -C "${S}"/src \
CC="$(tc-getCC)" \
LD="$(tc-getCC) ${LDFLAGS}" \
CFLAGS="${CFLAGS}" \
- LIBDIR=$(get_libdir) || die
+ LIBDIR="${libdir}" || die
}
# ${PATH} should include where to get MAKEDEV when calling this