gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

dev-libs/libprelude: Fix the build with slibtool

Browse Source 
Closes: https://bugs.gentoo.org/790647
Signed-off-by: orbea <orbea@riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/26328
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
orbea
2022-07-10 09:36:53 -07:00
committed by Sam James
parent 3558043407
commit 89c20c8ae0
2 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
dev-libs/libprelude/files/libprelude-5.2.0-slibtool.patch Normal file
View File

@@ -0,0 +1,43 @@
Bug: https://bugs.gentoo.org/790647
From: orbea <orbea@riseup.net>
Date: Sun, 10 Jul 2022 09:26:59 -0700
Subject: [PATCH] Fix the build with slibtool
The build system should not use the .libs directory which is for
internal use by the libtool implementation only. GNU libtool is far less
strict than slibtool in these cases.
--- a/bindings/c++/Makefile.am
+++ b/bindings/c++/Makefile.am
@@ -21,7 +21,7 @@ libpreludecpp_la_SOURCES = \
prelude-log.cxx
libpreludecpp_la_LDFLAGS = -no-undefined -version-info @LIBPRELUDECPP_SONAME@
-libpreludecpp_la_LIBADD = $(top_builddir)/src/.libs/libprelude.la
+libpreludecpp_la_LIBADD = $(top_builddir)/src/libprelude.la
libpreludecpp_la_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/src/include -I$(top_srcdir)/src/include -I$(top_builddir)/src/libprelude-error -I$(top_builddir)/bindings/c++/include -I$(top_srcdir)/bindings/c++/include
endif
--- a/bindings/lua/Makefile.am
+++ b/bindings/lua/Makefile.am
@@ -10,7 +10,7 @@ dist_swigdata_DATA = libpreludecpp-lua.i
AM_CPPFLAGS = -I@top_srcdir@ -I@top_builddir@/src/include -I@top_srcdir@/src/include -I@top_builddir@/src/libprelude-error -I@top_srcdir@/bindings/c++/include @LUA_CFLAGS@ -I@top_srcdir@/libmissing -I@top_builddir@/libmissing
prelude_la_LDFLAGS = -module -avoid-version
-prelude_la_LIBADD = $(top_builddir)/bindings/c++/.libs/libpreludecpp.la
+prelude_la_LIBADD = $(top_builddir)/bindings/c++/libpreludecpp.la
prelude_la_SOURCES = prelude.cxx
preludedir = $(libdir)/lua/@LUA_VERSION@
prelude_LTLIBRARIES = prelude.la
--- a/bindings/ruby/Makefile.am
+++ b/bindings/ruby/Makefile.am
@@ -9,7 +9,7 @@ EXTRA_DIST = libpreludecpp-ruby.i Prelude.cxx
rbexec_LTLIBRARIES = Prelude.la
Prelude_la_CPPFLAGS = $(RUBY_INCLUDES) $(RUBY_CCFLAGS) -I@top_builddir@ -I$(top_srcdir)/src/include -I$(top_builddir)/src/include -I@top_builddir@/src/libprelude-error -I$(top_srcdir)/bindings/c++/include
Prelude_la_LDFLAGS = -module -avoid-version
-Prelude_la_LIBADD = $(top_builddir)/bindings/c++/.libs/libpreludecpp.la $(RUBY_LIBS)
+Prelude_la_LIBADD = $(top_builddir)/bindings/c++/libpreludecpp.la $(RUBY_LIBS)
nodist_Prelude_la_SOURCES = Prelude.cxx
Prelude.cxx: $(top_srcdir)/bindings/c++/include/*.hxx $(top_srcdir)/bindings/libpreludecpp.i libpreludecpp-ruby.i

1
dev-libs/libprelude/libprelude-5.2.0-r10.ebuild
View File

@@ -44,6 +44,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.0.0-fix-python-bindings.patch"
"${FILESDIR}/${PN}-5.1.0-fix_gtkdoc_1.32.patch"
"${FILESDIR}/${PN}-5.2.0-luabindings_liblua.patch"
"${FILESDIR}/${PN}-5.2.0-slibtool.patch" # 790647
)
src_prepare() {