commit: 2ca8942c4c8623d146fdf6543f84ab662d0584a7 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> AuthorDate: Sat Oct 9 06:43:20 2021 +0000 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> CommitDate: Sat Oct 9 06:54:09 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ca8942c
app-i18n/libkkc: fix link with gold Closes: https://bugs.gentoo.org/746482 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org> app-i18n/libkkc/files/libkkc-marisa-glib.patch | 23 ++++++++++++++++++++++ .../libkkc/libkkc-0.3.6_pre20190809104047.ebuild | 2 ++ app-i18n/libkkc/libkkc-9999.ebuild | 2 ++ 3 files changed, 27 insertions(+) diff --git a/app-i18n/libkkc/files/libkkc-marisa-glib.patch b/app-i18n/libkkc/files/libkkc-marisa-glib.patch new file mode 100644 index 00000000000..2b013d4f577 --- /dev/null +++ b/app-i18n/libkkc/files/libkkc-marisa-glib.patch @@ -0,0 +1,23 @@ +--- a/libkkc/Makefile.am ++++ b/libkkc/Makefile.am +@@ -49,7 +49,11 @@ + -DLOCALEDIR=\"$(datadir)/locale\" \ + -I $(top_srcdir) \ + $(NULL) +-libkkc_la_LIBADD = $(LIBKKC_LIBS) $(top_builddir)/marisa-glib/libmarisa-glib.la ++libkkc_la_LIBADD = \ ++ $(LIBKKC_LIBS) \ ++ $(top_builddir)/marisa-glib/libmarisa-glib.la \ ++ $(MARISA_GLIB_STATIC_DEPENDENCIES) \ ++ $(NULL) + libkkc_la_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) \ + -version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)" \ +@@ -66,7 +70,6 @@ + libkkc_internals_la_LIBADD = \ + $(libkkc_la_LIBADD) \ + $(libkkc_la_OBJECTS) \ +- $(MARISA_GLIB_STATIC_DEPENDENCIES) \ + $(NULL) + libkkc_internals_la_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) \ diff --git a/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild b/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild index 16e4031c08f..d3a6f2f23e2 100644 --- a/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild +++ b/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild @@ -43,6 +43,8 @@ BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]') virtual/pkgconfig nls? ( sys-devel/gettext )" +PATCHES=( "${FILESDIR}"/${PN}-marisa-glib.patch ) + python_check_deps() { has_version -b "dev-libs/marisa[python,${PYTHON_USEDEP}]" } diff --git a/app-i18n/libkkc/libkkc-9999.ebuild b/app-i18n/libkkc/libkkc-9999.ebuild index cd65127fb1e..bd968d1693d 100644 --- a/app-i18n/libkkc/libkkc-9999.ebuild +++ b/app-i18n/libkkc/libkkc-9999.ebuild @@ -43,6 +43,8 @@ BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]') virtual/pkgconfig nls? ( sys-devel/gettext )" +PATCHES=( "${FILESDIR}"/${PN}-marisa-glib.patch ) + python_check_deps() { has_version -b "dev-libs/marisa[python,${PYTHON_USEDEP}]" }
