Build environment changes

1 files changed, 13 insertions, 1 deletions

diff --git a/exec.sh b/exec.sh
index 3810f8e65..3422a63fe 100755
--- a/exec.sh
+++ b/exec.sh
@@ -8,7 +8,7 @@ export PATH=${PKG_BASE}/util:$PATH
 shift
 
 source "${PKG_BASE}/helper.sh"
-export PKG_TAPF=$(cat "${PKG_BASE}/arch/${PKG_ARCH}/prefix")
+export PKG_TAPF=$(cat "${PKG_BASE}/arch/${PKG_ARCH}/${PKG_CFTARG}/prefix")
 
 PKG_PATH=
 
@@ -38,6 +38,10 @@ for dep in ${deps[@]}; do
     DEP_DEST=$(PKG_DEST_ "${DEP_NAME}")
     PKG_PATH=${PKG_PATH}:${DEP_DEST}
 
+    if [[ -f "$(PKG_DATA_ ${DEP_NAME})/_metadata/exclude.${PKG_CFTARG}" ]]; then
+		    continue
+		fi
+
     if [[ -d ${DEP_DEST}${PKG_TAPF}/include ]]; then
         PKG_INCL=${DEP_DEST}${PKG_TAPF}/include:${PKG_INCL}
     fi
@@ -46,6 +50,10 @@ for dep in ${deps[@]}; do
         PKG_LIBS=${DEP_DEST}${PKG_TAPF}/lib:${PKG_LIBS}
     fi
 
+    if [[ -d ${DEP_DEST}${PKG_TAPF}/local/lib ]]; then
+        PKG_LIBS=${DEP_DEST}${PKG_TAPF}/local/lib:${PKG_LIBS}
+    fi
+
     if [[ -d ${DEP_MORE}${PKG_TAPF}/lib ]]; then
         PKG_LIBS=${DEP_MORE}${PKG_TAPF}/lib:${PKG_LIBS}
     fi
@@ -53,6 +61,10 @@ for dep in ${deps[@]}; do
     if [[ -d ${DEP_DEST}${PKG_TAPF}/lib/pkgconfig ]]; then
         PKG_PKGS=${DEP_DEST}${PKG_TAPF}/lib/pkgconfig:${PKG_PKGS}
     fi
+
+    if [[ -d ${DEP_DEST}${PKG_TAPF}/local/lib/pkgconfig ]]; then
+        PKG_PKGS=${DEP_DEST}${PKG_TAPF}/local/lib/pkgconfig:${PKG_PKGS}
+    fi
 done
 
 PKG_PATH=${PKG_PATH}:${PKG_ROOT}