Changeset 249 for trunk/exec.sh

Timestamp:

04/26/08 18:02:04 (7 months ago)

Author:

saurik

Message:

Abstracted prefix somewhat.

Files:

• trunk/exec.sh (modified) (3 diffs)

trunk/exec.sh

@@ -9 +9 @@
 
 source "${PKG_BASE}/helper.sh"
+export PKG_TAPF=$(cat "${PKG_BASE}/arch/${PKG_ARCH}/prefix")
 
 PKG_PATH=
@@ -23 +24 @@
     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
@@ -47 +48 @@
 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= \
     "$@"