kakasi: fix cross compile

This commit is contained in:
Đoàn Trần Công Danh 2020-02-13 17:53:16 +07:00 committed by Jürgen Buchmüller
parent 3adf1a55ad
commit 475c5bffb4
2 changed files with 46 additions and 2 deletions

View file

@ -0,0 +1,36 @@
Makefile.am | 4 +++-
configure.in | 4 ----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 1278f28..1eda657 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,9 +15,11 @@ SUBDIRS = src lib man tests
CLEANFILES = kanwadict
+MKKANWA = src/mkkanwa$(EXEEXT)
+
kanwadict:
if test -f kakasidict; then \
- ITAIJIDICT="itaijidict" src/mkkanwa$(EXEEXT) $@ kakasidict; \
+ ITAIJIDICT="itaijidict" $(MKKANWA) $@ kakasidict; \
fi
dist-hook:
diff --git a/configure.in b/configure.in
index e865b04..e2930b1 100644
--- a/configure.in
+++ b/configure.in
@@ -84,10 +84,6 @@ AS_VAR_IF(utf8, "yes",[
AM_ICONV
LIBS="$LIBICONV $LIBS"
AC_DEFINE(KAKASI_SUPPORT_UTF8, 1, [KAKASI_SUPPORT_UTF8])
- AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <iconv.h>],
- [if (iconv_open("EUC-JP", "UTF-8") == -1) exit(1);])],
- [],
- [AC_MSG_ERROR([can not use EUC-JP or UTF-8 encoding on iconv])])
])
dnl check gcc flags

View file

@ -3,13 +3,21 @@ pkgname=kakasi
version=2.3.6
revision=2
build_style=gnu-configure
hostmakedepends="automake libtool gettext-devel"
short_desc="Tool to convert Kanji characters to Hiragana, Katakana or Romaji"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://kakasi.namazu.org/"
distfiles="http://kakasi.namazu.org/stable/kakasi-${version}.tar.gz"
checksum=004276fd5619c003f514822d82d14ae83cd45fb9338e0cb56a44974b44961893
patch_args=-Np1
nocross="https://travis-ci.org/voidlinux/void-packages/jobs/378177805#L933
https://travis-ci.org/voidlinux/void-packages/jobs/378177806#L933"
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" kakasi"
make_build_args+=" MKKANWA=/usr/bin/mkkanwa"
fi
pre_configure() {
NOCONFIGURE=1 autoreconf -fi
NOCONFIGURE=1 automake
}