Merge branch 'master' into update/mopidy-mpd

Author: iceaway

CONTRIBUTING.md

@@ -163,7 +163,7 @@ When you make changes to your pull request, please *do not close and reopen your
 #### Continuous Integration
 
 Pull requests are automatically submitted for Continuous Integration (CI) testing to ensure packages build and pass their tests (on native builds) on various combinations of C library and architecture.
-Packages that take longer than 120 minutes or need more than 14G of storage to complete their build (for example, Firefox or the Linux kernel) will fail CI and should include `[ci skip]` in the PR title or body (the comment field when the PR is being opened) to avoid wasting CI builder time.
+Packages expected to take longer than several hours or need more than 14G of storage to complete their build (for example, Firefox or the Linux kernel) will fail CI and should include `[ci skip]` in the PR title or body (the comment field when the PR is being opened) to avoid spurious failures and wasted CI builder time.
 Use your best judgment on build times based on your local building experience. If you skip CI when submitting a PR, please build and cross-build for a variety of architectures locally, with both glibc and musl, and note your local results in PR comments.
 Make sure to cover 64-bit and 32-bit architectures.
 

Manual.md

@@ -100,7 +100,7 @@ pkgname=foo
 version=1.0
 revision=1
 build_style=gnu-configure
-short_desc="A short description max 72 chars"
+short_desc="Package description, no more than 72 characters"
 maintainer="name <email>"
 license="GPL-3.0-or-later"
 homepage="http://www.foo.org"
@@ -367,7 +367,7 @@ The following variables are defined by `xbps-src` and can be used on any templat
 
 - `makejobs` Set to `-jX` if `XBPS_MAKEJOBS` is defined, to allow parallel jobs with `GNU make`.
 
-- `sourcepkg`  Set to the to main package name, can be used to match the main package
+- `sourcepkg`  Set to the main package name, can be used to match the main package
 rather than additional binary package names.
 
 - `CHROOT_READY`  Set if the target chroot (masterdir) is ready for chroot builds.
@@ -1138,6 +1138,10 @@ for compiling cargo -sys crates.
 It also adds a `cargo` wrapper that detects and passes builds through `cargo-auditable`.
 This helper is added by default for packages that use the `cargo` build style.
 
+- `haskell` specifies environment variables for cabal.
+This helper is added by default for packages that use the `haskell-stack` or
+`cabal` build style.
+
 <a id="functions"></a>
 ### Functions
 
@@ -1698,21 +1702,45 @@ The path to the package's source inside `$GOPATH` is available as
 <a id="pkgs_haskell"></a>
 #### Haskell packages
 
-We build Haskell package using `stack` from
-[Stackage](http://www.stackage.org/), generally the LTS versions.
-Haskell templates need to have host dependencies on `ghc` and `stack`,
-and set build style to `haskell-stack`.
-
-The following variables influence how Haskell packages are built:
+Haskell packages can be built either with the `cabal` or `haskell-stack`
+build style, use whichever is more convenient or better supported by upstream,
+sometimes only one of the two is possible. For packages that have haskell
+parts but use a different build style like `gnu-makefile`, make sure to use
+the `haskell` build helper.
+
+The following variables influence how packages are built with cabal:
+
+- `cabal_index_state`: The state of the hackage cabal index to use for
+  fetching dependencies. The source package of a haskell project should
+  come with a freeze file that sets the index state, some also set it in
+  their cabal project file. If it does not, then this has to be set to an ISO
+  timestamp in the package template. For example `2025-07-05T14:01:16Z`.
+- `configure_args`: Arguments passed to `cabal configure`. The configure step
+  generates the `cabal.project.local` file.
+- `make_build_args`: Arguments passed to `cabal build`.
+- `make_build_target`: Target passed to `cabal build`.
+- `make_check_args`: Arguments passed to `cabal test`.
+- `make_check_target`: Test target passed to cabal instead of "test".
+- `make_install_target`: Target passed to `cabal install`.
+
+And these variables influence how packages are built with stack:
 
 - `stackage`: The Stackage version used to build the package, e.g.
   `lts-3.5`. Alternatively:
   - You can prepare a `stack.yaml` configuration for the project and put it
     into `files/stack.yaml`.
-  - If a `stack.yaml` file is present in the source files, it will be used
+  - If a `stack.yaml` file is present in the source files, it will be used.
 - `make_build_args`: This is passed as-is to `stack build ...`, so
   you can add your `--flag ...` parameters there.
 
+To patch dependencies of haskell packages they have to be fetched explicitly
+from hackage by adding them to `distfiles` instead of letting cabal or stack
+download them. Once extracted and patched, the path to the patched version
+can be added to `packages` in `cabal.project` or `stack.yaml`.
+Stack will find them automatically if no `stack.yaml` file exists by scanning
+the directory. The build tool will then use the patched version of the
+depencency instead of downloading it from hackage.
+
 <a id="pkgs_font"></a>
 #### Font packages
 

common/build-helper/haskell.sh

@@ -0,0 +1 @@
+export CABAL_DIR=/home/cabal

common/build-helper/qmake6.sh

@@ -76,6 +76,12 @@ exec /usr/lib/qt6/bin/qmake "\$@" -qtconf "${XBPS_WRAPPERDIR}/qt6.conf" \\
 	QMAKE_CXXFLAGS+="\${CXXFLAGS}" \\
 	QMAKE_LFLAGS+="\${LDFLAGS}"
 _EOF
+	cat > "${XBPS_WRAPPERDIR}/qtpaths6" <<-_EOF
+	#!/bin/sh
+	exec /usr/lib/qt6/bin/qtpaths6 "\$@" -qtconf "${XBPS_WRAPPERDIR}/qt6.conf"
+	_EOF
+	chmod +x "${XBPS_WRAPPERDIR}/qtpaths6"
+	cp -p ${XBPS_WRAPPERDIR}/qtpaths{6,-qt6}
 else
         cat > "${XBPS_WRAPPERDIR}/qmake6" <<_EOF
 #!/bin/sh
@@ -91,6 +97,8 @@ exec /usr/lib/qt6/bin/qmake \
 	QMAKE_LFLAGS+="\${LDFLAGS}" \
 	CONFIG+=no_qt_rpath
 _EOF
+	ln -sf /usr/lib/qt6/bin/qtpaths6 "$XBPS_WRAPPERDIR/qtpaths6"
+	ln -sf /usr/lib/qt6/bin/qtpaths6 "$XBPS_WRAPPERDIR/qtpaths-qt6"
 fi
 chmod 755 ${XBPS_WRAPPERDIR}/qmake6
 cp -p ${XBPS_WRAPPERDIR}/qmake{6,-qt6}

common/build-style/cabal.sh

@@ -0,0 +1,66 @@
+#
+# This helper is for building haskell projects using Cabal.
+#
+
+do_configure() {
+	: ${cabal_cmd:=cabal}
+
+	local _cabal_project_file="cabal.project"
+
+	if [ -e "${FILESDIR}/${_cabal_project_file}.freeze" ]; then
+		cp "${FILESDIR}/${_cabal_project_file}.freeze" .
+	fi
+
+	if [ -n "${cabal_index_state}" ]; then
+		# index-state alone is enough to fully fix a cabal build
+		configure_args+=" --index-state=${cabal_index_state}"
+	elif [ -e "${_cabal_project_file}.freeze" ]; then
+		# With a freeze file we have to make sure that it fixes
+		# the index also
+		if ! grep -q '^index-state:' "${_cabal_project_file}.freeze"; then
+			msg_error "${_cabal_project_file}.freeze is missing index-state\n"
+		fi
+	elif [ -e "${_cabal_project_file}" ]; then
+		if ! grep -q '^index-state:' "${_cabal_project_file}"; then
+			msg_error "${_cabal_project_file} is missing index-state\n"
+		fi
+	else
+		msg_error "cabal build not fixed, set cabal_index_state or add a freeze file to FILESDIR\n"
+	fi
+
+	${cabal_cmd} update
+	${cabal_cmd} configure --prefix=/usr ${configure_args}
+}
+
+do_build() {
+	: ${make_cmd:=cabal}
+
+	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+		make_build_args+=" --ghc-option=-latomic"
+	fi
+
+	${make_cmd} build ${make_build_target} ${makejobs} ${make_build_args}
+}
+
+do_check() {
+	: ${make_cmd:=cabal}
+	: ${make_check_target:=test}
+
+	${make_check_pre} ${make_cmd} ${make_check_target} ${make_check_args}
+}
+
+do_install() {
+	: ${make_cmd:=cabal}
+	: ${make_install_target:=all}
+
+	if ${make_cmd} list-bin ${make_install_target} >/dev/null 2>&1; then
+		vbin $(${make_cmd} list-bin ${make_install_target})
+	else
+		for name in $(${make_cmd} list-bin ${make_install_target} 2>&1 | tr -d '\n ' | grep -Eo "theexecutable'[^']+'" | tr "'" ' ' | awk '{ print $2 }'); do
+			local _bin=$(${make_cmd} list-bin exe:$name)
+			if [ -s "$_bin" ]; then
+				vbin "$_bin"
+			fi
+		done
+	fi
+}

common/build-style/cmake.sh

@@ -63,6 +63,7 @@ _EOF
 		# QT_HOST_PATH isn't enough in my system,
 		# which have binfmts support on and off
 		cmake_args+=" -DQT_HOST_PATH_CMAKE_DIR=/usr/lib/cmake"
+		cmake_args+="  -DKF6_HOST_TOOLING=/usr/lib/cmake"
 	fi
 
 	if [[ $build_helper = *"qemu"* ]]; then

common/build-style/void-cross.sh

@@ -98,9 +98,17 @@ _void_cross_build_bootstrap_gcc() {
 		_void_cross_apply_patch "$f"
 	done
 	if [ -f ${wrksrc}/.musl_version ]; then
+		local musl_version
 		for f in ${XBPS_SRCPKGDIR}/gcc/files/*-musl.patch; do
 			_void_cross_apply_patch "$f"
 		done
+		musl_version=$(cat "${wrksrc}/.musl_version")
+		case "$musl_version" in
+		1.1.*)
+			sed -i '/define LIBDRUNTIME_MUSL_PRE_TIME64/s/0/1/' \
+				gcc/config/linux-d.cc
+			;;
+		esac
 	fi
 	cd ..
 
@@ -337,7 +345,6 @@ _void_cross_build_musl() {
 }
 
 _void_cross_build_libucontext() {
-	[ -n "$cross_gcc_skip_go" ] && return 0
 	[ -f ${wrksrc}/.libucontext_build_done ] && return 0
 
 	local tgt=$1
@@ -390,7 +397,7 @@ _void_cross_build_gcc() {
 	mkdir -p ${wrksrc}/gcc_build
 	cd ${wrksrc}/gcc_build
 
-	local langs="c,c++,fortran,objc,obj-c++,ada,lto"
+	local langs="c,c++,fortran,objc,obj-c++,ada,lto,d"
 	if [ -z "$cross_gcc_skip_go" ]; then
 		langs+=",go"
 	fi
@@ -477,7 +484,9 @@ _void_cross_test_gcc_ver() {
 	ver=$(cat .gcc_version)
 	if [ -d "gcc-${ver}" ] && [ -f "gcc-${ver}/gcc/BASE-VER" ] && [ -f "gcc-${ver}/gcc/DATESTAMP" ]; then
 		basever="$(cat "gcc-${ver}/gcc/BASE-VER")_$(cat "gcc-${ver}/gcc/DATESTAMP")"
-		mv "gcc-${ver}" "gcc-${basever}"
+		if [ "$ver" != "$basever" ]; then
+			mv "gcc-${ver}" "gcc-${basever}"
+		fi
 		echo ${basever} > ${wrksrc}/.gcc_version
 		return
 	fi
@@ -511,12 +520,12 @@ do_build() {
 	if [ ! -f .musl_version ]; then
 		_void_cross_test_ver glibc
 		libc_ver=$(cat .glibc_version)
+		export GDCFLAGS_FOR_TARGET="$cross_glibc_cflags"
 	else
 		libc_ver=$(cat .musl_version)
-		if [ -z "$cross_gcc_skip_go" ]; then
-			_void_cross_test_ver libucontext
-			libucontext_ver=$(cat .libucontext_version)
-		fi
+		_void_cross_test_ver libucontext
+		libucontext_ver=$(cat .libucontext_version)
+		export GDCFLAGS_FOR_TARGET="$cross_musl_cflags"
 	fi
 
 	local sysroot="/usr/${tgt}"

common/chroot-style/bwrap.sh

@@ -18,6 +18,14 @@ if [ -z "$MASTERDIR" -o -z "$DISTDIR" ]; then
 	exit 1
 fi
 
-exec bwrap --bind "$MASTERDIR" / --ro-bind "$DISTDIR" /void-packages \
-	 --dev /dev --tmpfs /tmp --proc /proc \
-	${HOSTDIR:+--bind "$HOSTDIR" /host} $EXTRA_ARGS "$@"
+if [ -z "$XBPS_TEMP_MASTERDIR" ]; then
+	exec bwrap --bind "$MASTERDIR" / \
+		--ro-bind "$DISTDIR" /void-packages \
+		--dev /dev --tmpfs /tmp --proc /proc \
+		${HOSTDIR:+--bind "$HOSTDIR" /host} ${EXTRA_ARGS} "$@"
+else
+	exec bwrap --overlay-src "$MASTERDIR" --tmp-overlay / \
+		--ro-bind "$DISTDIR" /void-packages \
+		--dev /dev --tmpfs /tmp --proc /proc \
+		${HOSTDIR:+--bind "$HOSTDIR" /host} ${EXTRA_ARGS} "$@"
+fi

common/chroot-style/uchroot.sh

@@ -33,4 +33,4 @@ if [ -z "$MASTERDIR" ] || [ -z "$DISTDIR" ]; then
 	exit 1
 fi
 
-exec xbps-uchroot $EXTRA_ARGS -b $DISTDIR:/void-packages ${HOSTDIR:+-b $HOSTDIR:/host} -- $MASTERDIR $CMD $@
+exec xbps-uchroot ${XBPS_TEMP_MASTERDIR:+-O} $EXTRA_ARGS -b $DISTDIR:/void-packages ${HOSTDIR:+-b $HOSTDIR:/host} -- $MASTERDIR $CMD "$@"

common/environment/build-style/cabal.sh

@@ -0,0 +1,2 @@
+hostmakedepends+=" cabal-install git"
+build_helper+=" haskell"