Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 20 Oct 2018 22:07:06 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r482630 - in head/misc/valentina: . files
Message-ID:  <201810202207.w9KM76UE056681@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yuri
Date: Sat Oct 20 22:07:05 2018
New Revision: 482630
URL: https://svnweb.freebsd.org/changeset/ports/482630

Log:
  misc/valentina: fix build with powerpc*
  
  PR:		232485
  Submitted by:	Piotr Kubaj <pkubaj@anongoth.pl>

Added:
  head/misc/valentina/files/patch-src_libs_vmisc_debugbreak.h   (contents, props changed)
Modified:
  head/misc/valentina/Makefile

Modified: head/misc/valentina/Makefile
==============================================================================
--- head/misc/valentina/Makefile	Sat Oct 20 21:59:00 2018	(r482629)
+++ head/misc/valentina/Makefile	Sat Oct 20 22:07:05 2018	(r482630)
@@ -13,7 +13,7 @@ COMMENT=	Sewing pattern drafting tool aiming to remake
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE_GPL.txt
 
-USES=		desktop-file-utils gmake qmake qt:5
+USES=		compiler:c++11-lang desktop-file-utils gl gmake qmake qt:5
 USE_QT=		concurrent core gui network opengl printsupport svg widgets xml xmlpatterns buildtools_build linguisttools_build testlib_build
 USE_GL=		gl
 USE_LDCONFIG=	yes
@@ -33,5 +33,6 @@ WRKSRC=		${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_CO
 post-patch:
 	@${REINPLACE_CMD} 's|DEFAULT_PREFIX = /usr|DEFAULT_PREFIX = ${PREFIX}|' ${WRKSRC}/common.pri
 	@${REINPLACE_CMD} 's|/usr/share|${PREFIX}/share|' ${WRKSRC}/src/app/valentina/valentina.pro ${WRKSRC}/src/app/tape/tape.pro
+	@${REINPLACE_CMD} 's|g++ -dumpversion|g++${GCC_DEFAULT} -dumpversion|' ${WRKSRC}/Valentina.pro
 
 .include <bsd.port.mk>

Added: head/misc/valentina/files/patch-src_libs_vmisc_debugbreak.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/misc/valentina/files/patch-src_libs_vmisc_debugbreak.h	Sat Oct 20 22:07:05 2018	(r482630)
@@ -0,0 +1,16 @@
+--- src/libs/vmisc/debugbreak.h.orig	2018-10-20 17:36:33 UTC
++++ src/libs/vmisc/debugbreak.h
+@@ -100,6 +100,13 @@ __inline__ static void trap_instruction(void)
+      * 'aarch64_default_breakpoint' */
+     __asm__ volatile(".inst 0xd4200000");
+ }
++#elif defined(__powerpc__)
++enum { HAVE_TRAP_INSTRUCTION = 1 };
++__attribute__((gnu_inline, always_inline))
++__inline__ static void trap_instruction(void)
++{
++    __asm__ volatile(".4byte 0x7d821008");
++}
+ #else
+ enum { HAVE_TRAP_INSTRUCTION = 0 };
+ #endif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810202207.w9KM76UE056681>