| 1 |
commit: 2ca8942c4c8623d146fdf6543f84ab662d0584a7 |
| 2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 9 06:43:20 2021 +0000 |
| 4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 9 06:54:09 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ca8942c |
| 7 |
|
| 8 |
app-i18n/libkkc: fix link with gold |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/746482 |
| 11 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 12 |
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org> |
| 13 |
|
| 14 |
app-i18n/libkkc/files/libkkc-marisa-glib.patch | 23 ++++++++++++++++++++++ |
| 15 |
.../libkkc/libkkc-0.3.6_pre20190809104047.ebuild | 2 ++ |
| 16 |
app-i18n/libkkc/libkkc-9999.ebuild | 2 ++ |
| 17 |
3 files changed, 27 insertions(+) |
| 18 |
|
| 19 |
diff --git a/app-i18n/libkkc/files/libkkc-marisa-glib.patch b/app-i18n/libkkc/files/libkkc-marisa-glib.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..2b013d4f577 |
| 22 |
--- /dev/null |
| 23 |
+++ b/app-i18n/libkkc/files/libkkc-marisa-glib.patch |
| 24 |
@@ -0,0 +1,23 @@ |
| 25 |
+--- a/libkkc/Makefile.am |
| 26 |
++++ b/libkkc/Makefile.am |
| 27 |
+@@ -49,7 +49,11 @@ |
| 28 |
+ -DLOCALEDIR=\"$(datadir)/locale\" \ |
| 29 |
+ -I $(top_srcdir) \ |
| 30 |
+ $(NULL) |
| 31 |
+-libkkc_la_LIBADD = $(LIBKKC_LIBS) $(top_builddir)/marisa-glib/libmarisa-glib.la |
| 32 |
++libkkc_la_LIBADD = \ |
| 33 |
++ $(LIBKKC_LIBS) \ |
| 34 |
++ $(top_builddir)/marisa-glib/libmarisa-glib.la \ |
| 35 |
++ $(MARISA_GLIB_STATIC_DEPENDENCIES) \ |
| 36 |
++ $(NULL) |
| 37 |
+ libkkc_la_LDFLAGS = \ |
| 38 |
+ $(CODE_COVERAGE_LDFLAGS) \ |
| 39 |
+ -version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)" \ |
| 40 |
+@@ -66,7 +70,6 @@ |
| 41 |
+ libkkc_internals_la_LIBADD = \ |
| 42 |
+ $(libkkc_la_LIBADD) \ |
| 43 |
+ $(libkkc_la_OBJECTS) \ |
| 44 |
+- $(MARISA_GLIB_STATIC_DEPENDENCIES) \ |
| 45 |
+ $(NULL) |
| 46 |
+ libkkc_internals_la_LDFLAGS = \ |
| 47 |
+ $(CODE_COVERAGE_LDFLAGS) \ |
| 48 |
|
| 49 |
diff --git a/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild b/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild |
| 50 |
index 16e4031c08f..d3a6f2f23e2 100644 |
| 51 |
--- a/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild |
| 52 |
+++ b/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild |
| 53 |
@@ -43,6 +43,8 @@ BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]') |
| 54 |
virtual/pkgconfig |
| 55 |
nls? ( sys-devel/gettext )" |
| 56 |
|
| 57 |
+PATCHES=( "${FILESDIR}"/${PN}-marisa-glib.patch ) |
| 58 |
+ |
| 59 |
python_check_deps() { |
| 60 |
has_version -b "dev-libs/marisa[python,${PYTHON_USEDEP}]" |
| 61 |
} |
| 62 |
|
| 63 |
diff --git a/app-i18n/libkkc/libkkc-9999.ebuild b/app-i18n/libkkc/libkkc-9999.ebuild |
| 64 |
index cd65127fb1e..bd968d1693d 100644 |
| 65 |
--- a/app-i18n/libkkc/libkkc-9999.ebuild |
| 66 |
+++ b/app-i18n/libkkc/libkkc-9999.ebuild |
| 67 |
@@ -43,6 +43,8 @@ BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]') |
| 68 |
virtual/pkgconfig |
| 69 |
nls? ( sys-devel/gettext )" |
| 70 |
|
| 71 |
+PATCHES=( "${FILESDIR}"/${PN}-marisa-glib.patch ) |
| 72 |
+ |
| 73 |
python_check_deps() { |
| 74 |
has_version -b "dev-libs/marisa[python,${PYTHON_USEDEP}]" |
| 75 |
} |
Archives