Alexander Rødseth pushed to branch main at Arch Linux / Packaging / Packages /
haxe
Commits:
bc8511fb by Tobi Laskowski at 2024-05-05T21:04:31+00:00
Fix broken haxelib binary
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + make-haxelib.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -23,10 +23,14 @@ pkgbase = haxe
optdepends = python
options = !strip
source = mbedtls2.patch
- source =
haxelib_src::git+https://github.com/HaxeFoundation/haxelib#commit=98637027327d8cf385d302acaaf104bd6107d2bf
+ source = make-haxelib.patch
+ source =
haxelib_src::git+https://github.com/HaxeFoundation/haxelib#commit=f17fffa97554b1bdba37750e3418051f017a5bc2
+ source =
hx3compat::git+https://github.com/HaxeFoundation/hx3compat#commit=f1f18201e5c0479cb5adf5f6028788b37f37b730
source =
haxe-4.3.4::git+https://github.com/HaxeFoundation/haxe#commit=dc1a43dc52f98b9c480f68264885c6155e570f3e
b2sums =
77f5f9c6815934b5cf2aee75ba62ed0e2a4b46f23a5bb689dffa23469b4aa13ca6d0e94623c747af63450b2ea3dc57f54507a924f1d6cec1cab3368d74def211
- b2sums =
3723db38971ba219cfc2b691e56ffe338f6960da6cae77427fc06da8ca62f97f6fb620a72ef462b2d013413501fcfd3861094851a1202e24be219e728ef6746b
+ b2sums =
5c1c2a2ffee878fbe88ff4b93df8c23471bfbc46bcd7e6df8e42f952812b050228ab2aa777cec6598b531a724f2a518dde71f5611c9eec28e83d21d382b9457e
+ b2sums =
a3a6afac931c942c2c823801d1b0e4344657a7316e1014cc2abe43416980607f54b29b2d0989eedbf57d2d4e507a69bee604a20305dd2ef18ba96ecf4e73d38d
+ b2sums =
b938572cefb9a4398e0076b4450fd681d9d15be978fe3865d16aa26984ef6265965f18a97f93f8b1f6e589b75814ad1c19b60c5c8817b0deb07a41239fc19341
b2sums =
65680cb33615ac81eed1e81b2f4ef5a75332fa0b084535f4b9bc5039adb19311a11620ce204cc2430ae80a461c0a0f1034269fe4757c9e8cfe92fdda38a0fd1e
pkgname = haxe
=====================================
PKGBUILD
=====================================
@@ -10,7 +10,10 @@ pkgver=4.3.4
pkgrel=2
# The haxelib git submodule commit hash can be found here:
# https://github.com/HaxeFoundation/haxe/tree/4.3.4/extra
-_haxelib_commit=98637027327d8cf385d302acaaf104bd6107d2bf
+_haxelib_commit=f17fffa97554b1bdba37750e3418051f017a5bc2
+# Once you have the haxelib submodule commit, go to that haxelib commit
+# to get the hx3compat submodule commit hash
+_hx3compat_commit=f1f18201e5c0479cb5adf5f6028788b37f37b730
pkgdesc='Cross-platform toolkit and programming language'
arch=(x86_64)
url='https://haxe.org/'
@@ -20,10 +23,14 @@ makedepends=(camlp5 git neko ocaml opam zlib
perl-string-shellquote perl-ipc-sys
optdepends=(java-environment mono php python)
options=(!strip)
source=(mbedtls2.patch
+ make-haxelib.patch
"haxelib_src::git+https://github.com/HaxeFoundation/haxelib#commit=$_haxelib_commit";
+
"hx3compat::git+https://github.com/HaxeFoundation/hx3compat#commit=$_hx3compat_commit";
"$pkgname-$pkgver::git+https://github.com/HaxeFoundation/haxe#commit=dc1a43dc52f98b9c480f68264885c6155e570f3e";)
# tag: 4.3.4
b2sums=('77f5f9c6815934b5cf2aee75ba62ed0e2a4b46f23a5bb689dffa23469b4aa13ca6d0e94623c747af63450b2ea3dc57f54507a924f1d6cec1cab3368d74def211'
-
'3723db38971ba219cfc2b691e56ffe338f6960da6cae77427fc06da8ca62f97f6fb620a72ef462b2d013413501fcfd3861094851a1202e24be219e728ef6746b'
+
'5c1c2a2ffee878fbe88ff4b93df8c23471bfbc46bcd7e6df8e42f952812b050228ab2aa777cec6598b531a724f2a518dde71f5611c9eec28e83d21d382b9457e'
+
'a3a6afac931c942c2c823801d1b0e4344657a7316e1014cc2abe43416980607f54b29b2d0989eedbf57d2d4e507a69bee604a20305dd2ef18ba96ecf4e73d38d'
+
'b938572cefb9a4398e0076b4450fd681d9d15be978fe3865d16aa26984ef6265965f18a97f93f8b1f6e589b75814ad1c19b60c5c8817b0deb07a41239fc19341'
'65680cb33615ac81eed1e81b2f4ef5a75332fa0b084535f4b9bc5039adb19311a11620ce204cc2430ae80a461c0a0f1034269fe4757c9e8cfe92fdda38a0fd1e')
prepare() {
@@ -32,6 +39,9 @@ prepare() {
rm -rf extra/haxelib_src
cp -rv "$srcdir/haxelib_src" extra/
+ rm -rf extra/haxelib_src/hx3compat
+ cp -rv "$srcdir/hx3compat" extra/haxelib_src
+
# Prepare opam and ocamlfind before building
export HOME="$srcdir"
opam init -a --disable-sandboxing --compiler=ocaml-system
@@ -45,6 +55,8 @@ prepare() {
# Build with mbedtls2
patch -p1 -i ../mbedtls2.patch
+ # Fix broken haxelib binary
+ patch -p1 -i ../make-haxelib.patch
}
build() {
@@ -54,13 +66,7 @@ build() {
eval $(opam env --switch=ocaml-system)
export OCAMLPARAM="_,w=-a"
- make haxe
-
- # "make tools" did not work. These are the replacement commands:
- cd "$srcdir/$pkgname-$pkgver/extra/haxelib_src"
- ../../haxe client.hxml || true
- nekotools boot run.n
- mv run ../../haxelib
+ make
}
check() {
=====================================
make-haxelib.patch
=====================================
@@ -0,0 +1,17 @@
+diff --git a/Makefile b/Makefile
+index a369415b0..632744313 100644
+--- a/Makefile
++++ b/Makefile
+@@ -106,8 +106,10 @@ endif
+
+ # haxelib should depends on haxe, but we don't want to do that...
+ haxelib:
+- (cd $(CURDIR)/extra/haxelib_src && $(CURDIR)/$(HAXE_OUTPUT) client.hxml
&& nekotools boot run.n)
+- mv extra/haxelib_src/run$(EXTENSION) $(HAXELIB_OUTPUT)
++ cd $(CURDIR)/extra/haxelib_src && \
++ HAXE_STD_PATH=$(CURDIR)/std $(CURDIR)/$(HAXE_OUTPUT) client.hxml && \
++ nekotools boot -c run.n
++ ${CC} $(CURDIR)/extra/haxelib_src/run.c -o $(HAXELIB_OUTPUT) -lneko
+
+ tools: haxelib
+
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/haxe/-/commit/bc8511fb92b850904d137995f384a2d746468f36
--
This project does not include diff previews in email notifications.
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/haxe/-/commit/bc8511fb92b850904d137995f384a2d746468f36
You're receiving this email because of your account on gitlab.archlinux.org.
