diff options
author | Marc Tiehuis <marctiehuis@gmail.com> | 2018-03-28 18:19:36 +1300 |
---|---|---|
committer | Marc Tiehuis <marctiehuis@gmail.com> | 2018-03-28 18:19:36 +1300 |
commit | a856ef9fea0d608227922d8b614a4a1fbd280628 (patch) | |
tree | be47445e8484d07a25d863af95501fecaf50f6a4 | |
parent | Pin commit to last LLVM5 supported version (diff) | |
download | zig-git-a856ef9fea0d608227922d8b614a4a1fbd280628.tar.xz |
Update to HEAD
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 32 | ||||
-rw-r--r-- | force_dynamic_llvm.patch | 13 |
3 files changed, 29 insertions, 22 deletions
@@ -1,6 +1,6 @@ pkgbase = zig-git pkgdesc = a programming language prioritizing robustness, optimality, and clarity - pkgver = 0.1.1r2346.2e010c60 + pkgver = 0.2.0r2479.5b00dee0 pkgrel = 1 url = http://ziglang.org arch = i686 @@ -9,9 +9,11 @@ pkgbase = zig-git makedepends = cmake depends = llvm depends = clang + depends = libxml2 + depends = zlib provides = zig conflicts = zig - source = git://github.com/zig-lang/zig.git#commit=2e010c60ae006944ae20ab8b3445598471c9f1e8 + source = git://github.com/zig-lang/zig.git md5sums = SKIP pkgname = zig-git @@ -1,22 +1,27 @@ # Maintainer: Marc Tiehuis <marctiehuis at gmail.com> pkgname=zig-git -pkgver=0.1.1r2346.2e010c60 +pkgver=0.2.0r2479.5b00dee0 pkgrel=1 pkgdesc="a programming language prioritizing robustness, optimality, and clarity" arch=('i686' 'x86_64') url='http://ziglang.org' license=('MIT') -depends=('llvm' 'clang') +depends=('llvm' 'clang' 'libxml2' 'zlib') makedepends=('cmake') provides=(zig) conflicts=(zig) -source=("git://github.com/zig-lang/zig.git#commit=2e010c60ae006944ae20ab8b3445598471c9f1e8") +source=("git://github.com/zig-lang/zig.git") md5sums=('SKIP') +prepare() { + cd "$srcdir/$provides" + patch -Np1 -i "$srcdir/../force_dynamic_llvm.patch" +} + pkgver() { cd "$srcdir/$provides" - printf "0.1.1r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + printf "0.2.0r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } build() { @@ -33,23 +38,10 @@ build() { } check() { - # We rebuild and install into a new local directory so we can test the - # stdlib before installing. The `--zig-install-prefix` option does not work - # as expected with the `build` command right now so, hence the workaround. - cd "$srcdir/$provides" - mkdir -p build_test - cd build_test - cmake .. \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_EXE_LINKER_FLAGS="-lcurses -ltinfo" \ - -DCMAKE_INSTALL_PREFIX=$(pwd) \ - -DZIG_LIBC_LIB_DIR=$(dirname $(cc -print-file-name=crt1.o)) \ - -DZIG_LIBC_INCLUDE_DIR=$(echo -n | cc -E -x c - -v 2>&1 | grep -B1 "End of search list." | head -n1 | cut -c 2- | sed "s/ .*//") \ - -DZIG_LIBC_STATIC_LIB_DIR=$(dirname $(cc -print-file-name=crtbegin.o)) - make install + cd "$srcdir/$provides/build" - cd "$srcdir/$provides/build_test" - ./zig build --build-file ../build.zig test + # omit full compiler test since it takes ages + ./zig version } package() { diff --git a/force_dynamic_llvm.patch b/force_dynamic_llvm.patch new file mode 100644 index 0000000..a2f533c --- /dev/null +++ b/force_dynamic_llvm.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/Findllvm.cmake b/cmake/Findllvm.cmake +index 296e0a91..82b435af 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-6.0.0/bin") + +-if(NOT(CMAKE_BUILD_TYPE STREQUAL "Debug")) ++if(false) + execute_process( + COMMAND ${LLVM_CONFIG_EXE} --libfiles --link-static + OUTPUT_VARIABLE LLVM_LIBRARIES_SPACES |