| 1 |
commit: 0f0051b915b593a44b9150be6d1744a7ea1215d0 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 25 02:14:31 2016 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 25 02:21:04 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f0051b9 |
| 7 |
|
| 8 |
app-pda/libplist: Override PYTHON_LDFLAGS in src_configure |
| 9 |
|
| 10 |
Works around broken build system. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/567370 |
| 13 |
|
| 14 |
Package-Manager: portage-2.2.27_p49 |
| 15 |
|
| 16 |
app-pda/libplist/libplist-1.11-r2.ebuild | 13 ++++++------- |
| 17 |
app-pda/libplist/libplist-1.12.ebuild | 13 ++++++------- |
| 18 |
2 files changed, 12 insertions(+), 14 deletions(-) |
| 19 |
|
| 20 |
diff --git a/app-pda/libplist/libplist-1.11-r2.ebuild b/app-pda/libplist/libplist-1.11-r2.ebuild |
| 21 |
index 600f79c..e19af75 100644 |
| 22 |
--- a/app-pda/libplist/libplist-1.11-r2.ebuild |
| 23 |
+++ b/app-pda/libplist/libplist-1.11-r2.ebuild |
| 24 |
@@ -1,4 +1,4 @@ |
| 25 |
-# Copyright 1999-2015 Gentoo Foundation |
| 26 |
+# Copyright 1999-2016 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
# $Id$ |
| 29 |
|
| 30 |
@@ -29,11 +29,6 @@ RESTRICT="test" # TODO: src_test() was dropped from 1.10 (cmake) -> 1.11 (autoto |
| 31 |
|
| 32 |
BUILD_DIR="${S}_build" |
| 33 |
|
| 34 |
-src_prepare() { |
| 35 |
- sed -i -e 's/AC_PYTHON_DEVEL/AX_PYTHON_DEVEL/' "${S}"/m4/cython_python.m4 |
| 36 |
- eautoreconf |
| 37 |
-} |
| 38 |
- |
| 39 |
src_configure() { |
| 40 |
local ECONF_SOURCE=${S} |
| 41 |
local myeconfargs=( $(use_enable static-libs static) ) |
| 42 |
@@ -45,8 +40,12 @@ src_configure() { |
| 43 |
popd >/dev/null || die |
| 44 |
} |
| 45 |
|
| 46 |
+ do_configure_python() { |
| 47 |
+ PYTHON_LDFLAGS="$(python_get_LIBS)" do_configure "$@" |
| 48 |
+ } |
| 49 |
+ |
| 50 |
do_configure --without-cython |
| 51 |
- use python && python_foreach_impl do_configure |
| 52 |
+ use python && python_foreach_impl do_configure_python |
| 53 |
} |
| 54 |
|
| 55 |
src_compile() { |
| 56 |
|
| 57 |
diff --git a/app-pda/libplist/libplist-1.12.ebuild b/app-pda/libplist/libplist-1.12.ebuild |
| 58 |
index bc3d53f..8f40dc7 100644 |
| 59 |
--- a/app-pda/libplist/libplist-1.12.ebuild |
| 60 |
+++ b/app-pda/libplist/libplist-1.12.ebuild |
| 61 |
@@ -1,4 +1,4 @@ |
| 62 |
-# Copyright 1999-2015 Gentoo Foundation |
| 63 |
+# Copyright 1999-2016 Gentoo Foundation |
| 64 |
# Distributed under the terms of the GNU General Public License v2 |
| 65 |
# $Id$ |
| 66 |
|
| 67 |
@@ -29,11 +29,6 @@ RESTRICT="test" # TODO: src_test() was dropped from 1.10 (cmake) -> 1.11 (autoto |
| 68 |
|
| 69 |
BUILD_DIR="${S}_build" |
| 70 |
|
| 71 |
-src_prepare() { |
| 72 |
- sed -i -e 's/AC_PYTHON_DEVEL/AX_PYTHON_DEVEL/' "${S}"/m4/cython_python.m4 |
| 73 |
- eautoreconf |
| 74 |
-} |
| 75 |
- |
| 76 |
src_configure() { |
| 77 |
local ECONF_SOURCE=${S} |
| 78 |
local myeconfargs=( $(use_enable static-libs static) ) |
| 79 |
@@ -45,8 +40,12 @@ src_configure() { |
| 80 |
popd >/dev/null || die |
| 81 |
} |
| 82 |
|
| 83 |
+ do_configure_python() { |
| 84 |
+ PYTHON_LDFLAGS="$(python_get_LIBS)" do_configure "$@" |
| 85 |
+ } |
| 86 |
+ |
| 87 |
do_configure --without-cython |
| 88 |
- use python && python_foreach_impl do_configure |
| 89 |
+ use python && python_foreach_impl do_configure_python |
| 90 |
} |
| 91 |
|
| 92 |
src_compile() { |
Archives