* [gentoo-commits] repo/gentoo:master commit in: app-i18n/multiskkserv/, app-i18n/multiskkserv/files/
@ 2017-07-01 13:29 Akinori Hattori
0 siblings, 0 replies; 2+ messages in thread
From: Akinori Hattori @ 2017-07-01 13:29 UTC (permalink / raw
To: gentoo-commits
commit: 2c0f90abbf6bda4d37f84130faa491eb001aa2b9
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 1 13:28:10 2017 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Jul 1 13:28:10 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c0f90ab
app-i18n/multiskkserv: update patch to build with dev-db/tinycdb
Package-Manager: Portage-2.3.6, Repoman-2.3.1
.../files/multiskkserv-20100128-cdb.patch | 45 -------------------
app-i18n/multiskkserv/files/multiskkserv-cdb.patch | 52 ++++++++++++++++++++++
app-i18n/multiskkserv/multiskkserv-20100128.ebuild | 9 ++--
3 files changed, 58 insertions(+), 48 deletions(-)
diff --git a/app-i18n/multiskkserv/files/multiskkserv-20100128-cdb.patch b/app-i18n/multiskkserv/files/multiskkserv-20100128-cdb.patch
deleted file mode 100644
index 938043ca46b..00000000000
--- a/app-i18n/multiskkserv/files/multiskkserv-20100128-cdb.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 648f742..2ac4e92 100644
---- a/configure.in
-+++ b/configure.in
-@@ -108,22 +108,24 @@ if test "$with_cdb" = "no"; then
- else
- if test "$with_cdb" = "yes"; then
- for i in /usr/local /usr; do
-- if test -d "$i/include" -a -f "$i/include/cdb.h"; then
-- CDB_DIR="$i"
-- CDB_INCLUDES="-I$i/include"
-- available_cdb="yes"
-- for j in cdb.a buffer.a unix.a byte.a alloc.a; do
-- if test -f "$i/lib/$j"; then
-- LIBADD_CDB="$LIBADD_CDB $i/lib/$j"
-- else
-- available_cdb="no"
-- break
-- fi
-- done
-- if test "$available_cdb" = "yes"; then
-- break
-- fi
-- fi
-+ for inc in include include/cdb; do
-+ if test -d "$i/$inc" -a -f "$i/$inc/cdb.h"; then
-+ CDB_DIR="$i"
-+ CDB_INCLUDES="-I$i/$inc"
-+ available_cdb="yes"
-+ for j in cdb.a buffer.a unix.a byte.a alloc.a; do
-+ if test -f "$i/lib/$j"; then
-+ LIBADD_CDB="$LIBADD_CDB $i/lib/$j"
-+ else
-+ available_cdb="no"
-+ break
-+ fi
-+ done
-+ if test "$available_cdb" = "yes"; then
-+ break
-+ fi
-+ fi
-+ done
- done
- else
- if test -d "$with_cdb" -a -f "$with_cdb/cdb.h"; then
diff --git a/app-i18n/multiskkserv/files/multiskkserv-cdb.patch b/app-i18n/multiskkserv/files/multiskkserv-cdb.patch
new file mode 100644
index 00000000000..c6f0da50309
--- /dev/null
+++ b/app-i18n/multiskkserv/files/multiskkserv-cdb.patch
@@ -0,0 +1,52 @@
+--- a/configure.in
++++ b/configure.in
+@@ -126,19 +126,38 @@
+ fi
+ done
+ else
+- if test -d "$with_cdb" -a -f "$with_cdb/cdb.h"; then
+- CDB_DIR="$with_cdb"
+- CDB_INCLUDES="-I$with_cdb"
+- available_cdb="yes"
+- for j in cdb.a buffer.a unix.a byte.a alloc.a; do
+- if test -f "$with_cdb/$j"; then
+- LIBADD_CDB="$LIBADD_CDB $with_cdb/$j"
++ for i in include include/cdb; do
++ if test -f "$with_cdb/$i/cdb.h"; then
++ CDB_DIR="$with_cdb"
++ CDB_INCLUDES="-I$with_cdb/$i"
++ available_cdb="yes"
++ if test -f "$with_cdb/$i/uint32.h"; then
++ for l in lib64 lib32 lib; do
++ for a in cdb.a alloc.a buffer.a byte.a unix.a; do
++ if test -f "$with_cdb/$l/$a"; then
++ LIBADD_CDB="$LIBADD_CDB $with_cdb/$l/$a"
++ else
++ LIBADD_CDB=""
++ available_cdb="no"
++ break
++ fi
++ done
++ if test "$available_cdb" = "yes"; then
++ break
++ fi
++ done
+ else
+- available_cdb="no"
+- break
++ save_LIBS="$LIBS"
++ AC_CHECK_LIB(cdb, cdb_init)
++ LIBS="$save_LIBS"
++ LIBADD_CDB="-lcdb"
++ AC_DEFINE(USE_TINYCDB, 1, [Use tinycdb])
+ fi
+- done
+- fi
++ fi
++ if test "$available_cdb" = "yes"; then
++ break
++ fi
++ done
+ fi
+ if test "$available_cdb" = "yes"; then
+ AC_MSG_RESULT([cdb found, path: $CDB_DIR])
diff --git a/app-i18n/multiskkserv/multiskkserv-20100128.ebuild b/app-i18n/multiskkserv/multiskkserv-20100128.ebuild
index b6ec66dc57b..7ffc4e22f88 100644
--- a/app-i18n/multiskkserv/multiskkserv-20100128.ebuild
+++ b/app-i18n/multiskkserv/multiskkserv-20100128.ebuild
@@ -14,11 +14,14 @@ SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE="test"
-DEPEND="dev-db/cdb
+DEPEND="|| (
+ dev-db/tinycdb
+ dev-db/cdb
+ )
test? ( app-i18n/nkf )"
RDEPEND="app-i18n/skk-jisyo[cdb]"
-PATCHES=( "${FILESDIR}"/${P}-cdb.patch )
+PATCHES=( "${FILESDIR}"/${PN}-cdb.patch )
src_prepare() {
default
@@ -27,7 +30,7 @@ src_prepare() {
}
src_configure() {
- econf --with-cdb=yes
+ econf --with-cdb="${EPREFIX}"/usr
}
src_install() {
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-i18n/multiskkserv/, app-i18n/multiskkserv/files/
@ 2024-03-16 8:55 Joonas Niilola
0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2024-03-16 8:55 UTC (permalink / raw
To: gentoo-commits
commit: 3d860473a378df53921265a9b52daa46b6bfe641
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Wed Feb 21 17:29:24 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 08:55:15 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d860473
app-i18n/multiskkserv: fix tests with slibtool
Closes: https://bugs.gentoo.org/924142
Upstream-PR: https://github.com/sina-ht/multiskkserv/pull/1
Upstream-Commit: https://github.com/sina-ht/multiskkserv/commit/20983c7ea43e4a0c12df123e17901fa40ed2f914
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/35473
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../multiskkserv/files/multiskkserv-slibtool.patch | 70 ++++++++++++++++++++++
app-i18n/multiskkserv/multiskkserv-20100128.ebuild | 7 ++-
2 files changed, 75 insertions(+), 2 deletions(-)
diff --git a/app-i18n/multiskkserv/files/multiskkserv-slibtool.patch b/app-i18n/multiskkserv/files/multiskkserv-slibtool.patch
new file mode 100644
index 000000000000..99024e093392
--- /dev/null
+++ b/app-i18n/multiskkserv/files/multiskkserv-slibtool.patch
@@ -0,0 +1,70 @@
+https://github.com/sina-ht/multiskkserv/pull/1
+https://github.com/sina-ht/multiskkserv/commit/20983c7ea43e4a0c12df123e17901fa40ed2f914
+
+From aa0f1cca52eb95ce859aa8a4f20fad9c12757080 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Wed, 21 Feb 2024 09:16:47 -0800
+Subject: [PATCH] build: avoid killall(1) for 'make check'
+
+When building the multiskkserv tests with slibtool instead of GNU
+libtool it fails when 'killall src/multiskkserv' fails to find any
+processes. This is because with slibtool it is a shell wrapper script
+for 'src/.libs/multiskkserv'.
+
+To avoid this issue a more robust 'check.sh' script was added to run the
+tests and correctly kill the multiskkserv process with both GNU libtool
+and slibtool.
+
+This was reported for Gentoo: https://bugs.gentoo.org/924142
+---
+ Makefile.am | 11 +----------
+ check.sh | 18 ++++++++++++++++++
+ 2 files changed, 19 insertions(+), 10 deletions(-)
+ create mode 100755 check.sh
+
+diff --git a/Makefile.am b/Makefile.am
+index b98060a..940d61c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,16 +6,7 @@ EXTRA_DIST = COPYING.j README.j common.h compat.h test/SKK-JISYO.S test/henkan-e
+
+ check:
+ @mkdir -p $(top_builddir)/test
+- $(top_builddir)/tools/skkdic-p2cdb $(top_builddir)/test/SKK-JISYO.S.cdb < $(top_srcdir)/test/SKK-JISYO.S
+- $(top_builddir)/src/multiskkserv -s 127.0.0.1 -p 12347 $(top_builddir)/test/SKK-JISYO.S.cdb &
+- @sleep 1
+- @$(top_builddir)/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 stat
+- $(top_builddir)/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 -y `cat $(top_srcdir)/test/kan-euc.txt` tran > $(top_builddir)/test/kan-euc-tran.txt
+- $(top_builddir)/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 -y `cat $(top_srcdir)/test/ka-euc.txt` tran > $(top_builddir)/test/ka-euc-tran.txt
+- $(top_builddir)/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 -y `cat $(top_srcdir)/test/kanji-euc.txt` tran > $(top_builddir)/test/kanji-euc-tran.txt
+- $(top_builddir)/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 -y `cat $(top_srcdir)/test/henkan-euc.txt` tran > $(top_builddir)/test/henkan-euc-tran.txt
+- $(top_builddir)/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 -y `cat $(top_srcdir)/test/henkandekinai-euc.txt` tran > $(top_builddir)/test/henkandekinai-euc-tran.txt
+- killall src/multiskkserv
++ $(top_srcdir)/check.sh "$(top_builddir)" "$(top_srcdir)"
+ @nkf -w $(top_srcdir)/test/kan-euc.txt
+ @nkf -w $(top_builddir)/test/kan-euc-tran.txt
+ @nkf -w $(top_srcdir)/test/ka-euc.txt
+diff --git a/check.sh b/check.sh
+new file mode 100755
+index 0000000..64705bf
+--- /dev/null
++++ b/check.sh
+@@ -0,0 +1,18 @@
++#!/bin/sh
++
++set -euvx
++
++builddir="${1:?}"
++srcdir="${2:?}"
++
++"$builddir"/tools/skkdic-p2cdb "$builddir"/test/SKK-JISYO.S.cdb < "$srcdir"/test/SKK-JISYO.S
++"$builddir"/src/multiskkserv -s 127.0.0.1 -p 12347 "$builddir"/test/SKK-JISYO.S.cdb &
++multiskkserv_pid=$!
++sleep 1
++"$builddir"/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 stat
++"$builddir"/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 -y `cat "$srcdir"/test/kan-euc.txt` tran > "$builddir"/test/kan-euc-tran.txt
++"$builddir"/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 -y `cat "$srcdir"/test/ka-euc.txt` tran > "$builddir"/test/ka-euc-tran.txt
++"$builddir"/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 -y `cat "$srcdir"/test/kanji-euc.txt` tran > "$builddir"/test/kanji-euc-tran.txt
++"$builddir"/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 -y `cat "$srcdir"/test/henkan-euc.txt` tran > "$builddir"/test/henkan-euc-tran.txt
++"$builddir"/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 -y `cat "$srcdir"/test/henkandekinai-euc.txt` tran > "$builddir"/test/henkandekinai-euc-tran.txt
++kill -15 "$multiskkserv_pid"
diff --git a/app-i18n/multiskkserv/multiskkserv-20100128.ebuild b/app-i18n/multiskkserv/multiskkserv-20100128.ebuild
index a12237346057..ff88aaa52024 100644
--- a/app-i18n/multiskkserv/multiskkserv-20100128.ebuild
+++ b/app-i18n/multiskkserv/multiskkserv-20100128.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
@@ -23,7 +23,10 @@ RDEPEND="app-i18n/skk-jisyo[cdb]
DEPEND="${RDEPEND}
test? ( app-i18n/nkf )"
-PATCHES=( "${FILESDIR}"/${PN}-cdb.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-cdb.patch
+ "${FILESDIR}"/${PN}-slibtool.patch #924142
+)
src_prepare() {
default
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-03-16 8:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-01 13:29 [gentoo-commits] repo/gentoo:master commit in: app-i18n/multiskkserv/, app-i18n/multiskkserv/files/ Akinori Hattori
-- strict thread matches above, loose matches on Subject: below --
2024-03-16 8:55 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox