Date: Tuesday, May 16, 2023 @ 11:18:29 Author: arojas Revision: 1461953
upgpkg: haxe 4.3.1-2: mbedtls2 rebuild Added: haxe/trunk/mbedtls2.patch Modified: haxe/trunk/PKGBUILD ----------------+ PKGBUILD | 15 ++++++++++----- mbedtls2.patch | 26 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-05-16 11:08:20 UTC (rev 1461952) +++ PKGBUILD 2023-05-16 11:18:29 UTC (rev 1461953) @@ -7,17 +7,19 @@ pkgname=haxe pkgver=4.3.1 -pkgrel=1 +pkgrel=2 pkgdesc='Cross-platform toolkit and programming language' arch=(x86_64) url='https://haxe.org/' license=(GPL LGPL MIT) -depends=(neko mbedtls) +depends=(neko mbedtls2) makedepends=(camlp5 git neko ocaml opam zlib perl-string-shellquote perl-ipc-system-simple) optdepends=(java-environment mono php python) options=(!strip) -source=("$pkgname-$pkgver::git+https://github.com/HaxeFoundation/haxe#commit=964c84c817b3a73c49ee35207983d1c8cbca6eb8";) # tag: 4.3.1 -b2sums=('SKIP') +source=("$pkgname-$pkgver::git+https://github.com/HaxeFoundation/haxe#commit=964c84c817b3a73c49ee35207983d1c8cbca6eb8"; + mbedtls2.patch) # tag: 4.3.1 +b2sums=('SKIP' + '77f5f9c6815934b5cf2aee75ba62ed0e2a4b46f23a5bb689dffa23469b4aa13ca6d0e94623c747af63450b2ea3dc57f54507a924f1d6cec1cab3368d74def211') prepare() { cd $pkgname-$pkgver @@ -33,6 +35,9 @@ # Create the script that will be placed in /etc/profile.d echo 'export HAXE_STD_PATH=/usr/share/haxe/std' > haxe.sh + + # Build with mbedtls2 + patch -p1 -i ../mbedtls2.patch } build() { @@ -40,7 +45,7 @@ eval $(opam env --switch=ocaml-system) cd $pkgname-$pkgver - make libs haxe + make haxe # "make tools" did not work. These are the replacement commands: cd "$srcdir/$pkgname-$pkgver/extra/haxelib_src" Added: mbedtls2.patch =================================================================== --- mbedtls2.patch (rev 0) +++ mbedtls2.patch 2023-05-16 11:18:29 UTC (rev 1461953) @@ -0,0 +1,26 @@ +diff --git a/Makefile b/Makefile +index a369415b0..7ae5064ec 100644 +--- a/Makefile ++++ b/Makefile +@@ -66,7 +66,7 @@ NEKO_VERSION_TAG=v$(shell echo "$(NEKO_VERSION)" | sed "s/\./-/g") + ifneq ($(STATICLINK),0) + LIB_PARAMS= -cclib '-Wl,-Bstatic -lpcre2-8 -lz -lmbedtls -lmbedx509 -lmbedcrypto -Wl,-Bdynamic ' + else +- LIB_PARAMS?= -cclib -lpcre2-8 -cclib -lz -cclib -lmbedtls -cclib -lmbedx509 -cclib -lmbedcrypto ++ LIB_PARAMS?= -ccopt -L/usr/lib/mbedtls2 -cclib -lpcre2-8 -cclib -lz -cclib -lmbedtls -cclib -lmbedx509 -cclib -lmbedcrypto + endif + ifeq ($(SYSTEM_NAME),Mac) + LIB_PARAMS+= -cclib '-framework Security -framework CoreFoundation' +diff --git a/libs/mbedtls/dune b/libs/mbedtls/dune +index ca0780ddd..1fc9a5704 100644 +--- a/libs/mbedtls/dune ++++ b/libs/mbedtls/dune +@@ -4,6 +4,7 @@ + (name mbedtls) + (foreign_stubs + (language c) +- (names mbedtls_stubs)) ++ (names mbedtls_stubs) ++ (flags (:standard -I/usr/include/mbedtls2))) + (wrapped false) + )
