aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-03-16 13:46:42 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-03-16 13:46:42 +0000
commite7479d799865a5bc38656a4e10d43aa7f8f4c0be (patch)
tree81475f045a214f37a2cc8ca6217a9bc2917444b4
parentab660fd6d7eab0067a12b1c703af42031532d19f (diff)
downloadpaludis-e7479d799865a5bc38656a4e10d43aa7f8f4c0be.tar.gz
paludis-e7479d799865a5bc38656a4e10d43aa7f8f4c0be.tar.xz
Fix up library handling
-rwxr-xr-xebuild/ebuild.bash1
-rw-r--r--ebuild/utils/dolib7
2 files changed, 8 insertions, 0 deletions
diff --git a/ebuild/ebuild.bash b/ebuild/ebuild.bash
index b100ba5..04d3663 100755
--- a/ebuild/ebuild.bash
+++ b/ebuild/ebuild.bash
@@ -48,6 +48,7 @@ diefunc()
EBUILD_MODULES_DIR=$(readlink -f $(dirname $0 ) )
[[ -d ${EBUILD_MODULES_DIR} ]] || die "${EBUILD_MODULES_DIR} is not a directory"
+export PALUDIS_EBUILD_MODULES_DIR="${EBUILD_LOAD_EBUILD}"
ebuild_source_profile()
{
diff --git a/ebuild/utils/dolib b/ebuild/utils/dolib
index 4a1b06d..c35b202 100644
--- a/ebuild/utils/dolib
+++ b/ebuild/utils/dolib
@@ -26,6 +26,13 @@ if [[ ! -d ${D} ]]; then
exit 247
fi
+if [[ ! -d ${PALUDIS_EBUILD_MODULES_DIR} ]]; then
+ echo "${0}: \${PALUDIS_EBUILD_MODULES_DIR} not valid; aborting" >&2
+ exit 1
+fi
+
+source "${PALUDIS_EBUILD_MODULES_DIR}/multilib_functions.bash"
+
libdir="${D}${DESTTREE}/$(ebuild_get_libdir)"
if [[ ${#} -lt 1 ]]; then