diff --git a/mingw-w64-hiredis/0001-fix-clock_gettime.patch b/mingw-w64-hiredis/0001-fix-clock_gettime.patch new file mode 100644 index 0000000000..013ca42eca --- /dev/null +++ b/mingw-w64-hiredis/0001-fix-clock_gettime.patch @@ -0,0 +1,13 @@ +diff --git a/net.c b/net.c +index b514bab..07edb67 100644 +--- a/net.c ++++ b/net.c +@@ -277,7 +277,7 @@ static int redisContextTimeoutMsec(redisContext *c, long *result) + } + + static long redisPollMillis(void) { +-#ifndef _MSC_VER ++#ifndef _WIN32 + struct timespec now; + clock_gettime(CLOCK_MONOTONIC, &now); + return (now.tv_sec * 1000) + now.tv_nsec / 1000000; diff --git a/mingw-w64-hiredis/PKGBUILD b/mingw-w64-hiredis/PKGBUILD index c792d04f63..fc4189f404 100644 --- a/mingw-w64-hiredis/PKGBUILD +++ b/mingw-w64-hiredis/PKGBUILD @@ -3,11 +3,11 @@ _realname=hiredis pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.2.0 -pkgrel=2 +pkgver=1.3.0 +pkgrel=1 pkgdesc="Minimalistic C client for Redis (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') +mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://github.com/redis/hiredis" msys2_references=( "cpe: cpe:/a:redis:hiredis" @@ -20,8 +20,15 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-pkgconf") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-openssl") -source=("https://github.com/redis/hiredis/archive/v${pkgver}.tar.gz") -sha256sums=('82ad632d31ee05da13b537c124f819eb88e18851d9cb0c30ae0552084811588c') +source=("https://github.com/redis/hiredis/archive/refs/tags/v${pkgver}.tar.gz" + "0001-fix-clock_gettime.patch") +sha256sums=('25cee4500f359cf5cad3b51ed62059aadfc0939b05150c1f19c7e2829123631c' + 'b1c5b2b99367bcaab3c7a6086003a6b21a4b8116678ffca64db87f3e74f35ea2') + +prepare() { + cd "${_realname}-${pkgver}" + patch -p1 -i "${srcdir}"/0001-fix-clock_gettime.patch +} build() { declare -a _extra_config @@ -31,41 +38,41 @@ build() { _extra_config+=("-DCMAKE_BUILD_TYPE=Debug") fi + CFLAGS+=" -Wno-int-conversion" + mkdir -p "${srcdir}/static-${MSYSTEM}" && cd "${srcdir}/static-${MSYSTEM}" - CFLAGS+=" -Wno-int-conversion" \ - MSYS2_ARG_CONV_EXCL=- \ - ${MINGW_PREFIX}/bin/cmake \ - -G"Ninja" \ - ${_extra_config[@]} \ - -DBUILD_SHARED_LIBS=OFF \ - -DCMAKE_INSTALL_PREFIX=$MINGW_PREFIX \ - -DENABLE_SSL=ON \ - -DDISABLE_TESTS=ON \ - ../${_realname}-${pkgver} + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ + cmake \ + -G"Ninja" \ + ${_extra_config[@]} \ + -DBUILD_SHARED_LIBS=OFF \ + -DCMAKE_INSTALL_PREFIX=$MINGW_PREFIX \ + -DENABLE_SSL=ON \ + -DDISABLE_TESTS=ON \ + ../"${_realname}-${pkgver}" - ${MINGW_PREFIX}/bin/cmake --build . + cmake --build . mkdir -p "${srcdir}/shared-${MSYSTEM}" && cd "${srcdir}/shared-${MSYSTEM}" - CFLAGS+=" -Wno-int-conversion" \ - MSYS2_ARG_CONV_EXCL=- \ - ${MINGW_PREFIX}/bin/cmake \ - -G"Ninja" \ - ${_extra_config[@]} \ - -DCMAKE_INSTALL_PREFIX=$MINGW_PREFIX \ - -DENABLE_SSL=ON \ - -DDISABLE_TESTS=ON \ - ../${_realname}-${pkgver} + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ + cmake \ + -G"Ninja" \ + ${_extra_config[@]} \ + -DCMAKE_INSTALL_PREFIX=$MINGW_PREFIX \ + -DENABLE_SSL=ON \ + -DDISABLE_TESTS=ON \ + ../"${_realname}-${pkgver}" - ${MINGW_PREFIX}/bin/cmake --build . + cmake --build . } package() { cd "${srcdir}/static-${MSYSTEM}" - DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install . + DESTDIR="${pkgdir}" cmake --install . cd "${srcdir}/shared-${MSYSTEM}" - DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install . + DESTDIR="${pkgdir}" cmake --install . # Remove NuGet package rm -rf "${pkgdir}"${MINGW_PREFIX}/build