From 880c0bab41d1a8398b731f5a68c06e7639d89c78 Mon Sep 17 00:00:00 2001 From: beefcurtains Date: Wed, 24 Jun 2015 09:26:39 +0000 Subject: [PATCH] signify: unbreak build (#1779) --- srcpkgs/signify/files/void.h | 13 +++++++++++++ srcpkgs/signify/template | 14 +++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/signify/files/void.h diff --git a/srcpkgs/signify/files/void.h b/srcpkgs/signify/files/void.h new file mode 100644 index 00000000000..01177f1141a --- /dev/null +++ b/srcpkgs/signify/files/void.h @@ -0,0 +1,13 @@ +#ifndef __GLIBC__ + +/* sys/cdefs.h stubs for musl */ + +#ifndef __BEGIN_DECLS +#define __BEGIN_DECLS +#define __END_DECLS +#endif + +#define __ASMNAME(x) "" x + +#include +#endif diff --git a/srcpkgs/signify/template b/srcpkgs/signify/template index 6815171918f..d879944907a 100644 --- a/srcpkgs/signify/template +++ b/srcpkgs/signify/template @@ -1,7 +1,7 @@ # Template file for 'signify' pkgname=signify version=20141230 -revision=1 +revision=2 build_style=gnu-makefile short_desc="OpenBSD cryptographic signing and verification tool" maintainer="Ypnose " @@ -12,9 +12,17 @@ checksum=11c0a1ac0ca8075d2f00036f8de53a213346c4b2ecf44dacedc60d160569f6b2 wrksrc="${pkgname}-portable-${version}" pre_build() { - sed -i 's|^mandir=${prefix}/man|mandir=${prefix}/share/man|g' Makefile - sed -i "s|^CC=gcc|CC=$CC|g;s|CFLAGS=|CFLAGS=$CFLAGS -pie |g" Makefile + sed -e 's|^mandir=${prefix}/man|mandir=${prefix}/share/man|g' \ + -e 's/^CFLAGS=-O2/override CFLAGS+=-pie/' \ + -i Makefile + + # Allow building with musl + cp ${FILESDIR}/void.h . + for file in bsd-compat/blf.h bsd-compat/sha2.h ohash.h; do + sed -e '1 i\#include "void.h"' -i $file + done } + post_install() { vdoc README vdoc BACKGROUND