grpc: debundle abseil

msys2 · Jun 1, 2022 · 640f26e · 640f26e
1 parent 1405172
commit 640f26e
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 45 deletions.
diff --git a/mingw-w64-abseil-cpp/PKGBUILD b/mingw-w64-abseil-cpp/PKGBUILD
@@ -4,7 +4,7 @@ _realname=abseil-cpp
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=20211102.0
-pkgrel=5
+pkgrel=6
 pkgdesc="Abseil Common Libraries (C++) from Google (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -50,8 +50,9 @@ build() {
       -GNinja \
       -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
       "${extra_config[@]}" \
+      -DBUILD_SHARED_LIBS="$( [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] && echo OFF || echo ON )" \
       -DCMAKE_CXX_STANDARD=17 \
-      -DBUILD_SHARED_LIBS="$( [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] && echo "OFF" || echo "ON" )" \
+      -DABSL_PROPAGATE_CXX_STD=ON \
       ../${_realname}-${pkgver}
 
   cmake --build .

diff --git a/mingw-w64-grpc/PKGBUILD b/mingw-w64-grpc/PKGBUILD
@@ -3,16 +3,16 @@
 
 _realname=grpc
 pkgbase=mingw-w64-${_realname}
-pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
+pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=1.45.2
-_abseil_ver=20211102.0
-pkgrel=1
-pkgdesc="gRPC - Google's high performance, open source, general RPC framework (mingw-w64)"
+pkgrel=2
+pkgdesc="Google's high performance, open source, general RPC framework (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url='https://www.grpc.io/'
-license=('BSD')
+license=('spdx:Apache-2.0')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
+         "${MINGW_PACKAGE_PREFIX}-abseil-cpp"
          "${MINGW_PACKAGE_PREFIX}-c-ares"
          "${MINGW_PACKAGE_PREFIX}-openssl"
          "${MINGW_PACKAGE_PREFIX}-protobuf>=3.5.0"
@@ -21,38 +21,26 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
 makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-cc")
-options=('staticlibs' 'strip')
-source=("${_realname}-${pkgver}.tar.gz::https://github.com/grpc/grpc/archive/v${pkgver}.tar.gz"
-        "abseil-cpp-${_abseil_ver}.tar.gz::https://github.com/abseil/abseil-cpp/archive/${_abseil_ver}.tar.gz"
-        "0001-abseil-Fix-compiler-warnings.patch"
-        "0002-abseil-Remove-librt-library.patch"
-        "0003-abseil-Include-pthread-header.patch")
-sha256sums=('e18b16f7976aab9a36c14c38180f042bb0fd196b75c9fd6a20a2b5f934876ad6'
-            'dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4'
-            'd273d7fa05f912edc8d91c0c8ba6f1f0576d0d98714bc4bd9b624e148f7aad19'
-            'd3ecabcebf64c2211b40e07f376de028ad1b101051cba7e69d77f6074217238d'
-            '66bf9f2919aed3a4f71bba6b6809078dd6cb22faef763e63c3f813d3f54782c9')
+source=("${_realname}-${pkgver}.tar.gz::https://github.com/grpc/grpc/archive/v${pkgver}.tar.gz")
+sha256sums=('e18b16f7976aab9a36c14c38180f042bb0fd196b75c9fd6a20a2b5f934876ad6')
 noextract=(${_realname}-${pkgver}.tar.gz)
 
 prepare() {
-  [[ -d ${srcdir}/${_realname}-${pkgver} ]] && rm -rf ${srcdir}/${_realname}-${pkgver}
-  tar -xzf ${srcdir}/${_realname}-${pkgver}.tar.gz -C ${srcdir} || true
-
-  cd ${srcdir}
-
-  rmdir ${srcdir}/${_realname}-${pkgver}/third_party/abseil-cpp
-  mv abseil-cpp-${_abseil_ver} ${srcdir}/${_realname}-${pkgver}/third_party/abseil-cpp
-
-  # https://github.com/abseil/abseil-cpp/pull/790
-  cd "${srcdir}/${_realname}-${pkgver}/third_party/abseil-cpp"
-  patch -Np1 -i "${srcdir}/0001-abseil-Fix-compiler-warnings.patch"
-  patch -Np1 -i "${srcdir}/0002-abseil-Remove-librt-library.patch"
-  patch -Np1 -i "${srcdir}/0003-abseil-Include-pthread-header.patch"
+  tar -xzf "${srcdir}"/${_realname}-${pkgver}.tar.gz -C "${srcdir}" || true
+
+  cd "${srcdir}"/${_realname}-${pkgver}
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}"/build-${MINGW_CHOST} && cd "${srcdir}"/build-${MINGW_CHOST}
+  cd "${srcdir}/${_realname}-${pkgver}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+
+  declare -a extra_config
+  if check_option "debug" "n"; then
+    extra_config+=("-DCMAKE_BUILD_TYPE=Release")
+  else
+    extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
+  fi
 
   # remove __USE_MINGW_ANSI_STDIO=1 define, it breaks grpc string handling for
   # cases like 'gpr_log(GPR_DEBUG, "Failed to free %" PRIuPTR ...'
@@ -69,31 +57,35 @@ build() {
   esac
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
-  ${MINGW_PREFIX}/bin/cmake.exe \
+    ${MINGW_PREFIX}/bin/cmake.exe \
       -Wno-dev \
-      -G"Ninja" \
+      -GNinja \
       -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
-      -DCMAKE_BUILD_TYPE="Release" \
-      -DCMAKE_SKIP_RPATH="ON" \
-      -DBUILD_SHARED_LIBS="$( [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] && echo "OFF" || echo "ON" )" \
+      "${extra_config[@]}" \
+      -DBUILD_SHARED_LIBS="$( [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] && echo OFF || echo ON )" \
+      -DCMAKE_CXX_STANDARD=17 \
+      -DCMAKE_SKIP_RPATH=ON \
       -DgRPC_ZLIB_PROVIDER="package" \
       -DgRPC_CARES_PROVIDER="package" \
-      -DgRPC_PROTOBUF_PROVIDER="package" \
       -DgRPC_RE2_PROVIDER="package" \
       -DgRPC_SSL_PROVIDER="package" \
-      -DgRPC_BENCHMARK_PROVIDER="package" \
+      -DgRPC_PROTOBUF_PROVIDER="package" \
+      -DgRPC_ABSL_PROVIDER="package" \
       ../${_realname}-${pkgver}
 
-  ${MINGW_PREFIX}/bin/cmake.exe --build ./
+  ${MINGW_PREFIX}/bin/cmake.exe --build .
 }
 
 check() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
-  #make test
+  cd "${srcdir}/build-${MSYSTEM}"
+
+  #${MINGW_PREFIX}/bin/cmake.exe --build . --target test
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
-  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
+  cd "${srcdir}/build-${MSYSTEM}"
+
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install .
+
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 }