aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlessandro Barbieri <lssndrbarbieri@gmail.com>2022-04-05 11:29:16 +0200
committerAlessandro Barbieri <lssndrbarbieri@gmail.com>2022-04-15 22:34:11 +0200
commit510e90ff9df65de7c35baff5edbd13bd0cf45514 (patch)
tree68fbd3051c3a80209cdbf5876834b51a9b221775 /sys-cluster/libi
parentsys-cluster/mrnet: respect AR (diff)
downloadguru-510e90ff9df65de7c35baff5edbd13bd0cf45514.tar.gz
guru-510e90ff9df65de7c35baff5edbd13bd0cf45514.tar.bz2
guru-510e90ff9df65de7c35baff5edbd13bd0cf45514.zip
sys-cluster/libi: respect AR
Bug: https://bugs.gentoo.org/836798 Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
Diffstat (limited to 'sys-cluster/libi')
-rw-r--r--sys-cluster/libi/files/libi-5.0.1_p20180510-respect-variables.patch20
-rw-r--r--sys-cluster/libi/libi-5.0.1_p20180510-r1.ebuild (renamed from sys-cluster/libi/libi-5.0.1_p20180510.ebuild)13
2 files changed, 31 insertions, 2 deletions
diff --git a/sys-cluster/libi/files/libi-5.0.1_p20180510-respect-variables.patch b/sys-cluster/libi/files/libi-5.0.1_p20180510-respect-variables.patch
new file mode 100644
index 000000000..b35493142
--- /dev/null
+++ b/sys-cluster/libi/files/libi-5.0.1_p20180510-respect-variables.patch
@@ -0,0 +1,20 @@
+--- a/conf/configure.in
++++ b/conf/configure.in
+@@ -66,7 +66,6 @@
+ AC_PROG_YACC
+ AC_PROG_LN_S
+
+-AC_PATH_PROG(AR, ar)
+ ARFLAGS="crv"
+ AC_SUBST(AR)
+ AC_SUBST(ARFLAGS)
+@@ -87,9 +86,6 @@
+ STDCFLAGS="-D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS"
+ CXXFLAGS="$CXXFLAGS -fPIC $STDCFLAGS"
+
+-dnl === Ignore user-requested debug/optimization levels
+-CXXFLAGS=`echo $CXXFLAGS | sed 's/-g //; s/-O //; s/-O1 //; s/-O2 //; s/-O3 //'`
+-
+ SOFLAGS="$SOFLAGS -fPIC -shared -rdynamic"
+ AC_SUBST(SOFLAGS)
+
diff --git a/sys-cluster/libi/libi-5.0.1_p20180510.ebuild b/sys-cluster/libi/libi-5.0.1_p20180510-r1.ebuild
index cd65d0a7a..2d6aca279 100644
--- a/sys-cluster/libi/libi-5.0.1_p20180510.ebuild
+++ b/sys-cluster/libi/libi-5.0.1_p20180510-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
COMMIT="7375ba5bb0df87c68e58ad15e9e5e351ae020c08"
@@ -30,11 +30,20 @@ PATCHES=(
"${FILESDIR}/${PN}-create-libdir.patch"
"${FILESDIR}/${PN}-link-launchmon.patch"
"${FILESDIR}/${PN}-shared-library.patch"
+ "${FILESDIR}/${P}-respect-variables.patch"
)
-src_configure() {
+src_prepare() {
tc-export AR
+ default
+ pushd conf || die
+ mv configure.{in,ac} || die
+ eautoreconf
+ popd || die
+ mv conf/configure configure || die
+}
+src_configure() {
local myconf=(
--enable-shared
--with-launchmon="${EPREFIX}/usr"