nghttp3: Simplify build

Adsun701 · Dec 27, 2023 · 85a1c12 · 85a1c12
1 parent cd17041
commit 85a1c12
Showing 1 changed file with 5 additions and 22 deletions.
diff --git a/mingw-w64-nghttp3/PKGBUILD b/mingw-w64-nghttp3/PKGBUILD
@@ -4,12 +4,13 @@ _realname=nghttp3
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="HTTP/3 library written in C (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://github.com/ngtcp2/nghttp3'
 license=('spdx:MIT')
+checkdepends=("${MINGW_PACKAGE_PREFIX}-cunit")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
 makedepends=(
   "${MINGW_PACKAGE_PREFIX}-cc"
@@ -35,42 +36,24 @@ build() {
     extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
-  mkdir -p "${srcdir}/build-shared-${MSYSTEM}" && cd "${srcdir}/build-shared-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     "${MINGW_PREFIX}"/bin/cmake.exe \
       -GNinja \
       -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
       "${extra_config[@]}" \
       -DENABLE_SHARED_LIB=ON \
-      -DENABLE_STATIC_LIB=OFF \
+      -DENABLE_STATIC_LIB=ON \
       -DCMAKE_DLL_NAME_WITH_SOVERSION=ON \
       -DENABLE_LIB_ONLY=ON \
       ../"${_realname}-${pkgver}"
 
   "${MINGW_PREFIX}"/bin/cmake.exe --build .
-
-  mkdir -p "${srcdir}/build-static-${MSYSTEM}" && cd "${srcdir}/build-static-${MSYSTEM}"
-
-  export CPPFLAGS="$CPPFLAGS -DLIBXML_STATIC -DNGHTTP2_STATICLIB"
-  MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
-    "${MINGW_PREFIX}"/bin/cmake.exe \
-      -GNinja \
-      -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
-      "${extra_config[@]}" \
-      -DENABLE_SHARED_LIB=OFF \
-      -DENABLE_STATIC_LIB=ON \
-      -DENABLE_LIB_ONLY=ON \
-      ../${_realname}-${pkgver}
-
-  "${MINGW_PREFIX}"/bin/cmake.exe --build .
 }
 
 package() {
-  cd "${srcdir}/build-static-${MSYSTEM}"
-  DESTDIR="${pkgdir}" "${MINGW_PREFIX}"/bin/cmake.exe --install .
-
-  cd "${srcdir}/build-shared-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}"
   DESTDIR="${pkgdir}" "${MINGW_PREFIX}"/bin/cmake.exe --install .
 
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"