From 5b2d2d7b1acd12e954f52c35604af189aa54552e Mon Sep 17 00:00:00 2001 From: Astrum-polaris Date: Fri, 28 May 2021 01:07:05 +0800 Subject: [PATCH] nghttp2: update to 1.43.0 separate static and shared builds --- mingw-w64-nghttp2/PKGBUILD | 41 ++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/mingw-w64-nghttp2/PKGBUILD b/mingw-w64-nghttp2/PKGBUILD index d4e3289750..d48ed2a2c8 100644 --- a/mingw-w64-nghttp2/PKGBUILD +++ b/mingw-w64-nghttp2/PKGBUILD @@ -3,7 +3,7 @@ _realname=nghttp2 pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=1.41.0 +pkgver=1.43.0 pkgrel=1 pkgdesc="Framing layer of HTTP/2 is implemented as a reusable C library (mingw-w64)" arch=('any') @@ -11,33 +11,49 @@ mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') url='https://nghttp2.org/' depends=("${MINGW_PACKAGE_PREFIX}-jansson" "${MINGW_PACKAGE_PREFIX}-jemalloc" - #"${MINGW_PACKAGE_PREFIX}-libevent" - #"${MINGW_PACKAGE_PREFIX}-libxml2" + "${MINGW_PACKAGE_PREFIX}-libxml2" "${MINGW_PACKAGE_PREFIX}-openssl" "${MINGW_PACKAGE_PREFIX}-c-ares") checkdepends=("${MINGW_PACKAGE_PREFIX}-cunit") license=('MIT') source=("https://github.com/nghttp2/nghttp2/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.xz") -sha256sums=('abc25b8dc601f5b3fefe084ce50fcbdc63e3385621bee0cbfa7b57f9ec3e67c2') +sha256sums=('f7d54fa6f8aed29f695ca44612136fa2359013547394d5dffeffca9e01a26b0f') prepare() { cd $srcdir/${_realname}-${pkgver} } build() { - [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH} - mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH} # Note, cmake system does not yet work well with this. + [[ -d "${srcdir}/build-shared-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-shared-${MINGW_CHOST}" + mkdir -p "${srcdir}/build-shared-${MINGW_CHOST}" && cd "${srcdir}/build-shared-${MINGW_CHOST}" + ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ - --enable-static \ + --enable-hpack-tools \ --enable-shared \ - --disable-python-bindings \ + --disable-static \ --disable-examples \ - --enable-hpack-tools=yes + --disable-python-bindings + + make + + [[ -d "${srcdir}/build-static-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-static-${MINGW_CHOST}" + mkdir -p "${srcdir}/build-static-${MINGW_CHOST}" && cd "${srcdir}/build-static-${MINGW_CHOST}" + + export CPPFLAGS="$CPPFLAGS -DLIBXML_STATIC -DNGHTTP2_STATICLIB" + ../${_realname}-${pkgver}/configure \ + --prefix=${MINGW_PREFIX} \ + --build=${MINGW_CHOST} \ + --host=${MINGW_CHOST} \ + --target=${MINGW_CHOST} \ + --enable-lib-only \ + --enable-static \ + --disable-shared + make } @@ -47,6 +63,9 @@ build() { #} package() { - cd "${srcdir}"/build-${CARCH} - make install DESTDIR="${pkgdir}" + cd "${srcdir}/build-static-${MINGW_CHOST}" + make DESTDIR="${pkgdir}" install + + cd "${srcdir}/build-shared-${MINGW_CHOST}" + make DESTDIR="${pkgdir}" install }