diff options
| author | Breno Leitao <breno.leitao@gmail.com> | 2017-05-10 20:07:49 +0000 |
|---|---|---|
| committer | Breno Leitao <breno.leitao@gmail.com> | 2017-05-10 20:09:20 +0000 |
| commit | c6f31c458a213bf82cf3c28bfa78b850dace3922 (patch) | |
| tree | 66eb9c75e23ce470bddd3ecbf520261cdc62a8e3 /testing | |
| parent | d53497536d479694e9a43c6d7355916add8890f7 (diff) | |
| download | aports-c6f31c458a213bf82cf3c28bfa78b850dace3922.tar.bz2 aports-c6f31c458a213bf82cf3c28bfa78b850dace3922.tar.xz | |
testing/dante: Fix build on new compiler
Dante is failing because they are using #if MACRO, where MACRO is just a
number.
In this case, they just use #ifdef or #if defined(MACRO). Fixing it to
enable dante to be buildable.
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/dante/APKBUILD | 3 | ||||
| -rw-r--r-- | testing/dante/ifdev.patch | 38 |
2 files changed, 41 insertions, 0 deletions
diff --git a/testing/dante/APKBUILD b/testing/dante/APKBUILD index 565f41abe6..e26ab0b358 100644 --- a/testing/dante/APKBUILD +++ b/testing/dante/APKBUILD @@ -14,6 +14,7 @@ install="$pkgname-server.pre-install" options="libtool" subpackages="$pkgname-dev $pkgname-doc $pkgname-server" source="http://www.inet.no/dante/files/$pkgname-$pkgver.tar.gz +ifdev.patch sockd.initd sockd.confd" @@ -26,6 +27,7 @@ prepare() { build() { cd "$builddir" + subpackages="$pkgname-dev $pkgname-doc" ac_cv_func_sched_setscheduler=no ./configure --prefix=/usr make || return 1 } @@ -50,5 +52,6 @@ server() { } sha512sums="38d4e3086f851fac78e2dbe7f928eba3b8bf1fb9219c42d929b9e1ea324882b0ae583dc59964a2772af4202dfc977387c6f723b320b5abbbe70e1990cd94f53b dante-1.4.2.tar.gz +9fd824db09081e1ff81875e740c9ee4d529e986ce486cbb4270e02c061c0120898cbe57f70ed010cc6b81f1d700114732d8f84b2f055f43d5f3110f2f0e8ba23 ifdev.patch 9ec0c32f6bfb3fbd266f89ccb0ffff0356b88d679bf3099ff4c78e7f4ca78de9b8fb9f6ff136ca333f148c16f9fcb502ac3f5469c106494846e4aa3192d79c4e sockd.initd 09b744340c03369983a9b07e50215288e5a43d15497db479867132bee46f34a7a8e451c980e064f751ad50e5231d77fa5ae9fd5cf2efe3274ae50168bfceaa67 sockd.confd" diff --git a/testing/dante/ifdev.patch b/testing/dante/ifdev.patch new file mode 100644 index 0000000000..541edefe03 --- /dev/null +++ b/testing/dante/ifdev.patch @@ -0,0 +1,38 @@ +--- a/sockd/sockd_io.c.old 2017-05-10 19:57:20.672000000 +0000 ++++ b/sockd/sockd_io.c 2017-05-10 20:00:34.548000000 +0000 +@@ -2912,7 +2912,7 @@ siginfo(sig, si, sc) + int src_so_rcvbuf, dst_so_rcvbuf; + #endif /* HAVE_RECVBUF_IOCTL */ + +-#if HAVE_SENDBUF_IOCTL ++#ifdef HAVE_SENDBUF_IOCTL + int src_so_sndbuf, dst_so_sndbuf; + #endif /* HAVE_SENDBUF_IOCTL */ + +@@ -2960,7 +2960,7 @@ siginfo(sig, si, sc) + *src_bufferinfo = NUL; + *dst_bufferinfo = NUL; + +-#if HAVE_RECVBUF_IOCTL || HAVE_SENDBUF_IOCTL ++#if defined(HAVE_RECVBUF_IOCTL) || defined(HAVE_SENDBUF_IOCTL) + + havesocketinfo = 1; + +@@ -2987,7 +2987,7 @@ siginfo(sig, si, sc) + } + #endif /* HAVE_RECVBUF_IOCTL */ + +-#if HAVE_SENDBUF_IOCTL ++#ifdef HAVE_SENDBUF_IOCTL + if (havesocketinfo) { + if (ioctl(src->s, SENDBUF_IOCTLVAL, &src_so_sndbuf) != 0) { + swarn("%s: sendbuf size ioctl() on src-fd %d failed", +@@ -3005,7 +3005,7 @@ siginfo(sig, si, sc) + } + #endif /* HAVE_SENDBUF_IOCTL */ + +-#if HAVE_SENDBUF_IOCTL && HAVE_RECVBUF_IOCTL ++#ifdef HAVE_SENDBUF_IOCTL && HAVE_RECVBUF_IOCTL + if (havesocketinfo) { + snprintf(src_bufferinfo, sizeof(src_bufferinfo), + "%lu buffered (%lu + %lu + %lu)", |