diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-02-29 21:21:16 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-02-29 21:21:16 +0000 |
| commit | 7a4b108aea2740897048b181ce59b513f12ac18b (patch) | |
| tree | 2d991f86b1c7dde1f2ec867a29c3c39fbfcdf344 | |
| parent | 652788400072c6d373ffd483a884b1db4126b6ba (diff) | |
| download | midipix_build-7a4b108aea2740897048b181ce59b513f12ac18b.tar.bz2 midipix_build-7a4b108aea2740897048b181ce59b513f12ac18b.tar.xz | |
/251.native_packages_lib.group:libzip:${PKG_DEPENDS}: adds gnutls and libnettle (via midipix.)
vars/libzip.vars: provide {gnutls,libnettle} defines (via midipix.)
| -rw-r--r-- | groups/251.native_packages_lib.group | 2 | ||||
| -rw-r--r-- | vars/libzip.vars | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group index 0fc2ab3d..6bd20616 100644 --- a/groups/251.native_packages_lib.group +++ b/groups/251.native_packages_lib.group @@ -180,7 +180,7 @@ libudns libunistring libuv libvorbis libxml2 libxslt libz libzip"; : ${PKG_LIBZ_CONFIG_CACHE_LOCAL:="${CONFIG_CACHE_GNULIB}"}; : ${PKG_LIBZ_CONFIGURE_ARGS:="--host=${DEFAULT_TARGET} --prefix= --target=${DEFAULT_TARGET} --enable-shared"}; : ${PKG_LIBZ_MAKEFLAGS_INSTALL:="PREFIX= prefix="}; -: ${PKG_LIBZIP_DEPENDS:="bzip2 libz musl_fts"}; +: ${PKG_LIBZIP_DEPENDS:="bzip2 gnutls libnettle libz musl_fts"}; : ${PKG_LIBZIP_SHA256SUM:=a6cd804b4b3cffd997bd563fec693eb7eb052c225909a98a620689c2befb699b}; : ${PKG_LIBZIP_VERSION:=1.6.0}; : ${PKG_LIBZIP_URL:=https://libzip.org/download/libzip-${PKG_LIBZIP_VERSION}.tar.xz}; diff --git a/vars/libzip.vars b/vars/libzip.vars index 3c354121..43478f95 100644 --- a/vars/libzip.vars +++ b/vars/libzip.vars @@ -23,14 +23,18 @@ pkg_libzip_configure() { -DCMAKE_INSTALL_PREFIX= \ -DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}" \ -DCMAKE_SYSTEM_NAME="Midipix" \ - -DENABLE_GNUTLS=:BOOL=OFF \ + -DENABLE_GNUTLS=:BOOL=ON \ -DENABLE_MBEDTLS=:BOOL=OFF \ + -DGNUTLS_INCLUDE_DIR="${PKG_PREFIX}/include" \ + -DGNUTLS_LIBRARY="${PKG_PREFIX}/lib/libgnutls.lib.a" \ + -DLIBLZMA_INCLUDE_DIR="${PKG_PREFIX}/include" \ + -DLIBLZMA_LIBRARY="${PKG_PREFIX}/lib/liblzma.lib.a" \ + -DNETTLE_INCLUDE_DIR="${PKG_PREFIX}/include" \ + -DNETTLE_LIBRARY="${PKG_PREFIX}/lib/libnettle.lib.a" \ -DOPENSSL_CRYPTO_LIBRARY="${PKG_PREFIX}/lib/libcrypto.lib.a" \ -DOPENSSL_SSL_LIBRARY="${PKG_PREFIX}/lib/libssl.lib.a" \ -DZLIB_INCLUDE_DIR="${PKG_PREFIX}/include" \ -DZLIB_LIBRARY="${PKG_PREFIX}/lib/libz.a" \ - -DLIBLZMA_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DLIBLZMA_LIBRARY="${PKG_PREFIX}/lib/liblzma.lib.a" \ "../libzip-${PKG_VERSION}"; }; |