diff options
| author | Milan P. Stanić <mps@arvanta.net> | 2020-03-29 18:10:28 +0200 |
|---|---|---|
| committer | Milan P. Stanić <mps@arvanta.net> | 2020-03-30 10:06:34 +0000 |
| commit | 5990929247bbc1cc9227ed2f657d74f650896c83 (patch) | |
| tree | d71b95e251c90fa463b22a2c0b223dc2c6b5e05f /testing/zig | |
| parent | 74d52751bc515d98a676689f17ad7c5a92d047cd (diff) | |
| download | aports-5990929247bbc1cc9227ed2f657d74f650896c83.tar.bz2 aports-5990929247bbc1cc9227ed2f657d74f650896c83.tar.xz | |
testing/zig: upgrade to 0.5.0_20200329
build from git commit because llvm10 upgrade
remove fix-build.zig.patch, fixed upstream
remove zig-dev subpackage and package its content to zig package
clean-up APKBUILD
Diffstat (limited to 'testing/zig')
| -rw-r--r-- | testing/zig/APKBUILD | 21 | ||||
| -rw-r--r-- | testing/zig/fix-build.zig.patch | 41 |
2 files changed, 10 insertions, 52 deletions
diff --git a/testing/zig/APKBUILD b/testing/zig/APKBUILD index ea1b80b72d..fddd0a7ea2 100644 --- a/testing/zig/APKBUILD +++ b/testing/zig/APKBUILD @@ -1,20 +1,20 @@ # Contributor: Milan P. Stanić <mps@arvanta.net> # Maintainer: Milan P. Stanić <mps@arvanta.net> -pkgname="zig" -pkgver="0.5.0" +pkgname=zig +pkgver=0.5.0_git20200329 +_gitcommit=86795c03f918dbcc0fc06811cc7c496d275deae1 pkgrel=1 pkgdesc="general-purpose programming language designed for robustness, optimality, and maintainability" url="https://ziglang.org/" arch="x86_64" license="MIT" -options="!check" # works, but fail at the end, need to be fixed -makedepends="cmake clang-dev clang-libs llvm9-libs llvm-dev lld-dev libstdc++ - zlib-static libxml2-dev llvm9-static clang-static lld-static" -subpackages="$pkgname-dev" -source="https://ziglang.org/download/$pkgver/zig-$pkgver.tar.xz - fix-build.zig.patch" +provides="zig-dev=$pkgver-r$pkgrel" +options="!check" # works, but fail at the end, need to be fixed +makedepends="cmake clang-dev clang-libs llvm10-libs llvm-dev lld-dev libstdc++ + zlib-static libxml2-dev llvm10-static clang-static lld-static" +source="$pkgname-$pkgver.tar.gz::https://github.com/ziglang/zig/archive/$_gitcommit.tar.gz" -builddir="$srcdir"/$pkgname-$pkgver +builddir="$srcdir"/zig-$_gitcommit build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -50,5 +50,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1ce479077d2501c160bcac318b3d59e66921207855f56d900b9a59c44b14116639de10c5b578663b4963ccc8d49bb0d5aa75afb8987f5df1950037248561d1e2 zig-0.5.0.tar.xz -9972f52663c061df59363215e1624773d28a1a85c473250f0e16b78d59c6f9e8987267e55148609b0cbad5f722d365aad7554d7f547060c377edd91dd371ff82 fix-build.zig.patch" +sha512sums="f8d0f43eae4cae0b1def537f12514830764b354592ce6e5292e6fb73ff56fc8e07ba59fdf8e7995d48a14c8682e70ce28c271cc395e2f99f0f2415edb9944434 zig-0.5.0_git20200329.tar.gz" diff --git a/testing/zig/fix-build.zig.patch b/testing/zig/fix-build.zig.patch deleted file mode 100644 index fa6f45448a..0000000000 --- a/testing/zig/fix-build.zig.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/build.zig b/build.zig -index 390f1594..ca78bdf1 100644 ---- a/build.zig -+++ b/build.zig -@@ -373,6 +373,7 @@ fn addLibUserlandStep(b: *Builder, mode: builtin.Mode) void { - artifact.bundle_compiler_rt = true; - artifact.setTarget(builtin.arch, builtin.os, builtin.abi); - artifact.setBuildMode(mode); -+ artifact.force_pic = true; - if (mode != .Debug) { - artifact.strip = true; - } -diff --git a/lib/std/build.zig b/lib/std/build.zig -index c640f6e8..cc062f3a 100644 ---- a/lib/std/build.zig -+++ b/lib/std/build.zig -@@ -1488,6 +1488,9 @@ pub const LibExeObjStep = struct { - - dynamic_linker: ?[]const u8 = null, - -+ /// Position Independent Code -+ force_pic: ?bool = null, -+ - const LinkObject = union(enum) { - StaticPath: []const u8, - OtherStep: *LibExeObjStep, -@@ -2314,6 +2317,14 @@ pub const LibExeObjStep = struct { - try zig_args.append(builder.pathFromRoot(dir)); - } - -+ if (self.force_pic) |pic| { -+ if (pic) { -+ try zig_args.append("-fPIC"); -+ } else { -+ try zig_args.append("-fno-PIC"); -+ } -+ } -+ - if (self.kind == Kind.Test) { - try builder.spawnChild(zig_args.toSliceConst()); - } else { |