moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

Merge pull request #1780 from pullmoll/mame

Browse source 
mame: really unbreak musl
This commit is contained in:
Jürgen Buchmüller 2015-06-06 21:58:33 +02:00
commit c3d0cf462b
2 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
srcpkgs/mame/patches/musl-sched.patch
View file

@ -1,10 +1,15 @@
--- src/emu/emucore.h 2015-06-06 15:32:17.639326661 +0200 The musl libc header /usr/include/sched.h fails with the string.h
+++ src/emu/emucore.h 2015-06-06 15:32:02.649327471 +0200 memory functions redefined as macros, thus enable the mem tracking
@@ -19,6 +19,7 @@ only if __GLIBC__ is defined as well.
#include <string.h>
#include <stdlib.h> --- src/lib/util/corealloc.h 2015-06-06 19:27:52.467562344 +0200
#include <stdarg.h> +++ src/lib/util/corealloc.h 2015-06-06 19:30:09.602554928 +0200
+#include <sched.h> @@ -84,7 +84,7 @@
// ADDDITIONAL MACROS
//**************************************************************************
// some cleanups for Solaris for things defined in stdlib.h -#ifndef NO_MEM_TRACKING
#if defined(__sun__) && defined(__svr4__) +#if !defined(NO_MEM_TRACKING) && defined(__GLIBC__)
// re-route classic malloc-style allocations
#undef malloc
#undef calloc

5
srcpkgs/mame/template
View file

@ -1,7 +1,7 @@
# Template file for 'mame' # Template file for 'mame'
pkgname=mame pkgname=mame
version=0162 version=0162
revision=3 revision=4
wrksrc="mame-${version}s" wrksrc="mame-${version}s"
homepage="http://mamedev.org" homepage="http://mamedev.org"
distfiles="https://github.com/mamedev/$pkgname/releases/download/${pkgname}${version}/${pkgname}${version}s.zip" distfiles="https://github.com/mamedev/$pkgname/releases/download/${pkgname}${version}/${pkgname}${version}s.zip"
@ -31,9 +31,6 @@ do_build() {
# Doesn't work yet because of qt (which can't be cross compiled ?) # Doesn't work yet because of qt (which can't be cross compiled ?)
opts+=" CROSS_BUILD=1 OVERRIDE_CC=${CC} OVERRIDE_CXX=${CXX} OVERRIDE_LD=${CC}" opts+=" CROSS_BUILD=1 OVERRIDE_CC=${CC} OVERRIDE_CXX=${CXX} OVERRIDE_LD=${CC}"
fi fi
case "$XBPS_TARGET_MACHINE" in
*-musl) opts+=" NO_MEM_TRACKING=1" ;;
esac
make ${opts} ${makejobs} make ${opts} ${makejobs}
} }
do_install() { do_install() {