| 1 |
jlec 12/04/04 08:07:04 |
| 2 |
|
| 3 |
Modified: ChangeLog nlopt-2.2.4.ebuild |
| 4 |
Log: |
| 5 |
sci-libs/nlopt: Correct handling of PYABI things, #405255 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha99/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.16 sci-libs/nlopt/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/nlopt/ChangeLog?rev=1.16&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/nlopt/ChangeLog?rev=1.16&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/nlopt/ChangeLog?r1=1.15&r2=1.16 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/nlopt/ChangeLog,v |
| 19 |
retrieving revision 1.15 |
| 20 |
retrieving revision 1.16 |
| 21 |
diff -u -r1.15 -r1.16 |
| 22 |
--- ChangeLog 1 Apr 2012 05:25:43 -0000 1.15 |
| 23 |
+++ ChangeLog 4 Apr 2012 08:07:04 -0000 1.16 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for sci-libs/nlopt |
| 26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/nlopt/ChangeLog,v 1.15 2012/04/01 05:25:43 jlec Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/nlopt/ChangeLog,v 1.16 2012/04/04 08:07:04 jlec Exp $ |
| 29 |
+ |
| 30 |
+ 04 Apr 2012; Justin Lecher <jlec@g.o> nlopt-2.2.4.ebuild: |
| 31 |
+ Correct handling of PYABI things, #405255 |
| 32 |
|
| 33 |
01 Apr 2012; Justin Lecher <jlec@g.o> nlopt-2.2.4.ebuild, |
| 34 |
metadata.xml: |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.8 sci-libs/nlopt/nlopt-2.2.4.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/nlopt/nlopt-2.2.4.ebuild?rev=1.8&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/nlopt/nlopt-2.2.4.ebuild?rev=1.8&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/nlopt/nlopt-2.2.4.ebuild?r1=1.7&r2=1.8 |
| 43 |
|
| 44 |
Index: nlopt-2.2.4.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/nlopt/nlopt-2.2.4.ebuild,v |
| 47 |
retrieving revision 1.7 |
| 48 |
retrieving revision 1.8 |
| 49 |
diff -u -r1.7 -r1.8 |
| 50 |
--- nlopt-2.2.4.ebuild 1 Apr 2012 05:25:43 -0000 1.7 |
| 51 |
+++ nlopt-2.2.4.ebuild 4 Apr 2012 08:07:04 -0000 1.8 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2012 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/nlopt/nlopt-2.2.4.ebuild,v 1.7 2012/04/01 05:25:43 jlec Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/nlopt/nlopt-2.2.4.ebuild,v 1.8 2012/04/04 08:07:04 jlec Exp $ |
| 57 |
|
| 58 |
EAPI=4 |
| 59 |
|
| 60 |
@@ -25,6 +25,8 @@ |
| 61 |
python? ( dev-python/numpy )" |
| 62 |
RDEPEND="${DEPEND}" |
| 63 |
|
| 64 |
+AUTOTOOLS_IN_SOURCE_BUILD=1 |
| 65 |
+ |
| 66 |
src_prepare() { |
| 67 |
if use python; then |
| 68 |
sed -i \ |
| 69 |
@@ -50,19 +52,21 @@ |
| 70 |
$(use_with python) |
| 71 |
--without-matlab |
| 72 |
) |
| 73 |
- use python && python_copy_sources swig |
| 74 |
autotools-utils_src_configure |
| 75 |
} |
| 76 |
|
| 77 |
src_compile() { |
| 78 |
autotools-utils_src_compile |
| 79 |
if use python; then |
| 80 |
+ python_copy_sources swig |
| 81 |
compilation() { |
| 82 |
autotools-utils_src_compile \ |
| 83 |
PYTHON_CPPFLAGS="-I$(python_get_includedir)" \ |
| 84 |
PYTHON_LDFLAGS="$(python_get_library -l)" \ |
| 85 |
PYTHON_SITE_PKG="$(python_get_sitedir)" \ |
| 86 |
PYTHON_VERSION="$(python_get_version)" \ |
| 87 |
+ PYTHON_INCLUDES="$(python_get_includedir)" \ |
| 88 |
+ pythondir="$(python_get_sitedir)" \ |
| 89 |
pyexecdir="$(python_get_sitedir)" |
| 90 |
} |
| 91 |
python_execute_function -s --source-dir swig compilation |
| 92 |
@@ -73,7 +77,8 @@ |
| 93 |
autotools-utils_src_install |
| 94 |
if use python; then |
| 95 |
installation() { |
| 96 |
- autotools-utils_src_install \ |
| 97 |
+ rm *.la |
| 98 |
+ emake DESTDIR=${D} install \ |
| 99 |
pyexecdir="$(python_get_sitedir)" \ |
| 100 |
pythondir="$(python_get_sitedir)" |
| 101 |
} |
Archives