common/profiles: introduce XBPS_{,TARGET_}WORDSIZE

The host and target word size can be used to determine whether cross compiling certain packages is possible.
2019-07-25 11:49:44 +02:00 · 2019-07-25 11:49:44 +02:00 · ed4cdadcfd
parent fd728ab673
commit ed4cdadcfd
39 changed files with 49 additions and 27 deletions
--- a/Manual.md
+++ b/Manual.md
@ -365,12 +365,16 @@ in this directory such as `${XBPS_BUILDDIR}/${wrksrc}`.

 - `XBPS_MACHINE` The machine architecture as returned by `xbps-uhelper arch`.

+- `XBPS_WORDSIZE` The machine's word size in bits (32 or 64).
+
 - `XBPS_SRCDISTDIR` Full path to where the `source distfiles` are stored, i.e `$XBPS_HOSTDIR/sources`.

 - `XBPS_SRCPKGDIR` Full path to the `srcpkgs` directory.

 - `XBPS_TARGET_MACHINE` The target machine architecture when cross compiling a package.

+- `XBPS_TARGET_WORDSIZE` The target machine's word size in bits (32 or 64).
+
 - `XBPS_FETCH_CMD` The utility to fetch files from `ftp`, `http` of `https` servers.

 - `XBPS_WRAPPERDIR` Full path to where xbps-src's wrappers for utilities are stored.
--- a/common/build-profiles/aarch64-musl.sh
+++ b/common/build-profiles/aarch64-musl.sh
@ -1,3 +1,4 @@
+XBPS_WORDSIZE=64
 XBPS_TARGET_CFLAGS="-march=armv8-a"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS=""
--- a/common/build-profiles/aarch64.sh
+++ b/common/build-profiles/aarch64.sh
@ -1,3 +1,4 @@
+XBPS_WORDSIZE=64
 XBPS_TARGET_CFLAGS="-march=armv8-a"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS=""
--- a/common/build-profiles/armv6l-musl.sh
+++ b/common/build-profiles/armv6l-musl.sh
@ -1,3 +1,4 @@
+XBPS_WORDSIZE=32
 XBPS_TARGET_CFLAGS="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS=""
--- a/common/build-profiles/armv6l.sh
+++ b/common/build-profiles/armv6l.sh
@ -1,3 +1,4 @@
+XBPS_WORDSIZE=32
 XBPS_TARGET_CFLAGS="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS=""
--- a/common/build-profiles/armv7l-musl.sh
+++ b/common/build-profiles/armv7l-musl.sh
@ -1,3 +1,4 @@
+XBPS_WORDSIZE=32
 XBPS_TARGET_CFLAGS="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
 XBPS_TARGET_CXXFLAGS="$XBPS_CXXFLAGS"
 XBPS_TARGET_FFLAGS=""
--- a/common/build-profiles/armv7l.sh
+++ b/common/build-profiles/armv7l.sh
@ -1,3 +1,4 @@
+XBPS_WORDSIZE=32
 XBPS_TARGET_CFLAGS="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS=""
--- a/common/build-profiles/i686-musl.sh
+++ b/common/build-profiles/i686-musl.sh
@ -1,3 +1,4 @@
+XBPS_WORDSIZE=32
 XBPS_TARGET_CFLAGS="-mtune=i686"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS=""
--- a/common/build-profiles/i686.sh
+++ b/common/build-profiles/i686.sh
@ -1,3 +1,4 @@
+XBPS_WORDSIZE=32
 XBPS_TARGET_CFLAGS="-mtune=i686"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS=""
--- a/common/build-profiles/ppc-musl.sh
+++ b/common/build-profiles/ppc-musl.sh
@ -1,3 +1,4 @@
+XBPS_WORDSIZE=32
 XBPS_TARGET_CFLAGS="-mcpu=powerpc -mno-altivec -mtune=G4 -mlong-double-64"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS=""
--- a/common/build-profiles/ppc.sh
+++ b/common/build-profiles/ppc.sh
@ -1,3 +1,4 @@
+XBPS_WORDSIZE=32
 XBPS_TARGET_CFLAGS="-mcpu=powerpc -mno-altivec -mtune=G4"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS=""
--- a/common/build-profiles/ppc64-musl.sh
+++ b/common/build-profiles/ppc64-musl.sh
@ -1,3 +1,4 @@
+XBPS_WORDSIZE=64
 XBPS_TARGET_CFLAGS="-mcpu=970 -mtune=power9 -maltivec -mlong-double-64 -mabi=elfv2"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS=""
--- a/common/build-profiles/ppc64.sh
+++ b/common/build-profiles/ppc64.sh
@ -1,3 +1,4 @@
+XBPS_WORDSIZE=64
 XBPS_TARGET_CFLAGS="-mcpu=970 -mtune=power9 -maltivec -mabi=elfv2"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS=""
--- a/common/build-profiles/ppc64le-musl.sh
+++ b/common/build-profiles/ppc64le-musl.sh
@ -1,3 +1,4 @@
+XBPS_WORDSIZE=64
 XBPS_TARGET_CFLAGS="-mcpu=powerpc64le -mtune=power9 -maltivec -mlong-double-64 -mabi=elfv2"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS=""
--- a/common/build-profiles/ppc64le.sh
+++ b/common/build-profiles/ppc64le.sh
@ -1,3 +1,4 @@
+XBPS_WORDSIZE=64
 XBPS_TARGET_CFLAGS="-mcpu=powerpc64le -mtune=power9 -maltivec -mabi=elfv2"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS=""
--- a/common/build-profiles/x86_64-musl.sh
+++ b/common/build-profiles/x86_64-musl.sh
@ -1,3 +1,4 @@
+XBPS_WORDSIZE=64
 XBPS_TARGET_CFLAGS="-mtune=generic"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS=""
--- a/common/build-profiles/x86_64.sh
+++ b/common/build-profiles/x86_64.sh
@ -1,3 +1,4 @@
+XBPS_WORDSIZE=64
 XBPS_TARGET_CFLAGS="-mtune=generic"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS=""
--- a/common/cross-profiles/aarch64-musl.sh
+++ b/common/cross-profiles/aarch64-musl.sh
@ -1,5 +1,5 @@
 # Cross build profile for ARMv8.
-
+XBPS_TARGET_WORDSIZE=64
 XBPS_TARGET_MACHINE="aarch64-musl"
 XBPS_TARGET_QEMU_MACHINE="aarch64"
 XBPS_CROSS_TRIPLET="aarch64-linux-musl"
--- a/common/cross-profiles/aarch64.sh
+++ b/common/cross-profiles/aarch64.sh
@ -1,5 +1,5 @@
 # Cross build profile for ARMv8.
-
+XBPS_TARGET_WORDSIZE=64
 XBPS_TARGET_MACHINE="aarch64"
 XBPS_TARGET_QEMU_MACHINE="aarch64"
 XBPS_CROSS_TRIPLET="aarch64-linux-gnu"
--- a/common/cross-profiles/armv5tel-musl.sh
+++ b/common/cross-profiles/armv5tel-musl.sh
@ -1,5 +1,5 @@
 # Cross build profile for ARM GNU EABI5 Soft Float and Musl libc.
-
+XBPS_TARGET_WORDSIZE=32
 XBPS_TARGET_MACHINE="armv5tel-musl"
 XBPS_TARGET_QEMU_MACHINE="arm"
 XBPS_CROSS_TRIPLET="arm-linux-musleabi"
--- a/common/cross-profiles/armv5tel.sh
+++ b/common/cross-profiles/armv5tel.sh
@ -1,5 +1,5 @@
 # Cross build profile for ARM GNU EABI5 Soft Float.
- 
+XBPS_TARGET_WORDSIZE=32
 XBPS_TARGET_MACHINE="armv5tel"
 XBPS_TARGET_QEMU_MACHINE="arm"
 XBPS_CROSS_TRIPLET="arm-linux-gnueabi"
--- a/common/cross-profiles/armv6l-musl.sh
+++ b/common/cross-profiles/armv6l-musl.sh
@ -1,5 +1,5 @@
 # Cross build profile for ARM EABI5 Hard Float and Musl libc.
-
+XBPS_TARGET_WORDSIZE=32
 XBPS_TARGET_MACHINE="armv6l-musl"
 XBPS_TARGET_QEMU_MACHINE="arm"
 XBPS_CROSS_TRIPLET="arm-linux-musleabihf"
--- a/common/cross-profiles/armv6l.sh
+++ b/common/cross-profiles/armv6l.sh
@ -1,5 +1,5 @@
 # Cross build profile for ARM GNU EABI5 Hard Float.
-
+XBPS_TARGET_WORDSIZE=32
 XBPS_TARGET_MACHINE="armv6l"
 XBPS_TARGET_QEMU_MACHINE="arm"
 XBPS_CROSS_TRIPLET="arm-linux-gnueabihf"
--- a/common/cross-profiles/armv7l-musl.sh
+++ b/common/cross-profiles/armv7l-musl.sh
@ -1,5 +1,5 @@
 # Cross build profile for ARMv7 EABI Hard Float and Musl libc.
-
+XBPS_TARGET_WORDSIZE=32
 XBPS_TARGET_MACHINE="armv7l-musl"
 XBPS_TARGET_QEMU_MACHINE="arm"
 XBPS_CROSS_TRIPLET="armv7l-linux-musleabihf"
--- a/common/cross-profiles/armv7l.sh
+++ b/common/cross-profiles/armv7l.sh
@ -1,5 +1,5 @@
 # Cross build profile for ARMv7 GNU EABI Hard Float.
-
+XBPS_TARGET_WORDSIZE=32
 XBPS_TARGET_MACHINE="armv7l"
 XBPS_TARGET_QEMU_MACHINE="arm"
 XBPS_CROSS_TRIPLET="armv7l-linux-gnueabihf"
--- a/common/cross-profiles/i686-musl.sh
+++ b/common/cross-profiles/i686-musl.sh
@ -1,5 +1,5 @@
 # Cross build profile for i686 and Musl libc.
-
+XBPS_TARGET_WORDSIZE=32
 XBPS_TARGET_MACHINE="i686-musl"
 XBPS_TARGET_QEMU_MACHINE="i386"
 XBPS_CROSS_TRIPLET="i686-linux-musl"
--- a/common/cross-profiles/i686.sh
+++ b/common/cross-profiles/i686.sh
@ -1,5 +1,5 @@
 # Cross build profile for i686 GNU.
-
+XBPS_TARGET_WORDSIZE=32
 XBPS_TARGET_MACHINE="i686"
 XBPS_TARGET_QEMU_MACHINE="i386"
 XBPS_CROSS_TRIPLET="i686-pc-linux-gnu"
--- a/common/cross-profiles/mips-musl.sh
+++ b/common/cross-profiles/mips-musl.sh
@ -1,5 +1,5 @@
 # Cross build profile for MIPS32 BE soft float.
-
+XBPS_TARGET_WORDSIZE=32
 XBPS_TARGET_MACHINE="mips-musl"
 XBPS_TARGET_QEMU_MACHINE="mips"
 XBPS_CROSS_TRIPLET="mips-linux-musl"
--- a/common/cross-profiles/mipsel-musl.sh
+++ b/common/cross-profiles/mipsel-musl.sh
@ -1,5 +1,5 @@
 # Cross build profile for MIPS32 LE soft float.
-
+XBPS_TARGET_WORDSIZE=32
 XBPS_TARGET_MACHINE="mipsel-musl"
 XBPS_TARGET_QEMU_MACHINE="mipsel"
 XBPS_CROSS_TRIPLET="mipsel-linux-musl"
--- a/common/cross-profiles/mipselhf-musl.sh
+++ b/common/cross-profiles/mipselhf-musl.sh
@ -1,5 +1,5 @@
 # Cross build profile for MIPS32 LE hardfloat.
-
+XBPS_TARGET_WORDSIZE=32
 XBPS_TARGET_MACHINE="mipselhf-musl"
 XBPS_TARGET_QEMU_MACHINE="mipsel"
 XBPS_CROSS_TRIPLET="mipsel-linux-muslhf"
--- a/common/cross-profiles/mipshf-musl.sh
+++ b/common/cross-profiles/mipshf-musl.sh
@ -1,5 +1,5 @@
 # Cross build profile for MIPS32 BE hard float.
-
+XBPS_TARGET_WORDSIZE=32
 XBPS_TARGET_MACHINE="mipshf-musl"
 XBPS_TARGET_QEMU_MACHINE="mips"
 XBPS_CROSS_TRIPLET="mips-linux-muslhf"
--- a/common/cross-profiles/ppc-musl.sh
+++ b/common/cross-profiles/ppc-musl.sh
@ -1,5 +1,5 @@
 # Cross build profile for PowerPC.
-
+XBPS_TARGET_WORDSIZE=32
 XBPS_TARGET_MACHINE="ppc-musl"
 XBPS_TARGET_QEMU_MACHINE="ppc"
 XBPS_CROSS_TRIPLET="powerpc-linux-musl"
--- a/common/cross-profiles/ppc.sh
+++ b/common/cross-profiles/ppc.sh
@ -1,5 +1,5 @@
 # Cross build profile for PowerPC.
-
+XBPS_TARGET_WORDSIZE=32
 XBPS_TARGET_MACHINE="ppc"
 XBPS_TARGET_QEMU_MACHINE="ppc"
 XBPS_CROSS_TRIPLET="powerpc-linux-gnu"
--- a/common/cross-profiles/ppc64-musl.sh
+++ b/common/cross-profiles/ppc64-musl.sh
@ -1,5 +1,5 @@
 # Cross build profile for ppc64 big-endian musl.
-
+XBPS_TARGET_WORDSIZE=64
 XBPS_TARGET_MACHINE="ppc64-musl"
 XBPS_TARGET_QEMU_MACHINE="ppc64"
 XBPS_CROSS_TRIPLET="powerpc64-linux-musl"
--- a/common/cross-profiles/ppc64.sh
+++ b/common/cross-profiles/ppc64.sh
@ -1,5 +1,5 @@
 # Cross build profile for ppc64 big-endian GNU.
-
+XBPS_TARGET_WORDSIZE=64
 XBPS_TARGET_MACHINE="ppc64"
 XBPS_TARGET_QEMU_MACHINE="ppc64"
 XBPS_CROSS_TRIPLET="powerpc64-linux-gnu"
--- a/common/cross-profiles/ppc64le-musl.sh
+++ b/common/cross-profiles/ppc64le-musl.sh
@ -1,5 +1,5 @@
 # Cross build profile for ppc64 little-endian musl.
-
+XBPS_TARGET_WORDSIZE=64
 XBPS_TARGET_MACHINE="ppc64le-musl"
 XBPS_TARGET_QEMU_MACHINE="ppc64le"
 XBPS_CROSS_TRIPLET="powerpc64le-linux-musl"
--- a/common/cross-profiles/ppc64le.sh
+++ b/common/cross-profiles/ppc64le.sh
@ -1,5 +1,5 @@
 # Cross build profile for ppc64 little-endian GNU.
-
+XBPS_TARGET_WORDSIZE=64
 XBPS_TARGET_MACHINE="ppc64le"
 XBPS_TARGET_QEMU_MACHINE="ppc64le"
 XBPS_CROSS_TRIPLET="powerpc64le-linux-gnu"
--- a/common/cross-profiles/x86_64-musl.sh
+++ b/common/cross-profiles/x86_64-musl.sh
@ -1,5 +1,5 @@
 # Cross build profile for x86_64 and Musl libc.
-
+XBPS_TARGET_WORDSIZE=64
 XBPS_TARGET_MACHINE="x86_64-musl"
 XBPS_TARGET_QEMU_MACHINE="x86_64"
 XBPS_CROSS_TRIPLET="x86_64-linux-musl"
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@ -140,10 +140,10 @@ msg_warn_nochroot() {

 msg_normal() {
    if [ -z "$XBPS_QUIET" ]; then
-	    # normal messages in bold
-	    [ -n "$NOCOLORS" ] || printf "\033[1m"
-	    printf "=> $@"
-	    [ -n "$NOCOLORS" ] || printf "\033[m"
+        # normal messages in bold
+        [ -n "$NOCOLORS" ] || printf "\033[1m"
+        printf "=> $@"
+        [ -n "$NOCOLORS" ] || printf "\033[m"
    fi
 }

@ -276,7 +276,7 @@ setup_pkg() {
    if [ -n "$cross" ]; then
        source_file $XBPS_CROSSPFDIR/${cross}.sh

-        _vars="TARGET_MACHINE CROSS_TRIPLET CROSS_CFLAGS CROSS_CXXFLAGS TARGET_QEMU_MACHINE"
+        _vars="TARGET_WORDSIZE TARGET_MACHINE CROSS_TRIPLET CROSS_CFLAGS CROSS_CXXFLAGS TARGET_QEMU_MACHINE"
        for f in ${_vars}; do
            eval val="\$XBPS_$f"
            if [ -z "$val" ]; then
@ -286,7 +286,8 @@ setup_pkg() {
        done

        export XBPS_CROSS_BASE=/usr/$XBPS_CROSS_TRIPLET
-        export XBPS_TARGET_QEMU_MACHINE="$XBPS_TARGET_QEMU_MACHINE"
+        export XBPS_TARGET_WORDSIZE
+        export XBPS_TARGET_QEMU_MACHINE

        XBPS_INSTALL_XCMD="env XBPS_TARGET_ARCH=$XBPS_TARGET_MACHINE $XBPS_INSTALL_CMD -c /host/repocache -r $XBPS_CROSS_BASE"
        XBPS_QUERY_XCMD="env XBPS_TARGET_ARCH=$XBPS_TARGET_MACHINE $XBPS_QUERY_CMD -c /host/repocache -r $XBPS_CROSS_BASE"
@ -296,6 +297,7 @@ setup_pkg() {
        XBPS_UHELPER_XCMD="env XBPS_TARGET_ARCH=$XBPS_TARGET_MACHINE xbps-uhelper -r $XBPS_CROSS_BASE"
        XBPS_CHECKVERS_XCMD="env XBPS_TARGET_ARCH=$XBPS_TARGET_MACHINE xbps-checkvers -r $XBPS_CROSS_BASE --repository=$XBPS_REPOSITORY"
    else
+        export XBPS_TARGET_WORDSIZE=${XBPS_TARGET_WORDSIZE:-$XBPS_WORDSIZE}
        export XBPS_TARGET_MACHINE=${XBPS_ARCH:-$XBPS_MACHINE}
        unset XBPS_CROSS_BASE XBPS_CROSS_LDFLAGS XBPS_CROSS_FFLAGS
        unset XBPS_CROSS_CFLAGS XBPS_CROSS_CXXFLAGS XBPS_CROSS_CPPFLAGS