re2: Update to 2020-01-01. Fix static install
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
_realname=re2
|
||||
pkgbase=mingw-w64-${_realname}
|
||||
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
|
||||
_pkgver=2019-11-01
|
||||
_pkgver=2020-01-01
|
||||
pkgver=${_pkgver//-/}
|
||||
pkgrel=1
|
||||
pkgdesc="A fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python (mingw-w64)"
|
||||
@@ -15,7 +15,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
|
||||
"make"
|
||||
"${MINGW_PACKAGE_PREFIX}-gcc")
|
||||
source=(${_realname}-${_pkgver}.tar.gz::https://github.com/google/re2/archive/${_pkgver}.tar.gz)
|
||||
sha256sums=('5229d7e801bdb3d62a1b9d82de7c74eda223cb5e264d5bd04bcf31a933245d27')
|
||||
sha256sums=('7509a34636b7dd2966f7a34440cee1153983fd61a4bf8f759a4f7781b9ceebaf')
|
||||
|
||||
# Helper macros to help make tasks easier #
|
||||
apply_patch_with_msg() {
|
||||
@@ -35,6 +35,8 @@ build() {
|
||||
[[ -d "${srcdir}/build-${MINGW_CHOST}-static" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}-static"
|
||||
mkdir -p "${srcdir}/build-${MINGW_CHOST}-static"
|
||||
cd "${srcdir}/build-${MINGW_CHOST}-static"
|
||||
|
||||
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
|
||||
${MINGW_PREFIX}/bin/cmake \
|
||||
-G "MSYS Makefiles" \
|
||||
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
|
||||
@@ -48,6 +50,7 @@ build() {
|
||||
[[ -d "${srcdir}/build-${MINGW_CHOST}-shared" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}-shared"
|
||||
mkdir -p "${srcdir}/build-${MINGW_CHOST}-shared"
|
||||
cd "${srcdir}/build-${MINGW_CHOST}-shared"
|
||||
|
||||
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
|
||||
${MINGW_PREFIX}/bin/cmake \
|
||||
-G "MSYS Makefiles" \
|
||||
|
||||
Reference in New Issue
Block a user