jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1987 from pullmoll/fortune-mod

Browse source 
fortune-mod: unbreak musl
This commit is contained in:
Jürgen Buchmüller 2015-07-10 21:38:39 +02:00
parent 5a4c47037e d8486c22f0
commit 6ac0c68824
3 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
srcpkgs/fortune-mod/files/error.c Normal file
View file

@ -0,0 +1,19 @@
#include <stdarg.h>
#include <stdio.h>
#define _GNU_SOURCE
#include <errno.h>
void error(int status, int errnum, const char* format, ...)
{
va_list ap;
fflush(stdout);
fprintf(stderr, "%s: ", program_invocation_name);
va_start(ap, format);
vfprintf(stderr, format, ap);
va_end(ap);
if (errnum)
fprintf(stderr, ":%d", errnum);
if (status)
exit(status);
}

4
srcpkgs/fortune-mod/files/error.h Normal file
View file

@ -0,0 +1,4 @@
#ifndef _ERROR_H_
#define _ERROR_H_
void error(int status, int errnum, const char* format, ...);
#endif /* _ERROR_H_ */

7
srcpkgs/fortune-mod/template
View file

@ -15,6 +15,13 @@ nocross=yes
do_build() {
sed -i "s|^CFLAGS=.*|CFLAGS=${CFLAGS} -fsigned-char \$(DEFINES)|" Makefile
sed -i "s|^LDFLAGS=.*|LDFLAGS=${LDFLAGS}|" Makefile
sed -i "s;u_int;uint;" util/strfile.h
case "$XBPS_TARGET_MACHINE" in
*-musl)
cp ${FILESDIR}/error.{c,h} ${wrksrc}/fortune
sed -e "s;-DBSD_REGEX;-DPOSIX_REGEX;" -i Makefile
sed -e "s;fortune\.o;fortune.o error.o;" -i fortune/Makefile
esac
make CC=$CC COOKIEDIR=/usr/share/fortunes
}
do_install() {