diff --git a/common/build-style/zig-build.sh b/common/build-style/zig-build.sh index 5c334b1e1e5..c888a9b5eb7 100644 --- a/common/build-style/zig-build.sh +++ b/common/build-style/zig-build.sh @@ -1,5 +1,5 @@ do_build() { - local zig_target zig_cpu + local zig_target zig_cpu zig_search_prefix # TODO: This duplication between build-profiles and cross-profiles # is totally unnecessary. It would be nice if there was some way to @@ -7,9 +7,11 @@ do_build() { if [ "$CROSS_BUILD" ]; then zig_target="${XBPS_CROSS_ZIG_TARGET}" zig_cpu="${XBPS_CROSS_ZIG_CPU}" + zig_search_prefix=/ else zig_target="${XBPS_ZIG_TARGET}" zig_cpu="${XBPS_ZIG_CPU}" + zig_search_prefix=/usr fi # Inform zig of the required libc include paths. @@ -30,8 +32,8 @@ do_build() { # prefix used by the zig build system. DESTDIR="zig-out" zig build \ -j"${XBPS_MAKEJOBS}" \ - --sysroot "${XBPS_CROSS_BASE}" \ - --search-prefix "${XBPS_CROSS_BASE}/usr" \ + --sysroot "${XBPS_CROSS_BASE:-/}" \ + --search-prefix "${zig_search_prefix}" \ --prefix /usr \ --global-cache-dir /host/zig \ --libc xbps_zig_libc.txt \ diff --git a/srcpkgs/linuxwave/template b/srcpkgs/linuxwave/template index 7af1d8db42b..8cff020b7e0 100644 --- a/srcpkgs/linuxwave/template +++ b/srcpkgs/linuxwave/template @@ -1,6 +1,6 @@ # Template file for 'linuxwave' pkgname=linuxwave -version=0.2.0 +version=0.3.0 revision=1 build_style=zig-build short_desc="Generate music from the entropy of Linux" @@ -9,7 +9,7 @@ license="MIT" homepage="https://orhun.dev/linuxwave/" changelog="https://raw.githubusercontent.com/orhun/linuxwave/main/CHANGELOG.md" distfiles="https://github.com/orhun/linuxwave/releases/download/v${version}/v${version}.tar.gz" -checksum=593b05809f68c830c95a3176fbec358306aff19238ca2ecdacfbeaabfefdab83 +checksum=7f334a3d84a18b13799b9c00bf01dfb615718ead54a71b00ce13a0422811764f post_install() { vlicense LICENSE diff --git a/srcpkgs/mepo/template b/srcpkgs/mepo/template index f2ae4636ebc..2bdc0cab074 100644 --- a/srcpkgs/mepo/template +++ b/srcpkgs/mepo/template @@ -1,13 +1,14 @@ # Template file for 'mepo' pkgname=mepo -version=1.3.3 +version=1.3.4 revision=1 build_style=zig-build +hostmakedepends="pkg-config" makedepends="SDL2_image-devel SDL2_gfx-devel SDL2_ttf-devel SDL2-devel libcurl-devel" short_desc="Fast, simple, and hackable OSM map viewer" maintainer="Jason Elswick " license="GPL-3.0-or-later" homepage="https://git.sr.ht/~mil/mepo" distfiles="https://git.sr.ht/~mil/mepo/archive/${version}.tar.gz" -checksum=83dcd04dc38230e4b0beebb1f8ea72100adc551dac5b451b8f185b71f04fab68 +checksum=6f0f38fd58234b4de33e145d1660223be1d684dc33fea3dccf651281751ce286 nopie=yes diff --git a/srcpkgs/ncdu2/template b/srcpkgs/ncdu2/template index c1c8f672d8d..7a69752f026 100644 --- a/srcpkgs/ncdu2/template +++ b/srcpkgs/ncdu2/template @@ -1,6 +1,6 @@ # Template file for 'ncdu2' pkgname=ncdu2 -version=2.7 +version=2.8.2 revision=1 build_style=zig-build configure_args="-Dpie" @@ -12,7 +12,7 @@ license="MIT" homepage="https://dev.yorhel.nl/ncdu" changelog="https://dev.yorhel.nl/ncdu/changes2" distfiles="https://dev.yorhel.nl/download/ncdu-${version}.tar.gz" -checksum=b218cc14a2bb9852cf951db4e21aec8980e7a8c3aca097e3aa3417f20eb93000 +checksum=022fa765d35a79797acdc80c831707df43c9a3ba60d1ae3e6ea4cc1b7a2c013d conflicts="ncdu" post_install() { diff --git a/srcpkgs/river/template b/srcpkgs/river/template index c61fce973e9..76340bcd46e 100644 --- a/srcpkgs/river/template +++ b/srcpkgs/river/template @@ -1,6 +1,6 @@ # Template file for 'river' pkgname=river -version=0.3.7 +version=0.3.9 revision=1 archs="~i686* ~armv6l* ~armv7l*" build_style=zig-build @@ -14,7 +14,7 @@ maintainer="Orphaned " license="GPL-3.0-only" homepage="https://codeberg.org/river/river" distfiles="https://codeberg.org/river/river/releases/download/v${version}/river-${version}.tar.gz" -checksum=a6007ff0ad1cd46b2229661c28e4602aa6fe160872293f0749c17fa95b78a873 +checksum=49d8a2b679597cf5dff07008a1215892cc05525fb4085b5226b51611666335e5 build_options="xwayland" build_options_default="xwayland" diff --git a/srcpkgs/waylock/template b/srcpkgs/waylock/template index de1d55799f9..3eff617e76f 100644 --- a/srcpkgs/waylock/template +++ b/srcpkgs/waylock/template @@ -1,6 +1,6 @@ # Template file for 'waylock' pkgname=waylock -version=1.3.0 +version=1.4.0 revision=1 build_style=zig-build configure_args="-Dpie" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="ISC" homepage="https://codeberg.org/ifreund/waylock" distfiles="https://codeberg.org/ifreund/waylock/releases/download/v${version}/waylock-${version}.tar.gz" -checksum=b7ec04c1dc0c6adb47045b4f604cb35988e9ca93bd4f3317fcc91bfac7bf075a +checksum=67d468b91450fc669767cddb1abd652442c82ede7b5a265ae910f4e4dbb72520 post_install() { vlicense LICENSE diff --git a/srcpkgs/zig/template b/srcpkgs/zig/template index c70e908c384..faa66cf0106 100644 --- a/srcpkgs/zig/template +++ b/srcpkgs/zig/template @@ -1,25 +1,23 @@ # Template file for 'zig' pkgname=zig -version=0.13.0 +version=0.14.1 revision=1 archs="x86_64* aarch64*" build_style=cmake -configure_args="-DZIG_TARGET_MCPU=baseline" -make_cmd=make +configure_args="-DZIG_TARGET_MCPU=baseline -DZIG_PIE=ON" +_llvmver=19 # we add xml2, zstd, zlib and ncurses # because our lld is static-only and requires those to work -makedepends="clang18-devel llvm18-devel lld18-devel libxml2-devel libzstd-devel ncurses-devel zlib-devel" +makedepends="clang${_llvmver}-devel llvm${_llvmver}-devel lld${_llvmver}-devel + libxml2-devel libzstd-devel ncurses-devel zlib-devel" short_desc="Programming language designed for robustness, optimality, and clarity" maintainer="Orphaned " license="MIT" homepage="https://ziglang.org" distfiles="https://ziglang.org/download/${version}/zig-${version}.tar.xz" -checksum=06c73596beeccb71cc073805bdb9c0e05764128f16478fa53bf17dfabc1d4318 -nopie=yes +checksum=237f8abcc8c3fd68c70c66cdbf63dce4fb5ad4a2e6225ac925e3d5b4c388f203 nocross=yes -export CMAKE_GENERATOR="Unix Makefiles" - post_install() { vlicense LICENSE } diff --git a/srcpkgs/zls/template b/srcpkgs/zls/template index 887475ed8d2..1bbde7372a4 100644 --- a/srcpkgs/zls/template +++ b/srcpkgs/zls/template @@ -1,23 +1,19 @@ # Template file for 'zls' pkgname=zls -version=0.13.0 +version=0.14.0 revision=1 build_style=zig-build -configure_args="-Dpie" short_desc="Zig language server" maintainer="Orphaned " license="MIT" homepage="https://github.com/zigtools/zls" -_tracy_gitrev="37aff70dfa50cf6307b3fee6074d627dc2929143" -distfiles="https://github.com/zigtools/zls/archive/refs/tags/${version}.tar.gz - https://github.com/wolfpld/tracy/archive/${_tracy_gitrev}.tar.gz" -checksum="2e8046b6b0de765a4bf4bb828345e2badc8b828bc257dc931d0f56b147684d9f - c24ce6179df7efb8a114fe409d197e26e4b937c6fc1258bea15840b15b1f79ff" -skip_extraction="${_tracy_gitrev}.tar.gz" +distfiles="https://github.com/zigtools/zls/archive/refs/tags/${version}.tar.gz" +checksum=44cae74073b2f75cf627755398afadafaa382cccf7555b5b66b147dcaa6cef0d -post_extract() { - vsrcextract -C src/tracy ${_tracy_gitrev}.tar.gz -} +case "${XBPS_TARGET_MACHINE}" in + armv[67]*) nopie=yes ;; + *) configure_args+=" -Dpie" ;; +esac post_install() { vlicense LICENSE