svn commit: r506722 - in head/devel/directfb: . files

[Mark Linimon]

Author: linimon
Date: Tue Jul 16 01:34:25 2019
New Revision: 506722
URL: https://svnweb.freebsd.org/changeset/ports/506722

Log:
  Patch configure script to fix build on aarch64 and powerpc*.
  
  Fix builds on other archs by deleting obsolete tests.
  
  Tested on: amd64, powerpc64, armv7
  
  Approved by:	portmgr (tier-2 blanket)

Added:
  head/devel/directfb/files/patch-configure.in   (contents, props changed)
Modified:
  head/devel/directfb/Makefile
  head/devel/directfb/pkg-plist

Modified: head/devel/directfb/Makefile
==============================================================================
--- head/devel/directfb/Makefile	Tue Jul 16 00:55:21 2019	(r506721)
+++ head/devel/directfb/Makefile	Tue Jul 16 01:34:25 2019	(r506722)
@@ -13,11 +13,6 @@ COMMENT=	Graphic development lightweight API
 
 LICENSE=	LGPL21
 
-BROKEN_aarch64=		fails to install: armasm_memcpy.h:No such file or directory
-BROKEN_armv6=		fails to compile: invokes x86 assembler
-BROKEN_armv7=		fails to compile: invokes x86 assembler
-BROKEN_powerpc64=	fails to install: include/directfb/direct/ppc_asm.h:No such file or directory
-
 LIB_DEPENDS=	libpng.so:graphics/png
 
 OPTIONS_DEFINE=	FREETYPE X11 SDL UNIQUE TEST DOCS
@@ -61,20 +56,6 @@ SDL_USE=	sdl=sdl
 SDL_CONFIGURE_ENABLE=	sdl
 UNIQUE_CONFIGURE_ENABLE=	unique
 TEST_CONFIGURE_WITH=	tests
-
-.include <bsd.port.options.mk>
-
-.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
-PLIST_SUB+=	ARCH_ARM=""
-.else
-PLIST_SUB+=	ARCH_ARM="@comment "
-.endif
-
-.if ${ARCH} == powerpc || ${ARCH} == powerpc64
-PLIST_SUB+=	ARCH_POWERPC=""
-.else
-PLIST_SUB+=	ARCH_POWERPC="@comment "
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \

Added: head/devel/directfb/files/patch-configure.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/directfb/files/patch-configure.in	Tue Jul 16 01:34:25 2019	(r506722)
@@ -0,0 +1,17 @@
+--- configure.in.orig	2012-05-23 13:43:12 UTC
++++ configure.in
+@@ -222,12 +222,12 @@ case "$target_or_host" in
+     AC_DEFINE(ARCH_X86_64,1,[Define to 1 if you are compiling for AMD64.])
+     ;;
+ 
+-  *arm*)
++  *arm* | *aarch64* )
+     have_arm=yes
+ 	AC_DEFINE(ARCH_ARM,1,[Define to 1 if you are compiling for ARM.])
+     ;;
+ 
+-  ppc-*-linux* | powerpc-*)
++  ppc-*-linux* | powerpc*)
+     have_ppc=yes
+     AC_DEFINE(ARCH_PPC,1,[Define to 1 if you are compiling for PowerPC.])
+     ;;

Modified: head/devel/directfb/pkg-plist
==============================================================================
--- head/devel/directfb/pkg-plist	Tue Jul 16 00:55:21 2019	(r506721)
+++ head/devel/directfb/pkg-plist	Tue Jul 16 01:34:25 2019	(r506722)
@@ -129,7 +129,6 @@ include/directfb-internal/windows/idirectfbwindow.h
 include/directfb/dfb_types.h
 include/directfb/dfiff.h
 include/directfb/dgiff.h
-%%ARCH_ARM%%include/directfb/direct/armasm_memcpy.h
 include/directfb/direct/build.h
 include/directfb/direct/clock.h
 include/directfb/direct/conf.h
@@ -146,8 +145,6 @@ include/directfb/direct/memcpy.h
 include/directfb/direct/messages.h
 include/directfb/direct/modules.h
 include/directfb/direct/mutex.h
-%%ARCH_POWERPC%%include/directfb/direct/ppc_asm.h
-%%ARCH_POWERPC%%include/directfb/direct/ppcasm_memcpy.h
 include/directfb/direct/serial.h
 include/directfb/direct/signals.h
 include/directfb/direct/stream.h