Tue Mar 31 15:44:47 2015 UTC ()
Allow building on platforms where "int3" is not a valid debug trap.
Build shared library with -fPIC on all platforms. Bump revision for
that.


(joerg)
diff -r1.13 -r1.14 pkgsrc/lang/konoha/Makefile
diff -r1.2 -r1.3 pkgsrc/lang/konoha/distinfo
diff -r0 -r1.1 pkgsrc/lang/konoha/patches/patch-package_konoha.compiler_compiler.c
diff -r0 -r1.1 pkgsrc/lang/konoha/patches/patch-package_konoha.io_CMakeLists.txt
cvs diff -r1.13 -r1.14 pkgsrc/lang/konoha/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/konoha/Makefile 2014/10/07 16:47:28 1.13
+++ pkgsrc/lang/konoha/Makefile 2015/03/31 15:44:47 1.14
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.13 2014/10/07 16:47:28 adam Exp $ 1# $NetBSD: Makefile,v 1.14 2015/03/31 15:44:47 joerg Exp $
2# 2#
3 3
4DISTNAME= konoha-1.0.0-952 4DISTNAME= konoha-1.0.0-952
5PKGNAME= konoha-1.0.0.952 5PKGNAME= konoha-1.0.0.952
6PKGREVISION= 9 6PKGREVISION= 10
7CATEGORIES= lang 7CATEGORIES= lang
8MASTER_SITES= http://konoha.googlecode.com/files/ 8MASTER_SITES= http://konoha.googlecode.com/files/
9 9
10MAINTAINER= ryoon@NetBSD.org 10MAINTAINER= ryoon@NetBSD.org
11HOMEPAGE= http://konohascript.org/ 11HOMEPAGE= http://konohascript.org/
12COMMENT= Statically-typed scripting langauge 12COMMENT= Statically-typed scripting langauge
13LICENSE= gnu-lgpl-v3 13LICENSE= gnu-lgpl-v3
14 14
15WRKSRC= ${WRKDIR}/konoha-1.0.0 15WRKSRC= ${WRKDIR}/konoha-1.0.0
16USE_CMAKE= yes 16USE_CMAKE= yes
17USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
18 18
19.include "../../databases/sqlite3/buildlink3.mk" 19.include "../../databases/sqlite3/buildlink3.mk"
cvs diff -r1.2 -r1.3 pkgsrc/lang/konoha/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/konoha/distinfo 2012/08/12 11:23:59 1.2
+++ pkgsrc/lang/konoha/distinfo 2015/03/31 15:44:47 1.3
@@ -1,11 +1,13 @@ @@ -1,11 +1,13 @@
1$NetBSD: distinfo,v 1.2 2012/08/12 11:23:59 marino Exp $ 1$NetBSD: distinfo,v 1.3 2015/03/31 15:44:47 joerg Exp $
2 2
3SHA1 (konoha-1.0.0-952.tar.gz) = c4cfdc956bd583f8c3e8e696eeb0316ca78b1389 3SHA1 (konoha-1.0.0-952.tar.gz) = c4cfdc956bd583f8c3e8e696eeb0316ca78b1389
4RMD160 (konoha-1.0.0-952.tar.gz) = 98eb63382d3877b57606a205ac41cfd3928316b4 4RMD160 (konoha-1.0.0-952.tar.gz) = 98eb63382d3877b57606a205ac41cfd3928316b4
5Size (konoha-1.0.0-952.tar.gz) = 5235671 bytes 5Size (konoha-1.0.0-952.tar.gz) = 5235671 bytes
6SHA1 (patch-include_konoha1_konoha__config.h) = 5faf9bb6575ecab19fe78b15959db849ed6943c5 6SHA1 (patch-include_konoha1_konoha__config.h) = 5faf9bb6575ecab19fe78b15959db849ed6943c5
7SHA1 (patch-include_konoha1_konoha__t.h) = b6296dcef752c0c488f9e93def1fb6673d89a9b9 7SHA1 (patch-include_konoha1_konoha__t.h) = b6296dcef752c0c488f9e93def1fb6673d89a9b9
 8SHA1 (patch-package_konoha.compiler_compiler.c) = 7025a74ed934389d87626fb6c8466e141dfa9340
 9SHA1 (patch-package_konoha.io_CMakeLists.txt) = da2e8a5acd6c9d930ec1f65c12d0e9bc2b69b1c7
8SHA1 (patch-package_konoha.sql_CMakeLists.txt) = a1a8690f10f40c89feb756eba238f643e136de4d 10SHA1 (patch-package_konoha.sql_CMakeLists.txt) = a1a8690f10f40c89feb756eba238f643e136de4d
9SHA1 (patch-src_main_evidence.c) = 58dbce27ac3a3e2a8f8d84d44b68095af13015af 11SHA1 (patch-src_main_evidence.c) = 58dbce27ac3a3e2a8f8d84d44b68095af13015af
10SHA1 (patch-src_main_os.c) = b939ef713d279c4ab5ba23680dd39e6fb546ebca 12SHA1 (patch-src_main_os.c) = b939ef713d279c4ab5ba23680dd39e6fb546ebca
11SHA1 (patch-src_main_security.c) = dfbba5ce7ba37f195a8f72e1ae613cbd1288320e 13SHA1 (patch-src_main_security.c) = dfbba5ce7ba37f195a8f72e1ae613cbd1288320e
File Added: pkgsrc/lang/konoha/patches/patch-package_konoha.compiler_compiler.c
$NetBSD: patch-package_konoha.compiler_compiler.c,v 1.1 2015/03/31 15:44:47 joerg Exp $

--- package/konoha.compiler/compiler.c.orig	2015-03-28 23:05:26.000000000 +0000
+++ package/konoha.compiler/compiler.c
@@ -503,11 +503,19 @@ KMETHOD Compiler_getCurrentUline(CTX ctx
 
 KMETHOD Compiler_debug(CTX ctx, ksfp_t *sfp _RIX)
 {
+#if defined(__i386__) || defined(__x86_64__)
 	asm volatile("int3");
+#else
+	__builtin_trap();
+#endif
 }
 KMETHOD _debug_(CTX ctx, ksfp_t *sfp, kint_t a, kint_t b)
 {
+#if defined(__i386__) || defined(__x86_64__)
 	asm volatile("int3");
+#else
+	__builtin_trap();
+#endif
 	//void *p1 = (void*) a;
 	//void *p2 = (void*) b;
 	//fprintf(stderr, "%p %p %ld %ld %p %p\n", ctx, sfp, a, b, p1, p2);
@@ -515,7 +523,11 @@ KMETHOD _debug_(CTX ctx, ksfp_t *sfp, ki
 void __test__(void *a, void *b)
 {
 	fprintf(stderr, "%p %p\n", a, b);
+#if defined(__i386__) || defined(__x86_64__)
 	asm volatile("int3");
+#else
+	__builtin_trap();
+#endif
 }
 static void kook_compiler_emit(CTX ctx, kMethod *mtd)
 {
@@ -565,7 +577,11 @@ kMethod *compiler_LOOKUPMTD(CTX ctx, kOb
 KMETHOD Method_lazycompile(CTX ctx, ksfp_t *sfp _RIX) {
     kMethod *mtd = sfp[-1].mtdNC;
     assert(IS_Method(mtd));
-    asm volatile("int3");
+#if defined(__i386__) || defined(__x86_64__)
+	asm volatile("int3");
+#else
+	__builtin_trap();
+#endif
     CWB_t cwbbuf, *cwb = CWB_open(ctx, &cwbbuf);
     knh_write_cid(ctx, cwb->w, (mtd)->cid);
     knh_putc(ctx, cwb->w, '.');
File Added: pkgsrc/lang/konoha/patches/patch-package_konoha.io_CMakeLists.txt
$NetBSD: patch-package_konoha.io_CMakeLists.txt,v 1.1 2015/03/31 15:44:47 joerg Exp $

--- package/konoha.io/CMakeLists.txt.orig	2015-03-28 23:09:49.000000000 +0000
+++ package/konoha.io/CMakeLists.txt
@@ -1,9 +1,7 @@
 cmake_minimum_required(VERSION 2.6)
 set(CMAKE_BUILD_TYPE ${KONOHA_BUILD_TYPE})
 
-if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
-	set(CMAKE_C_FLAGS "-fPIC")
-endif()
+set(CMAKE_C_FLAGS "-fPIC")
 
 project(io)
 set(PACKAGE_SOURCE_CODE src/io.c src/base64.c ./src/digest.c ./src/msgpack.c)