* [PR PATCH] common/build-helper/meson.sh: only write cross file once
@ 2023-10-26 13:20 ahesford
2023-10-27 11:09 ` [PR PATCH] [Updated] " ahesford
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: ahesford @ 2023-10-26 13:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 595 bytes --]
There is a new pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages meson
https://github.com/void-linux/void-packages/pull/46904
common/build-helper/meson.sh: only write cross file once
Rewriting the file every time the helper is sourced is needless and apparently triggers meson to regenerate build files multiple times, so we should only write this file once.
#### Testing the changes
- I tested the changes in this PR: **in process**
A patch file from https://github.com/void-linux/void-packages/pull/46904.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-meson-46904.patch --]
[-- Type: text/x-diff, Size: 895 bytes --]
From 5c19a2dc80ee1542aecc0159d3708c21228d4de8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 26 Oct 2023 09:18:13 -0400
Subject: [PATCH] common/build-helper/meson.sh: only write cross file once
---
common/build-helper/meson.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/common/build-helper/meson.sh b/common/build-helper/meson.sh
index 5ac9d2fe1badc..192bf930a84dd 100644
--- a/common/build-helper/meson.sh
+++ b/common/build-helper/meson.sh
@@ -1,7 +1,8 @@
# This build helper writes a Meson cross-file, allowing other build styles
# to properly drive cross-builds in Meson when appropriate
-if [ -n "$CROSS_BUILD" ]; then
+# The cross file should only be written once
+if [ -n "$CROSS_BUILD" ] && [ ! -e "${XBPS_WRAPPERDIR}/meson/xbps_meson.cross" ]; then
mkdir -p "${XBPS_WRAPPERDIR}/meson"
_MESON_TARGET_ENDIAN=little
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] common/build-helper/meson.sh: only write cross file once
2023-10-26 13:20 [PR PATCH] common/build-helper/meson.sh: only write cross file once ahesford
@ 2023-10-27 11:09 ` ahesford
2023-10-27 16:16 ` [PR PATCH] [Closed]: " ahesford
2023-10-27 16:17 ` ahesford
2 siblings, 0 replies; 4+ messages in thread
From: ahesford @ 2023-10-27 11:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 600 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages meson
https://github.com/void-linux/void-packages/pull/46904
common/build-helper/meson.sh: only write cross file once
Rewriting the file every time the helper is sourced is needless and apparently triggers meson to regenerate build files multiple times, so we should only write this file once.
#### Testing the changes
- I tested the changes in this PR: **in process**
A patch file from https://github.com/void-linux/void-packages/pull/46904.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-meson-46904.patch --]
[-- Type: text/x-diff, Size: 5300 bytes --]
From cfb00472817fc4b5b627aec97353632b68eb4618 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 26 Oct 2023 09:18:13 -0400
Subject: [PATCH] common/build-helper/meson.sh: only write cross file once
---
common/build-helper/meson.sh | 152 ++++++++++++++++++-----------------
1 file changed, 78 insertions(+), 74 deletions(-)
diff --git a/common/build-helper/meson.sh b/common/build-helper/meson.sh
index 5ac9d2fe1badc..040771c455be1 100644
--- a/common/build-helper/meson.sh
+++ b/common/build-helper/meson.sh
@@ -1,82 +1,86 @@
# This build helper writes a Meson cross-file, allowing other build styles
# to properly drive cross-builds in Meson when appropriate
-if [ -n "$CROSS_BUILD" ]; then
- mkdir -p "${XBPS_WRAPPERDIR}/meson"
+# Action is only taken for cross builds
+[ -z "$CROSS_BUILD" ] && return 0
- _MESON_TARGET_ENDIAN=little
- # drop the -musl suffix to the target cpu, meson doesn't recognize it
- _MESON_TARGET_CPU=${XBPS_TARGET_MACHINE/-musl/}
- case "$XBPS_TARGET_MACHINE" in
- mips|mips-musl|mipshf-musl)
- _MESON_TARGET_ENDIAN=big
- _MESON_CPU_FAMILY=mips
- ;;
- armv*)
- _MESON_CPU_FAMILY=arm
- ;;
- i686*)
- _MESON_CPU_FAMILY=x86
- ;;
- ppc64le*)
- _MESON_CPU_FAMILY=ppc64
- ;;
- ppc64*)
- _MESON_TARGET_ENDIAN=big
- _MESON_CPU_FAMILY=ppc64
- ;;
- ppcle*)
- _MESON_CPU_FAMILY=ppc
- ;;
- ppc*)
- _MESON_TARGET_ENDIAN=big
- _MESON_CPU_FAMILY=ppc
- ;;
- *)
- # if we reached here that means that the cpu and cpu_family
- # are the same like 'x86_64' and 'aarch64'
- _MESON_CPU_FAMILY=${_MESON_TARGET_CPU}
- ;;
- esac
+# The cross file should only be written once, unless forced
+[ -e "${XBPS_WRAPPERDIR}/meson/xbps_meson.cross" ] && [ -z "$XBPS_BUILD_FORCEMODE" ] && return 0
- # Tell meson to run binaries with qemu if desired
- _MESON_EXE_WRAPPER=""
- if [[ "${build_helper}" = *qemu* ]]; then
- _MESON_EXE_WRAPPER="exe_wrapper = '/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static'"
- fi
+mkdir -p "${XBPS_WRAPPERDIR}/meson"
- # Record cross-compiling information in cross file.
- #
- # CFLAGS, CXXFLAGS and LDFLAGS are not yet available and
- # will be taken from the environment at configure time.
- cat > "${XBPS_WRAPPERDIR}/meson/xbps_meson.cross" <<-EOF
- [binaries]
- ${_MESON_EXE_WRAPPER:-# exe_wrapper is not set}
- c = '${CC}'
- cpp = '${CXX}'
- ar = '${XBPS_CROSS_TRIPLET}-gcc-ar'
- nm = '${NM}'
- ld = '${LD}'
- strip = '${STRIP}'
- readelf = '${READELF}'
- objcopy = '${OBJCOPY}'
- pkgconfig = '${PKG_CONFIG}'
- rust = ['rustc', '--target', '${RUST_TARGET}' ,'--sysroot', '${XBPS_CROSS_BASE}/usr']
- g-ir-scanner = '${XBPS_CROSS_BASE}/usr/bin/g-ir-scanner'
- g-ir-compiler = '${XBPS_CROSS_BASE}/usr/bin/g-ir-compiler'
- g-ir-generate = '${XBPS_CROSS_BASE}/usr/bin/g-ir-generate'
- llvm-config = '/usr/bin/llvm-config'
- cups-config = '${XBPS_CROSS_BASE}/usr/bin/cups-config'
-
- [properties]
- needs_exe_wrapper = true
-
- [host_machine]
- system = 'linux'
- cpu_family = '${_MESON_CPU_FAMILY}'
- cpu = '${_MESON_TARGET_CPU}'
- endian = '${_MESON_TARGET_ENDIAN}'
- EOF
+_MESON_TARGET_ENDIAN=little
+# drop the -musl suffix to the target cpu, meson doesn't recognize it
+_MESON_TARGET_CPU=${XBPS_TARGET_MACHINE/-musl/}
+case "$XBPS_TARGET_MACHINE" in
+ mips|mips-musl|mipshf-musl)
+ _MESON_TARGET_ENDIAN=big
+ _MESON_CPU_FAMILY=mips
+ ;;
+ armv*)
+ _MESON_CPU_FAMILY=arm
+ ;;
+ i686*)
+ _MESON_CPU_FAMILY=x86
+ ;;
+ ppc64le*)
+ _MESON_CPU_FAMILY=ppc64
+ ;;
+ ppc64*)
+ _MESON_TARGET_ENDIAN=big
+ _MESON_CPU_FAMILY=ppc64
+ ;;
+ ppcle*)
+ _MESON_CPU_FAMILY=ppc
+ ;;
+ ppc*)
+ _MESON_TARGET_ENDIAN=big
+ _MESON_CPU_FAMILY=ppc
+ ;;
+ *)
+ # if we reached here that means that the cpu and cpu_family
+ # are the same like 'x86_64' and 'aarch64'
+ _MESON_CPU_FAMILY=${_MESON_TARGET_CPU}
+ ;;
+esac
- unset _MESON_CPU_FAMILY _MESON_TARGET_CPU _MESON_TARGET_ENDIAN _MESON_EXE_WRAPPER
+# Tell meson to run binaries with qemu if desired
+_MESON_EXE_WRAPPER=""
+if [[ "${build_helper}" = *qemu* ]]; then
+ _MESON_EXE_WRAPPER="exe_wrapper = '/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static'"
fi
+
+# Record cross-compiling information in cross file.
+#
+# CFLAGS, CXXFLAGS and LDFLAGS are not yet available and
+# will be taken from the environment at configure time.
+cat > "${XBPS_WRAPPERDIR}/meson/xbps_meson.cross" <<-EOF
+ [binaries]
+ ${_MESON_EXE_WRAPPER:-# exe_wrapper is not set}
+ c = '${CC}'
+ cpp = '${CXX}'
+ ar = '${XBPS_CROSS_TRIPLET}-gcc-ar'
+ nm = '${NM}'
+ ld = '${LD}'
+ strip = '${STRIP}'
+ readelf = '${READELF}'
+ objcopy = '${OBJCOPY}'
+ pkgconfig = '${PKG_CONFIG}'
+ rust = ['rustc', '--target', '${RUST_TARGET}' ,'--sysroot', '${XBPS_CROSS_BASE}/usr']
+ g-ir-scanner = '${XBPS_CROSS_BASE}/usr/bin/g-ir-scanner'
+ g-ir-compiler = '${XBPS_CROSS_BASE}/usr/bin/g-ir-compiler'
+ g-ir-generate = '${XBPS_CROSS_BASE}/usr/bin/g-ir-generate'
+ llvm-config = '/usr/bin/llvm-config'
+ cups-config = '${XBPS_CROSS_BASE}/usr/bin/cups-config'
+
+ [properties]
+ needs_exe_wrapper = true
+
+ [host_machine]
+ system = 'linux'
+ cpu_family = '${_MESON_CPU_FAMILY}'
+ cpu = '${_MESON_TARGET_CPU}'
+ endian = '${_MESON_TARGET_ENDIAN}'
+ EOF
+
+unset _MESON_CPU_FAMILY _MESON_TARGET_CPU _MESON_TARGET_ENDIAN _MESON_EXE_WRAPPER
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Closed]: common/build-helper/meson.sh: only write cross file once
2023-10-26 13:20 [PR PATCH] common/build-helper/meson.sh: only write cross file once ahesford
2023-10-27 11:09 ` [PR PATCH] [Updated] " ahesford
@ 2023-10-27 16:16 ` ahesford
2023-10-27 16:17 ` ahesford
2 siblings, 0 replies; 4+ messages in thread
From: ahesford @ 2023-10-27 16:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 444 bytes --]
There's a closed pull request on the void-packages repository
common/build-helper/meson.sh: only write cross file once
https://github.com/void-linux/void-packages/pull/46904
Description:
Rewriting the file every time the helper is sourced is needless and apparently triggers meson to regenerate build files multiple times, so we should only write this file once.
#### Testing the changes
- I tested the changes in this PR: **in process**
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: common/build-helper/meson.sh: only write cross file once
2023-10-26 13:20 [PR PATCH] common/build-helper/meson.sh: only write cross file once ahesford
2023-10-27 11:09 ` [PR PATCH] [Updated] " ahesford
2023-10-27 16:16 ` [PR PATCH] [Closed]: " ahesford
@ 2023-10-27 16:17 ` ahesford
2 siblings, 0 replies; 4+ messages in thread
From: ahesford @ 2023-10-27 16:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 228 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/46904#issuecomment-1783178748
Comment:
557b4a73cf9516f1b58c4c2957e3b782b1724e0b and 174deccefdf2f7c0f0a4e2578ce70c4cc9ef01cf
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-10-27 16:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-26 13:20 [PR PATCH] common/build-helper/meson.sh: only write cross file once ahesford
2023-10-27 11:09 ` [PR PATCH] [Updated] " ahesford
2023-10-27 16:16 ` [PR PATCH] [Closed]: " ahesford
2023-10-27 16:17 ` ahesford
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).