diff --git a/mingw-w64-enet/001-no-undefined.patch b/mingw-w64-enet/001-no-undefined.patch index 5fb616120f..3faa083a23 100644 --- a/mingw-w64-enet/001-no-undefined.patch +++ b/mingw-w64-enet/001-no-undefined.patch @@ -4,8 +4,8 @@ lib_LTLIBRARIES = libenet.la libenet_la_SOURCES = callbacks.c compress.c host.c list.c packet.c peer.c protocol.c unix.c win32.c # see info '(libtool) Updating version info' before making a release --libenet_la_LDFLAGS = $(AM_LDFLAGS) -version-info 7:5:0 -+libenet_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 7:5:0 +-libenet_la_LDFLAGS = $(AM_LDFLAGS) -version-info 7:6:0 ++libenet_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 7:6:0 AM_CPPFLAGS = -I$(top_srcdir)/include ACLOCAL_AMFLAGS = -Im4 diff --git a/mingw-w64-enet/002-win-libs.patch b/mingw-w64-enet/002-win-libs.patch index 2bf828b674..8aebf62aef 100644 --- a/mingw-w64-enet/002-win-libs.patch +++ b/mingw-w64-enet/002-win-libs.patch @@ -6,7 +6,7 @@ + +# Check system type -+case "$target" in ++case "$host" in +*mingw*) + LIBS="$LIBS -lws2_32 -lwinmm" + ;; diff --git a/mingw-w64-enet/PKGBUILD b/mingw-w64-enet/PKGBUILD index 3eb1a2ea12..949fab65a3 100644 --- a/mingw-w64-enet/PKGBUILD +++ b/mingw-w64-enet/PKGBUILD @@ -3,7 +3,7 @@ _realname=enet pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.3.17 +pkgver=1.3.18 pkgrel=1 pkgdesc="Reliable UDP networking library (mingw-w64)" url="http://enet.bespin.org/" @@ -11,13 +11,12 @@ arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32') license=('custom') makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools") -options=('staticlibs' 'strip') source=("http://enet.bespin.org/download/${_realname}-${pkgver}.tar.gz" 001-no-undefined.patch 002-win-libs.patch) -sha256sums=('a38f0f194555d558533b8b15c0c478e946310022d0ec7b34334e19e4574dcedc' - 'f72bc7cbe2b6f303dda99be32cce40e4ced9e55f0b1b4ff8dc08d06b2231a02f' - '5920ea828ed2c96cecbf5957a226244df0cf13e6b107bb82272d7991eabd8f79') +sha256sums=('2a8a0c5360d68bb4fcd11f2e4c47c69976e8d2c85b109dd7d60b1181a4f85d36' + 'b777d7ad81b48763a4647c75dca3ca6892f884618929970df2f76c5b36b9d479' + 'bc3dec292538395b3ecc72ae3133697190be2e70b2895fd226a7fd1bd563fdc4') prepare() { cd "${srcdir}/enet-${pkgver}" @@ -28,13 +27,9 @@ prepare() { } build() { - mkdir -p build-${MINGW_CHOST} - cd build-${MINGW_CHOST} + mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM} ../${_realname}-${pkgver}/configure \ - --build=${MINGW_CHOST} \ - --host=${MINGW_CHOST} \ - --target=${MINGW_CHOST} \ --prefix=${MINGW_PREFIX} \ --enable-shared \ --enable-static @@ -43,6 +38,6 @@ build() { } package() { - cd "${srcdir}/build-${MINGW_CHOST}" + cd build-${MSYSTEM} make DESTDIR="${pkgdir}" install }