[gentoo-commits] proj/sci:master commit in: sci-libs/p4est/, sci-libs/p4est/files/

["Nicolas Bock" <nicolasbock@gmail.com>]

commit:     574388c5bd674394bd261bd608fec304cdf1cbb4
Author:     Matthias Maier <tamiko <AT> kyomu <DOT> 43-1 <DOT> org>
AuthorDate: Thu Jul 25 22:11:03 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Thu Jul 25 22:11:03 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=574388c5

Patch the build system to use libtool properly

---
 sci-libs/p4est/files/p4est-libtool-fix.patch | 59 ++++++++++++++++++++++++++++
 sci-libs/p4est/p4est-0.3.4.1.ebuild          |  8 ++--
 2 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/sci-libs/p4est/files/p4est-libtool-fix.patch b/sci-libs/p4est/files/p4est-libtool-fix.patch
new file mode 100644
index 0000000..a484694
--- /dev/null
+++ b/sci-libs/p4est/files/p4est-libtool-fix.patch
@@ -0,0 +1,59 @@
+--- a/src/Makefile.am   2013-07-25 23:49:48.949442972 +0200
++++ b/src/Makefile.am   2013-07-25 23:50:23.255540853 +0200
+@@ -49,17 +49,6 @@
+ endif
+ P4EST_CPPFLAGS =
+ 
+-# build static library
+-lib_LIBRARIES += src/libp4est.a
+-src_libp4est_a_SOURCES = \
+-        $(libp4est_installed_headers) \
+-        $(libp4est_internal_headers) \
+-        $(libp4est_compiled_sources)
+-src_libp4est_a_CPPFLAGS = $(AM_CPPFLAGS) $(P4EST_CPPFLAGS)
+-src_libp4est_a_DEPENDENCIES = @P4EST_DEPENDENCIES@
+-
+-# build shared library
+-if P4EST_ENABLE_SHARED
+ lib_LTLIBRARIES += src/libp4est.la
+ src_libp4est_la_SOURCES = \
+         $(libp4est_internal_headers) \
+@@ -67,9 +56,6 @@
+ src_libp4est_la_CPPFLAGS = $(AM_CPPFLAGS) $(P4EST_CPPFLAGS)
+ src_libp4est_la_DEPENDENCIES = @P4EST_DEPENDENCIES@
+ LDADD += @top_builddir@/src/libp4est.la @P4EST_SC_LDADD@
+-else
+-LDADD += @top_builddir@/src/libp4est.a @P4EST_SC_LDADD@
+-endif
+ 
+ nodist_include_HEADERS += $(libp4est_generated_headers)
+ include_HEADERS += $(libp4est_installed_headers)
+--- a/sc/src/Makefile.am  2013-07-25 23:54:46.330624131 +0200
++++ a/sc/src/Makefile.am  2013-07-25 23:55:12.516935722 +0200
+@@ -35,26 +35,12 @@
+         src/sc_builtin/zlib.h src/sc_builtin/zconf.h
+ LIBSC_CPPFLAGS =
+ 
+-# build static library
+-lib_LIBRARIES += src/libsc.a
+-src_libsc_a_SOURCES = \
+-        $(libsc_installed_headers) \
+-        $(libsc_internal_headers) \
+-        $(libsc_compiled_sources)
+-src_libsc_a_CPPFLAGS = $(AM_CPPFLAGS) $(LIBSC_CPPFLAGS)
+-
+-# build shared library
+-if SC_ENABLE_SHARED
+ lib_LTLIBRARIES += src/libsc.la
+ src_libsc_la_SOURCES = \
+         $(libsc_internal_headers) \
+         $(libsc_compiled_sources)
+ src_libsc_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBSC_CPPFLAGS)
+ LDADD += @top_builddir@/src/libsc.la
+-else
+-LDADD += @top_builddir@/src/libsc.a
+-endif
+-LDADD_STATIC += @top_builddir@/src/libsc.a
+ 
+ nodist_include_HEADERS += $(libsc_generated_headers)
+ include_HEADERS += $(libsc_installed_headers)

diff --git a/sci-libs/p4est/p4est-0.3.4.1.ebuild b/sci-libs/p4est/p4est-0.3.4.1.ebuild
index 8e32b0e..1694e4a 100644
--- a/sci-libs/p4est/p4est-0.3.4.1.ebuild
+++ b/sci-libs/p4est/p4est-0.3.4.1.ebuild
@@ -4,6 +4,8 @@
 
 EAPI=5
 
+WANT_AUTOMAKE=1.11
+
 inherit autotools-utils toolchain-funcs eutils multilib
 
 DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
@@ -31,6 +33,9 @@ DEPEND="
 
 DOCS=(AUTHORS ChangeLog NEWS README)
 
+PATCHES=( "${FILESDIR}/${PN}-libtool-fix.patch" )
+AUTOTOOLS_AUTORECONF=true
+
 src_configure() {
 	local myeconfargs=(
         $(use_enable debug)
@@ -56,9 +61,6 @@ src_install() {
 		rm -r "${ED}"/usr/bin || die "rm failed"
 	fi
 
-	# *sigh* The build system apparently ignores --disable-static
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a
-
 	# Fix up some wrong installation pathes:
 	dodir /usr/share/p4est
 	mv "${ED}"/usr/share/data "${ED}"/usr/share/p4est/data