diff --git a/libtirpc/1.0.2-cygwin-bindresvport.patch b/libtirpc/1.0.2-cygwin-bindresvport.patch index 83bf338b..757876ad 100644 --- a/libtirpc/1.0.2-cygwin-bindresvport.patch +++ b/libtirpc/1.0.2-cygwin-bindresvport.patch @@ -1,9 +1,9 @@ ---- origsrc/libtirpc-1.0.2/configure.ac 2018-02-06 21:45:15.467634500 -0600 -+++ src/libtirpc-1.0.2/configure.ac 2018-02-07 10:27:54.897376400 -0600 -@@ -92,7 +92,7 @@ AC_HEADER_DIRENT +--- origsrc/libtirpc-1.3.3/configure.ac.orig 2022-12-29 09:37:45.342837000 +0100 ++++ src/libtirpc-1.3.3/configure.ac 2022-12-29 09:39:05.827381500 +0100 +@@ -100,7 +100,7 @@ AC_PREFIX_DEFAULT(/usr) AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h locale.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h features.h gssapi/gssapi_ext.h]) - AC_CHECK_LIB([pthread], [pthread_create]) + AX_PTHREAD -AC_CHECK_FUNCS([getrpcbyname getrpcbynumber setrpcent endrpcent getrpcent]) +AC_CHECK_FUNCS([bindresvport getrpcbyname getrpcbynumber setrpcent endrpcent getrpcent]) diff --git a/libtirpc/1.0.2-includedir.patch b/libtirpc/1.0.2-includedir.patch index 74e493ba..998d9b48 100644 --- a/libtirpc/1.0.2-includedir.patch +++ b/libtirpc/1.0.2-includedir.patch @@ -59,12 +59,12 @@ -AC_CONFIG_FILES([Makefile src/Makefile man/Makefile doc/Makefile]) +AC_CONFIG_FILES([Makefile tirpc/Makefile src/Makefile man/Makefile doc/Makefile]) AC_OUTPUT(libtirpc.pc) ---- origsrc/libtirpc-1.0.2/libtirpc.pc.in 2017-07-05 10:02:23.000000000 -0500 -+++ src/libtirpc-1.0.2/libtirpc.pc.in 2018-02-06 21:53:20.587043700 -0600 -@@ -9,4 +9,4 @@ Requires: +--- origsrc/libtirpc-1.3.3/libtirpc.pc.in.orig 2022-12-29 09:40:09.854859500 +0100 ++++ src/libtirpc-1.3.3/libtirpc.pc.in 2022-12-29 09:41:01.227230000 +0100 +@@ -9,4 +9,4 @@ Version: @PACKAGE_VERSION@ Libs: -L${libdir} -ltirpc - Libs.private: -lpthread + Libs.private: @PTHREAD_LIBS@ -Cflags: -I${includedir}/tirpc +Cflags: -I${includedir} --- origsrc/libtirpc-1.0.2/tirpc/Makefile.am 1969-12-31 18:00:00.000000000 -0600 diff --git a/libtirpc/1000-disable-linux-only.patch b/libtirpc/1000-disable-linux-only.patch new file mode 100644 index 00000000..ba070073 --- /dev/null +++ b/libtirpc/1000-disable-linux-only.patch @@ -0,0 +1,13 @@ +--- libtirpc-1.3.2/src/clnt_dg.c.orig 2021-05-10 19:59:15.000000000 +0200 ++++ libtirpc-1.3.2/src/clnt_dg.c 2022-12-29 09:32:39.778869700 +0100 +@@ -55,6 +55,10 @@ + #include "rpc_com.h" + #include "clnt_fd_locks.h" + ++#ifdef __CYGWIN__ ++#undef IP_RECVERR ++#endif ++ + #ifdef IP_RECVERR + #include + #include diff --git a/libtirpc/PKGBUILD b/libtirpc/PKGBUILD index b7308cdb..4695601e 100644 --- a/libtirpc/PKGBUILD +++ b/libtirpc/PKGBUILD @@ -2,7 +2,7 @@ pkgbase=libtirpc pkgname=('libtirpc' 'libtirpc-devel') -pkgver=1.3.2 +pkgver=1.3.3 pkgrel=1 pkgdesc="A port of Sun's Transport-Independent RPC library" arch=('i686' 'x86_64') @@ -18,17 +18,17 @@ source=(https://downloads.sourceforge.net/libtirpc/libtirpc-${pkgver}.tar.bz2 0.2.4-cygwin-poll.patch 0.3.2-cygwin-rpcent.patch 1.0.2-includedir.patch - msys2-autotools.patch) -sha256sums=('e24eb88b8ce7db3b7ca6eb80115dd1284abc5ec32a8deccfed2224fc2532b9fd' + 1000-disable-linux-only.patch) +sha256sums=('6474e98851d9f6f33871957ddee9714fdcd9d8a5ee9abb5a98d63ea2e60e12f3' '19f6c539781476c5ac7fd58f080ca587c4c70c69dd82d57e30d69d39b9c7ac9f' 'c247c94a431c0548610c6e97b620a3f81767a31f894b14027737b8afbade95f8' 'd45ae803c401ca5a37e5084da822ff7f448241be38d457ef981692322e7fd057' - 'dfcd2fc7ec85b98cb6616e9b7f3168be169ed7a10b15c986917bc4cc3fc0f9da' + 'cb5ac736a398d469815ecb82f775fb82d8d825ebde29f6d9b160203270156248' '24d8f179812434e3be91800eb4387fec38d9050f3d1902ee1e66246c776fac11' '90cedf3f930bf44dbbed2e520305df1a53daddac464d1d68edf501466578ac0c' 'fe6af160a7fa983fa772f6fa0d84d930c94250424289665625ebad7dd33c191c' - 'e22f57de0fc49d4c1a173c21d829a4f234f66e060254a7977cacc16b311bf10f' - 'c5a51f650783bd750f87c757840e12c828dcb250eb52517709d4c7e0efec2c30') + '3d76303b104124b700e6d7b49f0d3755b11176577b672fa0a365e21c36e0403e' + '2dfb0e2ba5e8230a3c94b489976ccea03ba2add5f412f127ba87afb442c87563') prepare() { cd libtirpc-${pkgver} @@ -40,7 +40,7 @@ prepare() { patch -p2 -i ${srcdir}/0.2.4-cygwin-poll.patch patch -p2 -i ${srcdir}/0.3.2-cygwin-rpcent.patch patch -p2 -i ${srcdir}/1.0.2-includedir.patch - patch -p1 -i ${srcdir}/msys2-autotools.patch + patch -p1 -i ${srcdir}/1000-disable-linux-only.patch autoreconf -fiv } @@ -48,8 +48,10 @@ prepare() { build() { export lt_cv_deplibs_check_method='pass_all' cd libtirpc-${pkgver} + + local CYGWIN_CHOST="${CHOST/-msys/-cygwin}" ./configure \ - --build=${CHOST} \ + --build=${CYGWIN_CHOST} \ --prefix=/usr \ --sysconfdir=/etc \ --enable-gssapi diff --git a/libtirpc/msys2-autotools.patch b/libtirpc/msys2-autotools.patch deleted file mode 100644 index 3d9bcaeb..00000000 --- a/libtirpc/msys2-autotools.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur libtirpc-0.2.4.orig/config.guess libtirpc-0.2.4/config.guess ---- libtirpc-0.2.4.orig/config.guess 2013-12-09 22:02:33.000000000 +0100 -+++ libtirpc-0.2.4/config.guess 2014-10-15 04:57:52.087890600 +0200 -@@ -869,6 +869,9 @@ - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; -+ amd64:MSYS*:*:* | x86_64:MSYS*:*:*) -+ echo x86_64-unknown-msys -+ exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;;