Date: Monday, September 30, 2019 @ 22:20:35 Author: daurnimator Revision: 512297
upgpkg: zig 0.5.0-1 update to 0.5.0 Modified: zig/trunk/PKGBUILD Deleted: zig/trunk/force_dynamic_llvm.patch zig/trunk/no_stage2_artifacts.patch ---------------------------+ PKGBUILD | 38 ++++++++++++++++++-------------------- force_dynamic_llvm.patch | 16 ---------------- no_stage2_artifacts.patch | 20 -------------------- 3 files changed, 18 insertions(+), 56 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-09-30 21:19:43 UTC (rev 512296) +++ PKGBUILD 2019-09-30 22:20:35 UTC (rev 512297) @@ -2,29 +2,20 @@ # Contributor: Marc Tiehuis <[email protected]> pkgname=zig -pkgver=0.4.0 +pkgver=0.5.0 pkgrel=1 -pkgdesc='a programming language prioritizing robustness, optimality, and maintainability' +pkgdesc='a general-purpose programming language designed for robustness, optimality, and maintainability' arch=('x86_64') url='https://ziglang.org/' license=('MIT') depends=('clang' 'llvm-libs' 'lld') makedepends=('cmake' 'llvm') -source=("https://ziglang.org/download/$pkgver/zig-$pkgver.tar.xz"; - 'force_dynamic_llvm.patch' - 'no_stage2_artifacts.patch') -sha256sums=('fec1f3f6b359a3d942e0a7f9157b3b30cde83927627a0e1ea95c54de3c526cfc' - '986ffeb8f53c4b1651dcf8d252e5a5ffe85243b2dccc211c4ca972522eabd015' - '487546991703485d688413546ad36f334019c51c5a4a20f7ab750a521cb03f9b') +source=("https://ziglang.org/download/$pkgver/zig-$pkgver.tar.xz";) +sha256sums=('55ae16960f152bcb9cf98b4f8570902d0e559a141abf927f0d3555b7cc838a31') -prepare() { +build() { cd "$pkgname-$pkgver" - patch -Np1 -i "../force_dynamic_llvm.patch" - patch -Np1 -i "../no_stage2_artifacts.patch" -} -build() { - cd "$pkgname-$pkgver" mkdir -p build cd build # The zig CMakeLists uses build type Debug if not set @@ -37,6 +28,7 @@ -DCMAKE_BUILD_TYPE=None \ -DCMAKE_INSTALL_PREFIX=/usr \ -DZIG_FORCE_EXTERNAL_LLD=ON \ + -DZIG_SKIP_INSTALL_LIB_FILES=ON \ .. make } @@ -44,16 +36,22 @@ check() { cd "$pkgname-$pkgver/build" - # test suite requires zig to be installed first - # https://github.com/ziglang/zig/issues/2221 - - # For now, just check the version subcommand works - ./zig version + ./zig build test } package() { cd "$pkgname-$pkgver" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - make -C build DESTDIR="$pkgdir" install + cd build + # Need to re-configure so lib files are installed. + # See https://github.com/ziglang/zig/issues/2221#issuecomment-535335570 + cmake \ + -DCMAKE_BUILD_TYPE=None \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DZIG_FORCE_EXTERNAL_LLD=ON \ + -DZIG_SKIP_INSTALL_LIB_FILES=OFF \ + .. + make DESTDIR="$pkgdir" install } Deleted: force_dynamic_llvm.patch =================================================================== --- force_dynamic_llvm.patch 2019-09-30 21:19:43 UTC (rev 512296) +++ force_dynamic_llvm.patch 2019-09-30 22:20:35 UTC (rev 512297) @@ -1,16 +0,0 @@ - cmake/Findllvm.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/Findllvm.cmake b/cmake/Findllvm.cmake -index 9a4fa3f3..64e31fc0 100644 ---- a/cmake/Findllvm.cmake -+++ b/cmake/Findllvm.cmake -@@ -15,7 +15,7 @@ find_program(LLVM_CONFIG_EXE - "c:/msys64/mingw64/bin" - "C:/Libraries/llvm-7.0.0/bin") - --if(NOT(CMAKE_BUILD_TYPE STREQUAL "Debug") OR ZIG_STATIC) -+if(false) - execute_process( - COMMAND ${LLVM_CONFIG_EXE} --libfiles --link-static - OUTPUT_VARIABLE LLVM_LIBRARIES_SPACES Deleted: no_stage2_artifacts.patch =================================================================== --- no_stage2_artifacts.patch 2019-09-30 21:19:43 UTC (rev 512296) +++ no_stage2_artifacts.patch 2019-09-30 22:20:35 UTC (rev 512297) @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bda57634..52599838 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -254,7 +254,6 @@ else() - embedded_lld_wasm - embedded_lld_lib - ) -- install(TARGETS embedded_lld_elf embedded_lld_coff embedded_lld_mingw embedded_lld_wasm embedded_lld_lib DESTINATION "${ZIG_CPP_LIB_DIR}") - endif() - - # No patches have been applied to SoftFloat-3e -@@ -775,7 +774,6 @@ if(MSVC OR MINGW) - target_link_libraries(zig LINK_PUBLIC version) - endif() - install(TARGETS zig DESTINATION bin) --install(TARGETS zig_cpp DESTINATION "${ZIG_CPP_LIB_DIR}") - - foreach(file ${ZIG_C_HEADER_FILES}) - get_filename_component(file_dir "${C_HEADERS_DEST}/${file}" DIRECTORY)
