Merge pull request #2051 from jprjr/asr-fix
fix compile w/ automake-1.15, inline res_randomid on musl
This commit is contained in:
commit
879bc3f880
2 changed files with 38 additions and 3 deletions
24
srcpkgs/libasr/patches/musl-inline-res_randomid.patch
Normal file
24
srcpkgs/libasr/patches/musl-inline-res_randomid.patch
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
diff --git configure.ac configure.ac
|
||||||
|
index 10aff04..07e149f 100644
|
||||||
|
--- configure.ac
|
||||||
|
+++ configure.ac
|
||||||
|
@@ -456,6 +456,7 @@ AC_CHECK_FUNCS([ \
|
||||||
|
issetugid \
|
||||||
|
memmove \
|
||||||
|
reallocarray \
|
||||||
|
+ res_randomid \
|
||||||
|
snprintf \
|
||||||
|
strdup \
|
||||||
|
strerror \
|
||||||
|
diff --git src/asr_private.h src/asr_private.h
|
||||||
|
index 0960e37..158e7ff 100644
|
||||||
|
--- src/asr_private.h
|
||||||
|
+++ src/asr_private.h
|
||||||
|
@@ -365,3 +365,7 @@ extern FILE * asr_debug;
|
||||||
|
asr_statestr((a)->as_state), \
|
||||||
|
asr_statestr((s))); \
|
||||||
|
(a)->as_state = (s); } while (0)
|
||||||
|
+
|
||||||
|
+#ifndef HAVE_RES_RANDOMID
|
||||||
|
+#define res_randomid(x) (0xffff & getpid())
|
||||||
|
+#endif
|
|
@ -1,15 +1,26 @@
|
||||||
# Template file for 'libasr'
|
# Template file for 'libasr'
|
||||||
pkgname=libasr
|
pkgname=libasr
|
||||||
version=1.0.2
|
version=1.0.2
|
||||||
revision=1
|
revision=2
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
|
hostmakedepends="automake libtool"
|
||||||
makedepends="libressl-devel"
|
makedepends="libressl-devel"
|
||||||
short_desc="Simple and portable asynchronous resolver library"
|
short_desc="Simple and portable asynchronous resolver library"
|
||||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||||
license="ISC, BSD"
|
license="ISC, BSD"
|
||||||
homepage="https://www.opensmtpd.org/"
|
homepage="https://www.opensmtpd.org/"
|
||||||
distfiles="https://www.opensmtpd.org/archives/${pkgname}-${version}.tar.gz"
|
distfiles="https://github.com/OpenSMTPD/${pkgname}/archive/${pkgname}-${version}.tar.gz"
|
||||||
checksum=a6f5d1c6306938156da3427525572b9b16c1e6be6c69845d390bb63f41a58b34
|
checksum=4ab54264206e255fd6c2de982764bb5ce7857ec8f649ad3ee45771244593b6e1
|
||||||
|
wrksrc="${pkgname}-${pkgname}-${version}"
|
||||||
|
|
||||||
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
|
*-musl) ;;
|
||||||
|
*) CFLAGS="$CFLAGS -DHAVE_RES_RANDOMID"
|
||||||
|
esac
|
||||||
|
|
||||||
|
pre_configure() {
|
||||||
|
./bootstrap
|
||||||
|
}
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
vlicense LICENCE
|
vlicense LICENCE
|
||||||
|
|
Loading…
Reference in a new issue