From 31784b455fa1659b09229be8089305f261a99049 Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Fri, 29 Nov 2013 14:53:15 +0100
Subject: [systemd] Env variables added for kmod compiling/linking when no kmod
 in system. Variable setting unelegant, should be bettered by using
 mltk-intern vars for determining OS/system.

---
 remote/modules/systemd/systemd.build | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'remote/modules/systemd')

diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/systemd.build
index 667157aa..c9d23794 100644
--- a/remote/modules/systemd/systemd.build
+++ b/remote/modules/systemd/systemd.build
@@ -27,10 +27,12 @@ build () {
 	OLDLDFLAGS="$LDFLAGS"
 	OLDCPPFLAGS="$CPPFLAGS"
 	OLDPKG_CONFIG_PATH="$PKG_CONFIG_PATH"
+	OLDLD_LIBRARY_PATH="$LD_LIBRARY_PATH"
 
 	export LDFLAGS="$LDFLAGS -L${MODULE_BUILD_DIR}/usr/lib" 
 	export CPPFLAGS="-I${MODULE_BUILD_DIR}/usr/include"
-	export PKG_CONFIG_PATH="${MODULE_BUILD_DIR}/usr/lib/pkgconfig"
+	export PKG_CONFIG_PATH="${MODULE_BUILD_DIR}/usr/lib64/pkgconfig:${MODULE_BUILD_DIR}/usr/lib/pkgconfig"
+	export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${MODULE_BUILD_DIR}/usr/lib:${MODULE_BUILD_DIR}/usr/lib64"
 
 	./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no --disable-nls \
 			--disable-microhttpd --disable-bootchart --disable-quotacheck --disable-hostnamed --disable-timedated \
@@ -47,6 +49,7 @@ build () {
 	export LDFLAGS="$OLDLDFLAGS"
 	export CPPFLAGS="$OLDCPPFLAGS"
 	export PKG_CONFIG_PATH="$OLDPKG_CONFIG_PATH"
+	LD_LIBRARY_PATH="$OLDLD_LIBRARY_PATH"
 
 	# Delete unneeded services
 	pinfo "Deleting unneeded services"
-- 
cgit v1.2.3-55-g7522