wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-05 06:33:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

chromium: unbreak aarch64 glibc cross build

Browse source
This commit is contained in:
Duncaen 2023-12-15 23:01:09 +01:00
parent 2d9ef18abd
commit 63ef2958fc
No known key found for this signature in database
GPG key ID: 335C1D17EC3D6E35
1 changed files with 19 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
srcpkgs/chromium/template
View file

@ -63,17 +63,11 @@ fi
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
case "${XBPS_TARGET_MACHINE}" in case "${XBPS_TARGET_MACHINE}" in
aarch64)
bro
aarch64*) ;; aarch64*) ;;
*) nocross="chromium can not be cross compiled for this architecture" ;; *) nocross="chromium can not be cross compiled for this architecture" ;;
esac esac
fi fi
case "${XBPS_TARGET_MACHINE}" in
aarch64)
broken="https://build.voidlinux.org/builders/aarch64_builder/builds/46556/steps/shell_3/logs/stdio" ;;
esac
post_patch() { post_patch() {
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
for f in "${FILESDIR}"/musl-patches/*.patch; do for f in "${FILESDIR}"/musl-patches/*.patch; do
@ -95,8 +89,6 @@ post_patch() {
} }
_setup_clang() { _setup_clang() {
local gcc_version=$(gcc -dumpversion)
local clang_version=$(clang -dumpversion)
export CC=clang export CC=clang
export CXX=clang++ export CXX=clang++
export AR=llvm-ar export AR=llvm-ar
@ -110,22 +102,27 @@ _setup_clang() {
export BUILD_NM=llvm-nm export BUILD_NM=llvm-nm
export BUILD_CFLAGS="-Wno-unknown-warning-option" export BUILD_CFLAGS="-Wno-unknown-warning-option"
export BUILD_CXXFLAGS="-Wno-unknown-warning-option" export BUILD_CXXFLAGS="-Wno-unknown-warning-option"
if [[ -n "$CROSS_BUILD" && -z "$build_option_libcxx" ]]; then if [[ -n "$CROSS_BUILD" ]]; then
CFLAGS+=" --gcc-toolchain=/usr"
CFLAGS+=" --sysroot=${XBPS_CROSS_BASE}" CFLAGS+=" --sysroot=${XBPS_CROSS_BASE}"
CFLAGS+=" -nostdinc"
CFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include"
CFLAGS+=" -isystem /usr/lib/clang/${clang_version}/include"
CXXFLAGS+=" --gcc-toolchain=/usr"
CXXFLAGS+=" --sysroot=${XBPS_CROSS_BASE}" CXXFLAGS+=" --sysroot=${XBPS_CROSS_BASE}"
CXXFLAGS+=" -nostdinc++" LDFLAGS+=" --sysroot=${XBPS_CROSS_BASE}"
CXXFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include/c++/${gcc_version%.*}" if [[ -z "$build_option_libcxx" ]]; then
CXXFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include/c++/${gcc_version%.*}/${XBPS_CROSS_TRIPLET}" local gcc_version=$(gcc -dumpversion)
CXXFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include/c++/${gcc_version%.*}/backward" local clang_version=$(clang -dumpversion)
CXXFLAGS+=" -nostdinc" CFLAGS+=" --gcc-toolchain=/usr"
CXXFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include" CFLAGS+=" -nostdinc"
CXXFLAGS+=" -isystem /usr/lib/clang/${clang_version}/include" CFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include"
LDFLAGS+=" --gcc-toolchain=/usr --sysroot=${XBPS_CROSS_BASE}" CFLAGS+=" -isystem /usr/lib/clang/${clang_version}/include"
CXXFLAGS+=" --gcc-toolchain=/usr"
CXXFLAGS+=" -nostdinc++"
CXXFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include/c++/${gcc_version%.*}"
CXXFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include/c++/${gcc_version%.*}/${XBPS_CROSS_TRIPLET}"
CXXFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include/c++/${gcc_version%.*}/backward"
CXXFLAGS+=" -nostdinc"
CXXFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include"
CXXFLAGS+=" -isystem /usr/lib/clang/${clang_version}/include"
LDFLAGS+=" --gcc-toolchain=/usr"
fi
fi fi
} }