Date: Saturday, April 29, 2023 @ 21:14:57 Author: alucryd Revision: 1454804
neko 2.3.0-8: mbedtls rebuild Added: neko/trunk/neko-mbedtls2.patch Modified: neko/trunk/PKGBUILD ---------------------+ PKGBUILD | 9 +++++--- neko-mbedtls2.patch | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-04-29 20:56:59 UTC (rev 1454803) +++ PKGBUILD 2023-04-29 21:14:57 UTC (rev 1454804) @@ -9,18 +9,20 @@ pkgname=neko pkgver=2.3.0 -pkgrel=7 +pkgrel=8 pkgdesc='High-level dynamically typed programming language' url='https://nekovm.org/' license=(LGPL) arch=(x86_64) -depends=(gc gtk3 mariadb-libs mbedtls sqlite) -makedepends=(apache apr cmake git mbedtls ninja) +depends=(gc gtk3 mariadb-libs mbedtls2 sqlite) +makedepends=(apache apr cmake git ninja) optdepends=('apache: for extending Apache with mod_neko') options=(!strip) source=(2023-04-10.patch + neko-mbedtls2.patch "git+https://github.com/HaxeFoundation/neko#commit=ff67a696a718cba0a6bc0ec583e355272b4a5923";) # tag: v2-3-0 b2sums=('83a08288938a294dbcd2e6c91e7912989332807375173a5f6c11ec818e3e8bad59e0f4826a6743a6a3802b4faa0c85837424a20a314c7cb9a596367283aaf564' + 'ea9c86b2f6ac8e943f0c70406a73a055468e71de8740adc2116e0cfd9e68d08ac0d071ce94119a52954fed08319176308395ae20715ce7bd0d38fb538c95f765' 'SKIP') prepare() { @@ -27,6 +29,7 @@ cd $pkgname sed -i '/xlocale.h/d' libs/std/sys.c patch -p1 -i ../2023-04-10.patch + patch -p1 -i ../neko-mbedtls2.patch } build() { Added: neko-mbedtls2.patch =================================================================== --- neko-mbedtls2.patch (rev 0) +++ neko-mbedtls2.patch 2023-04-29 21:14:57 UTC (rev 1454804) @@ -0,0 +1,56 @@ +diff '--color=auto' -rupN neko.orig/cmake/FindMbedTLS.cmake neko/cmake/FindMbedTLS.cmake +--- neko.orig/cmake/FindMbedTLS.cmake 2023-04-29 23:08:34.034264531 +0200 ++++ neko/cmake/FindMbedTLS.cmake 2023-04-29 23:09:24.109014460 +0200 +@@ -2,37 +2,37 @@ + + find_path(MBEDTLS_INCLUDE_DIR + NAMES mbedtls/ssl.h +- PATH_SUFFIXES include ++ PATH_SUFFIXES include/mbedtls2 + HINTS ${MBEDTLS_ROOT}) + + find_library(MBEDTLS_LIBRARY + NAMES mbedtls +- PATH_SUFFIXES lib ++ PATH_SUFFIXES lib/mbedtls2 + HINTS ${MBEDTLS_ROOT}) + + find_library(MBEDCRYPTO_LIBRARY + NAMES mbedcrypto +- PATH_SUFFIXES lib ++ PATH_SUFFIXES lib/mbedtls2 + HINTS ${MBEDTLS_ROOT}) + + find_library(MBEDX509_LIBRARY + NAMES mbedx509 +- PATH_SUFFIXES lib ++ PATH_SUFFIXES lib/mbedtls2 + HINTS ${MBEDTLS_ROOT}) + + find_library(MBEDTLS_STATIC_LIBRARY + NAMES libmbedtls.a +- PATH_SUFFIXES lib ++ PATH_SUFFIXES lib/mbedtls2 + HINTS ${MBEDTLS_ROOT}) + + find_library(MBEDCRYPTO_STATIC_LIBRARY + NAMES libmbedcrypto.a +- PATH_SUFFIXES lib ++ PATH_SUFFIXES lib/mbedtls2 + HINTS ${MBEDTLS_ROOT}) + + find_library(MBEDX509_STATIC_LIBRARY + NAMES libmbedx509.a +- PATH_SUFFIXES lib ++ PATH_SUFFIXES lib/mbedtls2 + HINTS ${MBEDTLS_ROOT}) + + if(MBEDTLS_INCLUDE_DIR) +@@ -60,4 +60,4 @@ else() + endif() + endif() + +-mark_as_advanced(MBEDTLS_INCLUDE_DIR MBEDTLS_LIBRARY) +\ No newline at end of file ++mark_as_advanced(MBEDTLS_INCLUDE_DIR MBEDTLS_LIBRARY) +
