Changeset f5bbaba

Timestamp:

2015-08-31T13:58:41Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

34d16d5, f85cb0b

Parents:

aa3b61e

git-author:

Guillermo A. Amaral <g@…> (30-08-15 22:22:58)

git-committer:

dequis <dx@…> (31-08-15 13:58:41)

Message:

Improved cross compiler support.

• Added a configure option for sysroot.
• Prevent pkgconfig environment variables to be clobbered.
• Prevent PATH environment variable pollution.
• Backward compatible.

Signed-off-by: Guillermo A. Amaral <g@…>

File:

• configure (modified) (3 diffs)

configure

@@ -23 +23 @@
 pcdir='$prefix/lib/pkgconfig'
 systemlibdirs="/lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib"
+sysroot=''
 
 # Set these to default-on to let it be overriden by either the user or purple
@@ -149 +150 @@
 
 --target=...    Cross compilation target                same as host
+--sysroot=...   Cross compilation sysroot               $sysroot
 EOF
                 exit;
@@ -240 +242 @@
 
 if [ -n "$target" ]; then
-        PKG_CONFIG_LIBDIR=/usr/$target/lib/pkgconfig
-        export PKG_CONFIG_LIBDIR
-        PATH=/usr/$target/bin:$PATH
+        # prepend sysroot to system lib dirs
+
+        systemlibdirs_cross=''
+        for i in $systemlibdirs; do
+                systemlibdirs_cross="$systemlibdirs_cross $sysroot$i"
+        done
+        systemlibdirs=$systemlibdirs_cross
+        unset systemlibdirs_cross
+
+        # backward compatibility
+
+        if [ -z "$PKG_CONFIG_LIBDIR" ]; then
+                PKG_CONFIG_LIBDIR=/usr/$target/lib/pkgconfig
+                export PKG_CONFIG_LIBDIR
+        fi
+
+        if [ -d /usr/$target/bin ]; then
+                PATH=/usr/$target/bin:$PATH
+        fi
+
+        if [ -d /usr/$target/lib ]; then
+                systemlibdirs="$systemlibdirs /usr/$target/lib"
+        fi
+
         CC=$target-cc
         LD=$target-ld
-        systemlibdirs="/usr/$target/lib"
+        STRIP=$target-strip
 fi