Skip to content

Commit 04a1cd7

Browse files
authored
Move application.mk away from zig-master package
1 parent 050a0c6 commit 04a1cd7

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

pkgsrc/lang/zig-0.14.0/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
## https://ziglang.org/builds/zig-0.14.0-dev.3462+edabcf619.tar.xz
77
## then this value would be: zig-0.14.0-dev.3462+edabcf619
88
## Meaning, filename minus the .tar.xz extension.
9+
## If any pkgsrc package you need depends on application.mk, e.g. zls,
10+
## changes might be needed on application.mk file as well.
911
DISTNAME= zig-0.14.0
1012
## Want to make this (a) a separate package than lang/zig and (b) we
1113
## want to be able to install different commits of the same version.
@@ -23,7 +25,7 @@ APPEND_VER= ${DISTNAME:S/zig-//:S/.//g:S/-//}
2325
## e.g. "zig-isolated0140" or "zig-isolated0140dev3462+edabcf619". Both
2426
## should be able to be installed at the same time.
2527
PKGNAME= ${DISTNAME:S/zig-/zig-isolated${APPEND_VER}-/}
26-
PKGREVISION= 2
28+
PKGREVISION= 3
2729
CATEGORIES= lang
2830
## https://ziglang.org/builds/ is the official
2931
MASTER_SITES= https://ziglang.org/builds/

pkgsrc/lang/zig-0.14.0/application.mk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ ZIGTESTARGS?=
2727
ZIGPIE?= yes
2828
ZIGSTRIP?= yes
2929

30-
TOOL_DEPENDS+= zig-master-[0-9]*:../../lang/zig-master
30+
TOOL_DEPENDS+= zig-isolated[0-9]*:../../lang/zig-0.14.0
3131
USE_LANGUAGES= c
3232

3333
MAKE_ENV+= ZIG_GLOBAL_CACHE_DIR=${WRKDIR}/zig-master-global-cache
@@ -61,15 +61,15 @@ post-extract: zig-vendor-packages
6161
.PHONY: zig-vendor-packages
6262
zig-vendor-packages:
6363
.for pkg in ${ZIG_PACKAGE_DEPENDS}
64-
${RUN} ${PREFIX}/bin/zig-master fetch --global-cache-dir ${WRKDIR}/zig-master-global-cache ${pkg}
64+
${RUN} ${PREFIX}/bin/zig-0.14.0 fetch --global-cache-dir ${WRKDIR}/zig-master-global-cache ${pkg}
6565
.endfor
6666

6767

6868
do-build:
69-
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} zig-master build ${ZIGBUILDMODE} ${ZIGCPUMODE} ${ZIGBUILDARGS} --prefix ${DESTDIR}${PREFIX}/zig-master
69+
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} zig-0.14.0 build ${ZIGBUILDMODE} ${ZIGCPUMODE} ${ZIGBUILDARGS} --prefix ${DESTDIR}${PREFIX}/zig-0.14.0
7070

7171
do-install:
72-
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} zig-master build install ${ZIGBUILDMODE} ${ZIGCPUMODE} ${ZIGBUILDARGS} --prefix ${DESTDIR}${PREFIX}/zig-master
72+
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} zig-0.14.0 build install ${ZIGBUILDMODE} ${ZIGCPUMODE} ${ZIGBUILDARGS} --prefix ${DESTDIR}${PREFIX}/zig-0.14.0
7373

7474
do-test:
75-
cd ${WRKSRC} && ${SETENV} ${TEST_ENV} zig-master build ${ZIGBUILDMODE} ${ZIGBUILDARGS} ${ZIGCPUMODE} ${ZIGTESTARGS} test
75+
cd ${WRKSRC} && ${SETENV} ${TEST_ENV} zig-0.14.0 build ${ZIGBUILDMODE} ${ZIGBUILDARGS} ${ZIGCPUMODE} ${ZIGTESTARGS} test

0 commit comments

Comments
 (0)