1 |
commit: 2c11e03774490b27eab96174eb167a04725902e9 |
2 |
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Nov 5 04:46:26 2012 +0000 |
4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 5 04:46:26 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=2c11e037 |
7 |
|
8 |
[dev-python/sip] Respect AR (bug 440266); reset *FLAGS_RELEASE variables. |
9 |
|
10 |
Package-Manager: portage-2.2.0_alpha142 |
11 |
|
12 |
--- |
13 |
dev-python/sip/sip-4.14.1_pre20121027.ebuild | 17 +++++++++++------ |
14 |
dev-python/sip/sip-4.9999.ebuild | 17 +++++++++++------ |
15 |
2 files changed, 22 insertions(+), 12 deletions(-) |
16 |
|
17 |
diff --git a/dev-python/sip/sip-4.14.1_pre20121027.ebuild b/dev-python/sip/sip-4.14.1_pre20121027.ebuild |
18 |
index bb43c71..c14ad82 100644 |
19 |
--- a/dev-python/sip/sip-4.14.1_pre20121027.ebuild |
20 |
+++ b/dev-python/sip/sip-4.14.1_pre20121027.ebuild |
21 |
@@ -63,28 +63,33 @@ src_prepare() { |
22 |
fi |
23 |
|
24 |
epatch "${FILESDIR}"/${PN}-4.9.3-darwin.patch |
25 |
- sed -i -e 's/-O2//g' specs/* || die |
26 |
|
27 |
python_src_prepare |
28 |
} |
29 |
|
30 |
src_configure() { |
31 |
configuration() { |
32 |
- local myconf=("$(PYTHON)" |
33 |
- configure.py |
34 |
+ local myconf=( |
35 |
+ "$(PYTHON)" configure.py |
36 |
--bindir="${EPREFIX}/usr/bin" |
37 |
--destdir="${EPREFIX}$(python_get_sitedir)" |
38 |
--incdir="${EPREFIX}$(python_get_includedir)" |
39 |
--sipdir="${EPREFIX}/usr/share/sip" |
40 |
$(use debug && echo --debug) |
41 |
+ AR="$(tc-getAR) cqs" |
42 |
CC="$(tc-getCC)" |
43 |
+ CFLAGS="${CFLAGS}" |
44 |
+ CFLAGS_RELEASE= |
45 |
CXX="$(tc-getCXX)" |
46 |
+ CXXFLAGS="${CXXFLAGS}" |
47 |
+ CXXFLAGS_RELEASE= |
48 |
LINK="$(tc-getCXX)" |
49 |
LINK_SHLIB="$(tc-getCXX)" |
50 |
- CFLAGS="${CFLAGS}" |
51 |
- CXXFLAGS="${CXXFLAGS}" |
52 |
LFLAGS="${LDFLAGS}" |
53 |
- STRIP=":") |
54 |
+ LFLAGS_RELEASE= |
55 |
+ RANLIB= |
56 |
+ STRIP= |
57 |
+ ) |
58 |
echo "${myconf[@]}" |
59 |
"${myconf[@]}" |
60 |
} |
61 |
|
62 |
diff --git a/dev-python/sip/sip-4.9999.ebuild b/dev-python/sip/sip-4.9999.ebuild |
63 |
index 446a020..cd07d9d 100644 |
64 |
--- a/dev-python/sip/sip-4.9999.ebuild |
65 |
+++ b/dev-python/sip/sip-4.9999.ebuild |
66 |
@@ -63,28 +63,33 @@ src_prepare() { |
67 |
fi |
68 |
|
69 |
epatch "${FILESDIR}"/${PN}-4.9.3-darwin.patch |
70 |
- sed -i -e 's/-O2//g' specs/* || die |
71 |
|
72 |
python_src_prepare |
73 |
} |
74 |
|
75 |
src_configure() { |
76 |
configuration() { |
77 |
- local myconf=("$(PYTHON)" |
78 |
- configure.py |
79 |
+ local myconf=( |
80 |
+ "$(PYTHON)" configure.py |
81 |
--bindir="${EPREFIX}/usr/bin" |
82 |
--destdir="${EPREFIX}$(python_get_sitedir)" |
83 |
--incdir="${EPREFIX}$(python_get_includedir)" |
84 |
--sipdir="${EPREFIX}/usr/share/sip" |
85 |
$(use debug && echo --debug) |
86 |
+ AR="$(tc-getAR) cqs" |
87 |
CC="$(tc-getCC)" |
88 |
+ CFLAGS="${CFLAGS}" |
89 |
+ CFLAGS_RELEASE= |
90 |
CXX="$(tc-getCXX)" |
91 |
+ CXXFLAGS="${CXXFLAGS}" |
92 |
+ CXXFLAGS_RELEASE= |
93 |
LINK="$(tc-getCXX)" |
94 |
LINK_SHLIB="$(tc-getCXX)" |
95 |
- CFLAGS="${CFLAGS}" |
96 |
- CXXFLAGS="${CXXFLAGS}" |
97 |
LFLAGS="${LDFLAGS}" |
98 |
- STRIP=":") |
99 |
+ LFLAGS_RELEASE= |
100 |
+ RANLIB= |
101 |
+ STRIP= |
102 |
+ ) |
103 |
echo "${myconf[@]}" |
104 |
"${myconf[@]}" |
105 |
} |