diff --git a/srcpkgs/turbovnc/patches/musl-asm_page.patch b/srcpkgs/turbovnc/patches/musl-asm_page.patch new file mode 100644 index 0000000000..695e8371f3 --- /dev/null +++ b/srcpkgs/turbovnc/patches/musl-asm_page.patch @@ -0,0 +1,13 @@ +Try to include only if __GLIBC__ is defined also. + +--- unix/Xvnc/programs/Xserver/Xext/xf86bigfont.c 2014-07-20 02:45:59.000000000 +0200 ++++ unix/Xvnc/programs/Xserver/Xext/xf86bigfont.c 2015-09-01 10:28:30.171432632 +0200 +@@ -40,7 +40,7 @@ + + #include + #ifdef HAS_SHM +-#if defined(linux) && (!defined(__GNU_LIBRARY__) || __GNU_LIBRARY__ < 2) ++#if defined(linux) && (!defined(__GNU_LIBRARY__) || __GNU_LIBRARY__ < 2) && defined(__GLIBC__) + /* libc4 does not define __GNU_LIBRARY__, libc5 defines __GNU_LIBRARY__ as 1 */ + /* Linux libc4 and libc5 only (because glibc doesn't include kernel headers): + Linux 2.0.x and 2.2.x define SHMLBA as PAGE_SIZE, but forget to define diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template index 028a00ac32..aae47bac3f 100644 --- a/srcpkgs/turbovnc/template +++ b/srcpkgs/turbovnc/template @@ -1,7 +1,7 @@ # Template file for 'turbovnc' pkgname=turbovnc version=2.0 -revision=2 +revision=3 build_style=cmake configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_CONFDIR=/etc -DTVNC_MANDIR=/usr/share/man -DTVNC_DOCDIR=/usr/share/doc/${pkgname} -DTVNC_BUILDJAVA=0" @@ -14,11 +14,13 @@ license="GPL-2" homepage="http://virtualgl.org" distfiles="${SOURCEFORGE_SITE}/turbovnc/$pkgname-$version.tar.gz" checksum=703c5b9c0da760935eec33b5f883477b40ea212f207529908f67b568dd41d8d6 -only_for_archs="i686 x86_64" +only_for_archs="i686 i686-musl x86_64 x86_64-musl" conflicts="tigervnc>=0" case "$XBPS_TARGET_MACHINE" in - *-musl) broken="http://build.voidlinux.eu/builders/x86_64-musl_builder/builds/4546/steps/shell_3/logs/stdio" + *-musl) # Need this to make define struct ucred + CFLAGS="-D_GNU_SOURCE" + ;; esac post_install() {