manuel
/
void-packages
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps-src: introduce XBPS_TRIPLET and set it in the build-profiles. 

This is for cases where host does not match build environment (x86_64 building for x86).
So we just force build/host triplet in native builds.
This commit is contained in:
Juan RP 2014-11-11 22:24:40 +01:00
parent ab9b7971f0
commit 9a168e4463
10 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/build-profiles/armv6l-musl.sh
View File

@ -1,2 +1,3 @@
XBPS_CFLAGS="-O2 -pipe -fstack-protector -march=armv6 -mfpu=vfp -mfloat-abi=hard" XBPS_CFLAGS="-O2 -pipe -fstack-protector -march=armv6 -mfpu=vfp -mfloat-abi=hard"
XBPS_CXXFLAGS="$XBPS_CFLAGS" XBPS_CXXFLAGS="$XBPS_CFLAGS"
XBPS_TRIPLET="armv6l-unknown-linux-musleabi"

1
common/build-profiles/armv6l.sh
View File

@ -1,2 +1,3 @@
XBPS_CFLAGS="-O2 -pipe -fstack-protector-strong -march=armv6 -mfpu=vfp -mfloat-abi=hard" XBPS_CFLAGS="-O2 -pipe -fstack-protector-strong -march=armv6 -mfpu=vfp -mfloat-abi=hard"
XBPS_CXXFLAGS="$XBPS_CFLAGS" XBPS_CXXFLAGS="$XBPS_CFLAGS"
XBPS_TRIPLET="armv6l-unknown-linux-gnueabihf"

1
common/build-profiles/armv7l-musl.sh
View File

@ -1,2 +1,3 @@
XBPS_CFLAGS="-O2 -pipe -fstack-protector -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard" XBPS_CFLAGS="-O2 -pipe -fstack-protector -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
XBPS_CXXFLAGS="$XBPS_CFLAGS" XBPS_CXXFLAGS="$XBPS_CFLAGS"
XBPS_TRIPLET="armv7l-unknown-linux-gnueabihf"

1
common/build-profiles/armv7l.sh
View File

@ -1,2 +1,3 @@
XBPS_CFLAGS="-O2 -pipe -fstack-protector-strong -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard" XBPS_CFLAGS="-O2 -pipe -fstack-protector-strong -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
XBPS_CXXFLAGS="$XBPS_CFLAGS" XBPS_CXXFLAGS="$XBPS_CFLAGS"
XBPS_TRIPLET="armv7l-unknown-linux-gnueabihf"

1
common/build-profiles/i686-musl.sh
View File

@ -1,2 +1,3 @@
XBPS_CFLAGS="-O2 -pipe -mtune=i686 -fstack-protector" XBPS_CFLAGS="-O2 -pipe -mtune=i686 -fstack-protector"
XBPS_CXXFLAGS="$XBPS_CFLAGS" XBPS_CXXFLAGS="$XBPS_CFLAGS"
XBPS_HOST_TRIPLET="i686-unknown-linux-musl"

1
common/build-profiles/i686.sh
View File

@ -1,2 +1,3 @@
XBPS_CFLAGS="-O2 -pipe -mtune=i686 -fstack-protector-strong" XBPS_CFLAGS="-O2 -pipe -mtune=i686 -fstack-protector-strong"
XBPS_CXXFLAGS="$XBPS_CFLAGS" XBPS_CXXFLAGS="$XBPS_CFLAGS"
XBPS_TRIPLET="i686-pc-linux-gnu"

1
common/build-profiles/x86_64-musl.sh
View File

@ -1,2 +1,3 @@
XBPS_CFLAGS="-O2 -pipe -fstack-protector" XBPS_CFLAGS="-O2 -pipe -fstack-protector"
XBPS_CXXFLAGS="$XBPS_CFLAGS" XBPS_CXXFLAGS="$XBPS_CFLAGS"
XBPS_TRIPLET="x86_64-unknown-linux-musl"

1
common/build-profiles/x86_64.sh
View File

@ -1,2 +1,3 @@
XBPS_CFLAGS="-O2 -pipe -fstack-protector-strong" XBPS_CFLAGS="-O2 -pipe -fstack-protector-strong"
XBPS_CXXFLAGS="$XBPS_CFLAGS" XBPS_CXXFLAGS="$XBPS_CFLAGS"
XBPS_TRIPLET="x86_64-unknown-linux-gnu"

2
common/environment/configure/gnu-configure-args.sh
View File

@ -14,6 +14,8 @@ fi
# Cross compilation vars # Cross compilation vars
if [ -z "$CROSS_BUILD" ]; then if [ -z "$CROSS_BUILD" ]; then
. ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"
return 0 return 0
fi fi

3
srcpkgs/gnutls/template
View File

@ -5,9 +5,6 @@ revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="--with-zlib --disable-guile --disable-static configure_args="--with-zlib --disable-guile --disable-static
--disable-valgrind-tests --disable-rpath" --disable-valgrind-tests --disable-rpath"
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
configure_args+=" --host=i686-pc-linux-gnu"
fi
short_desc="GNU Transport Layer Security library" short_desc="GNU Transport Layer Security library"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnu.org/software/gnutls/" homepage="http://www.gnu.org/software/gnutls/"