compiler-rt-netbsd: Refresh modernity of this package

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun Jun 4 02:43:51 2017 +0200
Changeset:	6c190e6ac4423270672d61702583862e21d67043

Modified Files:
	compiler-rt-netbsd/Makefile
	compiler-rt-netbsd/distinfo
Added Files:
	compiler-rt-netbsd/patches/patch-lib_builtins_gcc__personality__v0.c

Log Message:
compiler-rt-netbsd: Refresh modernity of this package

Enhance (SRC/WRK)DIR usage.
Add initial patch to fix some build warnings.

Sponsored by <The NetBSD Foundation>

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6c190e6ac4423270672d61702583862e21d67043

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 compiler-rt-netbsd/Makefile                        | 14 +++----
 compiler-rt-netbsd/distinfo                        |  1 +
 .../patch-lib_builtins_gcc__personality__v0.c      | 45 ++++++++++++++++++++++
 3 files changed, 53 insertions(+), 7 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index b6d263f5b3..6367ade0b6 100644
--- a/compiler-rt-netbsd/Makefile
+++ b/compiler-rt-netbsd/Makefile
@@ -12,22 +12,22 @@ HOMEPAGE=	http://compiler-rt.llvm.org/
 COMMENT=	LLVM runtime libraries
 LICENSE=	modified-bsd OR mit
 
-WRKSRC=			${WRKDIR}/build
-
-USE_LANGUAGES=		c c++
+USE_LANGUAGES=		c c++11
 USE_CMAKE=		yes
 GCC_REQD+=		4.8
 
+WRKSRC=			${WRKDIR}/${PKGBASE}
+CONFIGURE_DIRS=		${WRKDIR}/build
+CMAKE_ARG_PATH=		${WRKSRC}
+
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=	-DCMAKE_C_COMPILER=${CC:Q}
 CMAKE_ARGS+=	-DCMAKE_CXX_COMPILER=${CXX:Q}
 
-CMAKE_ARG_PATH=	${WRKDIR}/compiler-rt
-
 post-extract:
-	${RUN} mkdir -p ${WRKSRC}
+	${RUN} mkdir -p ${WRKDIR}/build
 
-.include "../../wip/mk/git-package.mk"
+.include "../../wip/mk/svn-package.mk"
 DEPENDS+=	llvm-${PKGVERSION_NOREV}{,nb*}:../../wip/llvm-netbsd
 .include "../../wip/llvm-netbsd/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/compiler-rt-netbsd/distinfo b/compiler-rt-netbsd/distinfo
index 7931384fd5..a5871292aa 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -12,3 +12,4 @@ Size (libcxx-3.6.2.src.tar.xz) = 944020 bytes
 SHA1 (llvm-3.6.2.src.tar.xz) = 7a00257eb2bc9431e4c77c3a36b033072c54bc7e
 RMD160 (llvm-3.6.2.src.tar.xz) = 521cbc5fe2925ea3c6e90c7a31f752a04045c972
 Size (llvm-3.6.2.src.tar.xz) = 12802380 bytes
+SHA1 (patch-lib_builtins_gcc__personality__v0.c) = d0ae32ec93036d3f67e449a910663b7e025956c2
diff --git a/compiler-rt-netbsd/patches/patch-lib_builtins_gcc__personality__v0.c b/compiler-rt-netbsd/patches/patch-lib_builtins_gcc__personality__v0.c
new file mode 100644
index 0000000000..c714f8b34c
--- /dev/null
+++ b/compiler-rt-netbsd/patches/patch-lib_builtins_gcc__personality__v0.c
@@ -0,0 +1,45 @@
+$NetBSD$
+
+--- lib/builtins/gcc_personality_v0.c.orig	2017-06-03 23:53:58.000000000 +0000
++++ lib/builtins/gcc_personality_v0.c
+@@ -24,6 +24,12 @@
+ #include "unwind-ehabi-helpers.h"
+ #endif
+ 
++#if defined(__NetBSD__)
++#define TYPE_UNWIND_PTR (void *)
++#else
++#define TYPE_UNWIND_PTR (uintptr_t)
++#endif
++
+ /*
+  * Pointer encodings documented at:
+  *   http://refspecs.freestandards.org/LSB_1.3.0/gLSB/gLSB/ehframehdr.html
+@@ -206,8 +212,8 @@ __gcc_personality_v0(int version, _Unwin
+     if ( lsda == (uint8_t*) 0 )
+         return continueUnwind(exceptionObject, context);
+ 
+-    uintptr_t pc = _Unwind_GetIP(context)-1;
+-    uintptr_t funcStart = _Unwind_GetRegionStart(context);
++    uintptr_t pc = (uintptr_t)_Unwind_GetIP(context) - 1;
++    uintptr_t funcStart = (uintptr_t)_Unwind_GetRegionStart(context);
+     uintptr_t pcOffset = pc - funcStart;
+ 
+     /* Parse LSDA header. */
+@@ -239,9 +245,9 @@ __gcc_personality_v0(int version, _Unwin
+              * to take two parameters in registers.
+              */
+             _Unwind_SetGR(context, __builtin_eh_return_data_regno(0),
+-                          (uintptr_t)exceptionObject);
++                          (TYPE_UNWIND_PTR)exceptionObject);
+             _Unwind_SetGR(context, __builtin_eh_return_data_regno(1), 0);
+-            _Unwind_SetIP(context, (funcStart + landingPad));
++            _Unwind_SetIP(context, (TYPE_UNWIND_PTR)(funcStart + landingPad));
+             return _URC_INSTALL_CONTEXT;
+         }
+     }
+@@ -249,4 +255,3 @@ __gcc_personality_v0(int version, _Unwin
+     /* No landing pad found, continue unwinding. */
+     return continueUnwind(exceptionObject, context);
+ }
+-