Abstracted prefix somewhat.

git-svn-id: http://svn.telesphoreo.org/trunk@249 514c082c-b64e-11dc-b46d-3d985efe055d

3 files changed, 13 insertions, 11 deletions

diff --git a/exec.sh b/exec.sh
index 09eba9f9c..300557fbb 100755
--- a/exec.sh
+++ b/exec.sh
@@ -8,6 +8,7 @@ export PATH=${PKG_BASE}/util:$PATH
 shift
 
 source "${PKG_BASE}/helper.sh"
+export PKG_TAPF=$(cat "${PKG_BASE}/arch/${PKG_ARCH}/prefix")
 
 PKG_PATH=
 
@@ -22,16 +23,16 @@ for dep in $({
     DEP_DEST=$(PKG_DEST_ "${DEP_NAME}")
     PKG_PATH=${PKG_PATH}:${DEP_DEST}
 
-    if [[ -d ${DEP_DEST}/usr/include ]]; then
-        PKG_INCL=${DEP_DEST}/usr/include:${PKG_INCL}
+    if [[ -d ${DEP_DEST}${PKG_TAPF}/include ]]; then
+        PKG_INCL=${DEP_DEST}${PKG_TAPF}/include:${PKG_INCL}
     fi
 
-    if [[ -d ${DEP_DEST}/usr/lib ]]; then
-        PKG_LIBS=${DEP_DEST}/usr/lib:${PKG_LIBS}
+    if [[ -d ${DEP_DEST}${PKG_TAPF}/lib ]]; then
+        PKG_LIBS=${DEP_DEST}${PKG_TAPF}/lib:${PKG_LIBS}
     fi
 
-    if [[ -d ${DEP_DEST}/usr/lib/pkgconfig ]]; then
-        PKG_PKGS=${DEP_DEST}/usr/lib/pkgconfig:${PKG_PKGS}
+    if [[ -d ${DEP_DEST}${PKG_TAPF}/lib/pkgconfig ]]; then
+        PKG_PKGS=${DEP_DEST}${PKG_TAPF}/lib/pkgconfig:${PKG_PKGS}
     fi
 done
 
@@ -46,9 +47,10 @@ C_INCLUDE_PATH= \
 COMPILER_PATH=${PKG_BASE}/util \
 CPATH=${PKG_INCL} \
 CPLUS_INCLUDE_PATH= \
-GCC_EXEC_PREFIX=${PKG_PFIX}/lib/gcc \
+GCC_EXEC_PREFIX=${PKG_CCPF}/lib/gcc \
 LD_LIBRARY_PATH=${PKG_LIBS} \
 LIBRARY_PATH=${PKG_LIBS} \
 MIGCC=${PKG_TARG}-gcc \
 PKG_CONFIG_PATH=${PKG_PKGS} \
+LD_TWOLEVEL_NAMESPACE= \
     "$@"
diff --git a/helper.sh b/helper.sh
index ef67c3aea..69dc93089 100755
--- a/helper.sh
+++ b/helper.sh
@@ -3,7 +3,7 @@
 source "${PKG_BASE}/architect.sh"
 
 export PKG_ROOT=$("${PKG_TARG}-gcc" -dumpspecs | grep '%{isysroot' | sed -e 's/.*%{isysroot\*:\([^}]*\)}.*/\1/; s/;:/\n/g' | sed -e 's/^-syslibroot //' | tail -n 1)
-export PKG_PFIX=$("${PKG_TARG}-gcc" -v 2>&1 | grep -- --prefix | sed -e 's/.*--prefix=\([^ ]*\).*/\1/')
+export PKG_CCPF=$("${PKG_TARG}-gcc" -v 2>&1 | grep -- --prefix | sed -e 's/.*--prefix=\([^ ]*\).*/\1/')
 
 source "${PKG_BASE}/folders.sh"
 
diff --git a/package.sh b/package.sh
index ebba06b2d..7d9e84382 100755
--- a/package.sh
+++ b/package.sh
@@ -30,9 +30,9 @@ if [[ -e "${PKG_DATA}"/_metadata/prerm ]]; then
     cp -a "${PKG_DATA}"/_metadata/prerm "$(pkg_ /DEBIAN)"
 fi
 
-if [[ -e "${PKG_DATA}"/_metadata/conffiles ]]; then
-    cp -a "${PKG_DATA}"/_metadata/conffiles "$(pkg_ /DEBIAN)"
-fi
+#if [[ -e "${PKG_DATA}"/_metadata/conffiles ]]; then
+#    cp -a "${PKG_DATA}"/_metadata/conffiles "$(pkg_ /DEBIAN)"
+#fi
 
 export PKG_HASH=$(util/catdir.sh "${PKG_DEST}" | md5sum | cut -d ' ' -f 1)
 echo "hashed dest ${PKG_NAME} to: ${PKG_HASH}"