plain forgot that both flavors could combine. Reminded by naddy@

fixes the remaining -fno-common
This commit is contained in:
espie 2021-02-16 08:50:47 +00:00
parent 313cadef3c
commit cd941ff1b3
3 changed files with 14 additions and 7 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.21 2021/02/10 20:39:56 espie Exp $
# $OpenBSD: Makefile,v 1.22 2021/02/16 08:50:47 espie Exp $
COMMENT= library for Japanese Input Method Wnn4
@ -8,7 +8,7 @@ COMMENT-wnn4-canna= library for Japanese Input Method canna or wnn4
FULLPKGNAME= ja-onew${FLAVOR_EXT}-2.2.10
DISTNAME= jvim2.0r+onew2.2.10
REVISION= 3
REVISION= 4
CATEGORIES= japanese
MASTER_SITES= ftp://ftp.lab.kdd.co.jp/Japan/onew/ \

View File

@ -1,12 +1,14 @@
$OpenBSD: patch-engine_CannaRk_c,v 1.2 2021/02/10 20:39:57 espie Exp $
$OpenBSD: patch-engine_CannaRk_c,v 1.3 2021/02/16 08:50:47 espie Exp $
Index: engine/CannaRk.c
--- engine/CannaRk.c.orig
+++ engine/CannaRk.c
@@ -21,10 +21,11 @@ History:
@@ -20,11 +20,12 @@ History:
931127 added RKTAB searching in RKPATH
931214 deleted exceptional NN handling
///////////////////////////////////////////////////////////////////////*/
int RomkanExists;
-int RomkanExists;
-int ONEW_kanamode;
+extern int RomkanExists;
+extern int ONEW_kanamode;
#include <ctype.h>

View File

@ -1,8 +1,13 @@
$OpenBSD: patch-engine_Canna_c,v 1.2 2021/02/10 20:39:57 espie Exp $
$OpenBSD: patch-engine_Canna_c,v 1.3 2021/02/16 08:50:47 espie Exp $
Index: engine/Canna.c
--- engine/Canna.c.orig
+++ engine/Canna.c
@@ -24,6 +24,8 @@ int KanakanExists;
@@ -20,10 +20,12 @@ History:
931127 jrKanjiControl() for initialization with .canna
931213 RkGetHinshi+RkDeleteDic
///////////////////////////////////////////////////////////////////////*/
-int KanakanExists;
+extern int KanakanExists;
#include <canna/RK.h>
#include <canna/jrkanji.h>