| 1 |
bicatali 13/03/04 17:19:40 |
| 2 |
|
| 3 |
Modified: nlopt-2.3-r2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Remove pure C++ tests when testing C library, bug #460284 |
| 6 |
|
| 7 |
(Portage version: 2.2.01.21688-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 sci-libs/nlopt/nlopt-2.3-r2.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/nlopt/nlopt-2.3-r2.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/nlopt/nlopt-2.3-r2.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/nlopt/nlopt-2.3-r2.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: nlopt-2.3-r2.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/nlopt/nlopt-2.3-r2.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- nlopt-2.3-r2.ebuild 3 Mar 2013 05:21:04 -0000 1.1 |
| 23 |
+++ nlopt-2.3-r2.ebuild 4 Mar 2013 17:19:40 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2013 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/nlopt/nlopt-2.3-r2.ebuild,v 1.1 2013/03/03 05:21:04 bicatali Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/nlopt/nlopt-2.3-r2.ebuild,v 1.2 2013/03/04 17:19:40 bicatali Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
@@ -45,8 +45,9 @@ |
| 33 |
|
| 34 |
src_configure() { |
| 35 |
if use octave; then |
| 36 |
- export OCT_INSTALL_DIR="${EPREFIX}"/usr/libexec/octave/site/oct/${CHOST} |
| 37 |
- export M_INSTALL_DIR="${EPREFIX}"/usr/share/octave/site/m |
| 38 |
+ export OCT_INSTALL_DIR="$(octave-config -p LOCALOCTFILEDIR)" |
| 39 |
+ export M_INSTALL_DIR="$(octave-config -p LOCALFCNFILEDIR)" |
| 40 |
+ |
| 41 |
else |
| 42 |
export MKOCTFILE=None |
| 43 |
fi |
| 44 |
@@ -82,8 +83,14 @@ |
| 45 |
} |
| 46 |
|
| 47 |
src_test() { |
| 48 |
- cd "${AUTOTOOLS_BUILD_DIR}"/test |
| 49 |
local a f |
| 50 |
+ cd "${BUILD_DIR}"/test |
| 51 |
+ for a in {1..7}; do |
| 52 |
+ for f in {5..9}; do |
| 53 |
+ ./testopt -a $a -o $f || die "algorithm $a function $f failed" |
| 54 |
+ done |
| 55 |
+ done |
| 56 |
+ cd "${BUILD_DIR}_cxx"/test |
| 57 |
for a in {1..9}; do |
| 58 |
for f in {5..9}; do |
| 59 |
./testopt -a $a -o $f || die "algorithm $a function $f failed" |
| 60 |
|
| 61 |
|
| 62 |
|
| 63 |
1.21 sci-libs/nlopt/ChangeLog |
| 64 |
|
| 65 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/nlopt/ChangeLog?rev=1.21&view=markup |
| 66 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/nlopt/ChangeLog?rev=1.21&content-type=text/plain |
| 67 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/nlopt/ChangeLog?r1=1.20&r2=1.21 |
| 68 |
|
| 69 |
Index: ChangeLog |
| 70 |
=================================================================== |
| 71 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/nlopt/ChangeLog,v |
| 72 |
retrieving revision 1.20 |
| 73 |
retrieving revision 1.21 |
| 74 |
diff -u -r1.20 -r1.21 |
| 75 |
--- ChangeLog 3 Mar 2013 05:21:04 -0000 1.20 |
| 76 |
+++ ChangeLog 4 Mar 2013 17:19:40 -0000 1.21 |
| 77 |
@@ -1,6 +1,9 @@ |
| 78 |
# ChangeLog for sci-libs/nlopt |
| 79 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 80 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/nlopt/ChangeLog,v 1.20 2013/03/03 05:21:04 bicatali Exp $ |
| 81 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/nlopt/ChangeLog,v 1.21 2013/03/04 17:19:40 bicatali Exp $ |
| 82 |
+ |
| 83 |
+ 04 Mar 2013; Sébastien Fabbro <bicatali@g.o> nlopt-2.3-r2.ebuild: |
| 84 |
+ Remove pure C++ tests when testing C library, bug #460284 |
| 85 |
|
| 86 |
*nlopt-2.3-r2 (03 Mar 2013) |
Archives