Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bfd3e7ad233a376ea1d2e3b26537a579d9d045a7

commit bfd3e7ad233a376ea1d2e3b26537a579d9d045a7
Author: crazy <cr...@frugalware.org>
Date:   Tue Aug 8 13:52:48 2017 +0200

cross32.sh: added _F_cross32_combined
* well allow combined build eg: header files / pkg-config 64bit packages
* and 32bit build .. this is most Xorg stuff , until someone fix this.
* howver this 32bit stuff is going me on my nervs , is like an bad virus..

diff --git a/source/include/cross32.sh b/source/include/cross32.sh
index 858be06..bd8c388 100644
--- a/source/include/cross32.sh
+++ b/source/include/cross32.sh
@@ -48,6 +48,9 @@ __cross32_save_orig_vars() {
CXXFLAGS_ORIG="$CXXFLAGS"
LDFLAGS_ORIG="$LDFLAGS"
CHOST_ORIG="$CHOST"
+       if [ -n "$_F_cross32_combined" ]; then
+               PKGCONFIG_ORIG="$PKG_CONFIG_PATH"
+       fi
PATH_ORIG="$PATH"
ASFLAGS_ORIG="$ASFLAGS"
}
@@ -65,12 +68,16 @@ __cross32_export_orig_vars() {
export CC="gcc"
export CXX="g++"

-       unset PKG_CONFIG_LIBDIR
+       if [ -n "$_F_cross32_combined" ]; then
+               export PKG_CONFIG_PATH="$PKGCONFIG_ORIG"
+       else
+               unset PKG_CONFIG_LIBDIR
+       fi
## reset CPP
unset CPPFLAGS
## reset PATH
export PATH="$PATH_ORIG"
-
+
## reset ASFLAGS
export ASFLAGS="$ASFLAGS_ORIG"

@@ -101,7 +108,11 @@ __cross32_set_vars() {
export CXX="g++ -m32"
LDFLAGS+=" -L/usr/lib32"
export CPPFLAGS=" -I/usr/${CHOST}/include"
-       export PKG_CONFIG_LIBDIR="/usr/lib32/pkgconfig"
+       if [ -n "$_F_cross32_combined" ]; then
+               export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+       else
+               export PKG_CONFIG_LIBDIR="/usr/lib32/pkgconfig"
+       fi
export ASFLAGS="--32"

## we share some tools like tools for building docs
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to