summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Tiehuis2019-05-01 21:10:15 +1200
committerMarc Tiehuis2019-05-01 21:10:15 +1200
commitf35978d074dc9c7e461ee998f0c08a9c749aa146 (patch)
tree32bc013e34afff09b9ac75b9c7dbf0a8154ca8fa
parent74dfce9e012ea98c6589ddf0910560442dd2fccc (diff)
downloadaur-f35978d074dc9c7e461ee998f0c08a9c749aa146.tar.gz
Remove stage2 artifact patch
This is now fixed upstream.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD7
-rw-r--r--no_stage2_artifacts.patch23
3 files changed, 4 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ea5e7bc2d4a5..df25e51396f3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = zig-git
pkgdesc = a programming language prioritizing robustness, optimality, and clarity
- pkgver = 0.4.0.r83.g1030cc97
+ pkgver = 0.4.0.r184.g40fe6afd
pkgrel = 1
url = http://ziglang.org
arch = i686
@@ -14,10 +14,8 @@ pkgbase = zig-git
conflicts = zig
source = git://github.com/zig-lang/zig.git
source = force_dynamic_llvm.patch
- source = no_stage2_artifacts.patch
md5sums = SKIP
md5sums = 9a935ede50ab8f1a789349fc3b760c1c
- md5sums = 84fdaa44cae56d85ee4604a95fa2ccd7
pkgname = zig-git
diff --git a/PKGBUILD b/PKGBUILD
index 6c0d597b4a5c..98930fe29a69 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Marc Tiehuis <marctiehuis at gmail.com>
pkgname=zig-git
-pkgver=0.4.0.r83.g1030cc97
+pkgver=0.4.0.r184.g40fe6afd
pkgrel=1
pkgdesc="a programming language prioritizing robustness, optimality, and clarity"
arch=('i686' 'x86_64')
@@ -11,13 +11,12 @@ depends=('clang' 'llvm')
makedepends=('cmake' 'git')
provides=(zig)
conflicts=(zig)
-source=("git://github.com/zig-lang/zig.git" 'force_dynamic_llvm.patch' 'no_stage2_artifacts.patch')
-md5sums=('SKIP' '9a935ede50ab8f1a789349fc3b760c1c' '84fdaa44cae56d85ee4604a95fa2ccd7')
+source=("git://github.com/zig-lang/zig.git" 'force_dynamic_llvm.patch')
+md5sums=('SKIP' '9a935ede50ab8f1a789349fc3b760c1c')
prepare() {
cd "$srcdir/$provides"
patch -Np1 -i "$srcdir/force_dynamic_llvm.patch"
- patch -Np1 -i "$srcdir/no_stage2_artifacts.patch"
}
pkgver() {
diff --git a/no_stage2_artifacts.patch b/no_stage2_artifacts.patch
deleted file mode 100644
index 76c25be374a0..000000000000
--- a/no_stage2_artifacts.patch
+++ /dev/null
@@ -1,23 +0,0 @@
- CMakeLists.txt | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f70f79c1..13b3b676 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -257,7 +257,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
-@@ -6640,7 +6639,6 @@ add_library(zig_cpp STATIC ${ZIG_CPP_SOURCES})
- set_target_properties(zig_cpp PROPERTIES
- COMPILE_FLAGS ${EXE_CFLAGS}
- )
--install(TARGETS zig_cpp DESTINATION "${ZIG_CPP_LIB_DIR}")
-
- add_library(opt_c_util STATIC ${OPTIMIZED_C_SOURCES})
- set_target_properties(opt_c_util PROPERTIES