[gentoo-commits] proj/sci:master commit in: sci-biology/bamql/, sci-biology/bamql/files/

[gentoo-commits] proj/sci:master commit in: sci-biology/bamql/, sci-biology/bamql/files/

[Martin Mokrejs]

commit:     732c892485ba23fb419d064b28cba2b0dd982f90
Author:     Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
AuthorDate: Mon Mar 25 23:52:45 2019 +0000
Commit:     Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
CommitDate: Mon Mar 25 23:52:45 2019 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=732c8924

sci-biology/bamql: remove dependency on llvm static libs

Thanks for the patch and guidance to François Bissey:
https://github.com/gentoo/sci/issues/907

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Martin Mokrejs <mmokrejs <AT> fold.natur.cuni.cz>

 sci-biology/bamql/bamql-1.6.1.ebuild               | 12 ++++++-----
 sci-biology/bamql/bamql-9999.ebuild                | 12 ++++++-----
 .../bamql-1.6.1_drop_enable_static_llvm.patch      | 23 ++++++++++++++++++++++
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/sci-biology/bamql/bamql-1.6.1.ebuild b/sci-biology/bamql/bamql-1.6.1.ebuild
index 146793318..dacad6029 100644
--- a/sci-biology/bamql/bamql-1.6.1.ebuild
+++ b/sci-biology/bamql/bamql-1.6.1.ebuild
@@ -22,14 +22,16 @@ DEPEND="
 	dev-libs/libpcre"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}"/bamql-1.6.1_drop_enable_static_llvm.patch )
+
 src_prepare(){
-	eautoreconf
 	default
+	eautoreconf
 }
 
 src_configure(){
-	local mycmakeargs=()
-	use static-libs && mycmakeargs+=( "--enable-static=yes" "--enable-static-llvm=yes" ) || \
-		mycmakeargs+=( "--enable-static=no" "--enable-static-llvm=no" )
-	econf ${mycmakeargs[@]}
+	local myeconfargs=()
+	use static-libs && myeconfargs+=( "--enable-static=yes" ) || \
+		myeconfargs+=( "--enable-static=no" )
+	econf ${myeconfargs[@]}
 }

diff --git a/sci-biology/bamql/bamql-9999.ebuild b/sci-biology/bamql/bamql-9999.ebuild
index e9730e73b..cda5043a7 100644
--- a/sci-biology/bamql/bamql-9999.ebuild
+++ b/sci-biology/bamql/bamql-9999.ebuild
@@ -22,14 +22,16 @@ DEPEND="
 	dev-libs/libpcre"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}"/bamql-1.6.1_drop_enable_static_llvm.patch )
+
 src_prepare(){
-	eautoreconf
 	default
+	eautoreconf
 }
 
 src_configure(){
-	local mycmakeargs=()
-	use static-libs && mycmakeargs+=( "--enable-static=yes" "--enable-static-llvm=yes" ) || \
-		mycmakeargs+=( "--enable-static=no" "--enable-static-llvm=no" )
-	econf ${mycmakeargs[@]}
+	local myeconfargs=()
+	use static-libs && myeconfargs+=( "--enable-static=yes" ) || \
+		myeconfargs+=( "--enable-static=no" )
+	econf ${myeconfargs[@]}
 }

diff --git a/sci-biology/bamql/files/bamql-1.6.1_drop_enable_static_llvm.patch b/sci-biology/bamql/files/bamql-1.6.1_drop_enable_static_llvm.patch
new file mode 100644
index 000000000..e76d245c8
--- /dev/null
+++ b/sci-biology/bamql/files/bamql-1.6.1_drop_enable_static_llvm.patch
@@ -0,0 +1,23 @@
+--- bamql-1.6.1/m4/ax_llvm.m4.old	2019-03-25 23:17:05.190272994 +0100
++++ bamql-1.6.1/m4/ax_llvm.m4	2019-03-25 23:16:10.698775171 +0100
+@@ -28,7 +28,6 @@
+ 
+ AC_DEFUN([AX_LLVM],
+ [
+-AC_ARG_ENABLE([static-llvm], AS_HELP_STRING([--enable-static-llvm], [compiled against the static LLVM libraries, instead of the shared library.]), [enable_static_llvm=yes])
+ AC_ARG_WITH([llvm-config],
+ 	AS_HELP_STRING([--with-llvm-config@<:@=FILE@:>@], [ the name or or complete path to the llvm-config script for llvm (optional)]),
+ 	[
+@@ -53,11 +52,7 @@
+ 		[$1]_LIBDIR="$($ac_llvm_config_path --libdir)"
+ 		LLVM_VERSION="$($ac_llvm_config_path --version | cut -f 1-2 -d .)"
+ 		LLVM_COMPONENTS="$2"
+-		if test "x$enable_static_llvm" != "xyes" ; then
+-			[$1]_LIBS="$($ac_llvm_config_path --libs --system-libs --link-static $LLVM_COMPONENTS | tr '\n' ' ')"
+-		else
+-			[$1]_LIBS="$($ac_llvm_config_path --libs --link-shared $LLVM_COMPONENTS | tr '\n' ' ')"
+-		fi
++		[$1]_LIBS="$($ac_llvm_config_path --libs $LLVM_COMPONENTS | tr '\n' ' ')"
+ 
+ 		AC_REQUIRE([AC_PROG_CXX])
+ 		CPPFLAGS_SAVED="$CPPFLAGS"