1 |
jlec 14/02/04 10:03:53 |
2 |
|
3 |
Modified: coinor-couenne-0.4.7.ebuild ChangeLog |
4 |
Log: |
5 |
Move preparations to src_prepare; use usex() |
6 |
|
7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!) |
8 |
|
9 |
Revision Changes Path |
10 |
1.3 sci-libs/coinor-couenne/coinor-couenne-0.4.7.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/coinor-couenne/coinor-couenne-0.4.7.ebuild?rev=1.3&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/coinor-couenne/coinor-couenne-0.4.7.ebuild?rev=1.3&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/coinor-couenne/coinor-couenne-0.4.7.ebuild?r1=1.2&r2=1.3 |
15 |
|
16 |
Index: coinor-couenne-0.4.7.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/coinor-couenne/coinor-couenne-0.4.7.ebuild,v |
19 |
retrieving revision 1.2 |
20 |
retrieving revision 1.3 |
21 |
diff -u -r1.2 -r1.3 |
22 |
--- coinor-couenne-0.4.7.ebuild 4 Feb 2014 08:46:43 -0000 1.2 |
23 |
+++ coinor-couenne-0.4.7.ebuild 4 Feb 2014 10:03:52 -0000 1.3 |
24 |
@@ -1,6 +1,6 @@ |
25 |
# Copyright 1999-2014 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-couenne/coinor-couenne-0.4.7.ebuild,v 1.2 2014/02/04 08:46:43 jlec Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-couenne/coinor-couenne-0.4.7.ebuild,v 1.3 2014/02/04 10:03:52 jlec Exp $ |
29 |
|
30 |
EAPI=5 |
31 |
|
32 |
@@ -24,14 +24,15 @@ |
33 |
S="${WORKDIR}/${MYPN}-${PV}/${MYPN}" |
34 |
|
35 |
src_prepare() { |
36 |
+ # needed for the --with-coin-instdir |
37 |
+ dodir /usr |
38 |
sed -i \ |
39 |
-e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \ |
40 |
configure || die |
41 |
autotools-utils_src_prepare |
42 |
} |
43 |
+ |
44 |
src_configure() { |
45 |
- # needed for the --with-coin-instdir |
46 |
- dodir /usr |
47 |
local myeconfargs=( |
48 |
--enable-dependency-linking |
49 |
--with-coin-instdir="${ED}"/usr |
50 |
@@ -45,7 +46,7 @@ |
51 |
# circular dependencies between libCouenne and libBonCouenne :( |
52 |
pushd "${BUILD_DIR}"/src > /dev/null |
53 |
rm libCouenne.la main/libBonCouenne.la || die |
54 |
- emake LIBS+="-Lmain/.libs -lBonCouenne" libCouenne.la |
55 |
+ emake LIBS+=" -Lmain/.libs -lBonCouenne" libCouenne.la |
56 |
emake -C main |
57 |
popd > /dev/null |
58 |
} |
59 |
|
60 |
|
61 |
|
62 |
1.3 sci-libs/coinor-couenne/ChangeLog |
63 |
|
64 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/coinor-couenne/ChangeLog?rev=1.3&view=markup |
65 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/coinor-couenne/ChangeLog?rev=1.3&content-type=text/plain |
66 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/coinor-couenne/ChangeLog?r1=1.2&r2=1.3 |
67 |
|
68 |
Index: ChangeLog |
69 |
=================================================================== |
70 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/coinor-couenne/ChangeLog,v |
71 |
retrieving revision 1.2 |
72 |
retrieving revision 1.3 |
73 |
diff -u -r1.2 -r1.3 |
74 |
--- ChangeLog 4 Feb 2014 08:46:43 -0000 1.2 |
75 |
+++ ChangeLog 4 Feb 2014 10:03:52 -0000 1.3 |
76 |
@@ -1,6 +1,9 @@ |
77 |
# ChangeLog for sci-libs/coinor-couenne |
78 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
79 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-couenne/ChangeLog,v 1.2 2014/02/04 08:46:43 jlec Exp $ |
80 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-couenne/ChangeLog,v 1.3 2014/02/04 10:03:52 jlec Exp $ |
81 |
+ |
82 |
+ 04 Feb 2014; Justin Lecher <jlec@g.o> coinor-couenne-0.4.7.ebuild: |
83 |
+ Move preparations to src_prepare; use usex() |
84 |
|
85 |
04 Feb 2014; Justin Lecher <jlec@g.o> coinor-couenne-0.4.7.ebuild: |
86 |
Fix the common coinor pkg-config installation problem |