From b3f0c5eb81edff5b0af5c6ab3f4af1858226d7d8 Mon Sep 17 00:00:00 2001 From: jbu Date: Fri, 7 Aug 2015 15:01:43 +0200 Subject: [PATCH] dma: unbreak musl --- srcpkgs/dma/patches/musl_getprogname.patch | 22 ++++++++++++++++++++++ srcpkgs/dma/patches/musl_sys_param_h.patch | 12 ++++++++++++ srcpkgs/dma/template | 6 +----- 3 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/dma/patches/musl_getprogname.patch create mode 100644 srcpkgs/dma/patches/musl_sys_param_h.patch diff --git a/srcpkgs/dma/patches/musl_getprogname.patch b/srcpkgs/dma/patches/musl_getprogname.patch new file mode 100644 index 0000000000..dc252907df --- /dev/null +++ b/srcpkgs/dma/patches/musl_getprogname.patch @@ -0,0 +1,22 @@ +Even if not defining __GLIBC__, musl libc has program_invocation_short_name + +--- dfcompat.c 2013-06-03 16:03:15.000000000 +0200 ++++ dfcompat.c 2015-08-07 14:57:37.814738238 +0200 +@@ -105,8 +105,6 @@ + + #ifndef HAVE_GETPROGNAME + +-#ifdef __GLIBC__ +- + #include + + const char * +@@ -115,8 +113,4 @@ + return (program_invocation_short_name); + } + +-#else /* __GLIBC__ */ +-#error "no getprogname implementation available" +-#endif +- + #endif /* !HAVE_GETPROGNAME */ diff --git a/srcpkgs/dma/patches/musl_sys_param_h.patch b/srcpkgs/dma/patches/musl_sys_param_h.patch new file mode 100644 index 0000000000..170b6895bd --- /dev/null +++ b/srcpkgs/dma/patches/musl_sys_param_h.patch @@ -0,0 +1,12 @@ +Include for roundup() declaration with musl libc + +--- dns.c 2013-06-03 16:03:15.000000000 +0200 ++++ dns.c 2015-08-07 14:53:01.499713464 +0200 +@@ -33,6 +33,7 @@ + */ + + #include ++#include + #include + #include + #include diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template index b5c7016d01..c6d614e5e9 100644 --- a/srcpkgs/dma/template +++ b/srcpkgs/dma/template @@ -1,7 +1,7 @@ # Template file for 'dma' pkgname=dma version=0.9 -revision=5 +revision=6 conf_files="/etc/dma/dma.conf /etc/dma/auth.conf" hostmakedepends="flex" makedepends="libressl-devel" @@ -15,10 +15,6 @@ checksum=69a46b5a05b0be13ee547d675eed35010fe6c6aef10335e099de33a80983c262 provides="smtp-server-0_1 smtp-forwarder-0_1" replaces="smtp-server>=0 smtp-forwarder>=0" -case "$XBPS_TARGET_MACHINE" in - *-musl) broken="http://build.voidlinux.eu/builders/x86_64-musl_builder/builds/3571/steps/shell_3/logs/stdio";; -esac - do_build() { make CC=$CC LEX=flex ${makejobs} }