| 1 |
commit: 41eb3e0c6e6c06498814fdf0512a175fa794aa0a |
| 2 |
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Nov 5 05:12:18 2012 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 5 05:15:17 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=41eb3e0c |
| 7 |
|
| 8 |
[dev-python/PyQt4] (WIP) Try to respect AR, bug 440266. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.0_alpha142 |
| 11 |
|
| 12 |
--- |
| 13 |
dev-python/PyQt4/PyQt4-4.9.6_pre20121105.ebuild | 22 ++++++++++++---------- |
| 14 |
1 files changed, 12 insertions(+), 10 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-python/PyQt4/PyQt4-4.9.6_pre20121105.ebuild b/dev-python/PyQt4/PyQt4-4.9.6_pre20121105.ebuild |
| 17 |
index e422a84..dffaba2 100644 |
| 18 |
--- a/dev-python/PyQt4/PyQt4-4.9.6_pre20121105.ebuild |
| 19 |
+++ b/dev-python/PyQt4/PyQt4-4.9.6_pre20121105.ebuild |
| 20 |
@@ -78,7 +78,7 @@ DEPEND="${RDEPEND} |
| 21 |
S=${WORKDIR}/${MY_P} |
| 22 |
|
| 23 |
PATCHES=( |
| 24 |
- "${FILESDIR}/${PN}-4.7.2-configure.py.patch" |
| 25 |
+# "${FILESDIR}/${PN}-4.7.2-configure.py.patch" |
| 26 |
) |
| 27 |
|
| 28 |
PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/pyuic4") |
| 29 |
@@ -114,8 +114,8 @@ pyqt4_use_enable() { |
| 30 |
|
| 31 |
src_configure() { |
| 32 |
configuration() { |
| 33 |
- local myconf=("$(PYTHON)" |
| 34 |
- configure.py |
| 35 |
+ local myconf=( |
| 36 |
+ "$(PYTHON)" configure.py |
| 37 |
--confirm-license |
| 38 |
--bindir="${EPREFIX}/usr/bin" |
| 39 |
--destdir="${EPREFIX}$(python_get_sitedir)" |
| 40 |
@@ -142,13 +142,15 @@ src_configure() { |
| 41 |
$(pyqt4_use_enable svg QtSvg) |
| 42 |
$(pyqt4_use_enable webkit QtWebKit) |
| 43 |
$(pyqt4_use_enable xmlpatterns QtXmlPatterns) |
| 44 |
+ AR="$(tc-getAR) cqs" |
| 45 |
CC="$(tc-getCC)" |
| 46 |
+ CFLAGS="${CFLAGS}" |
| 47 |
CXX="$(tc-getCXX)" |
| 48 |
+ CXXFLAGS="${CXXFLAGS}" |
| 49 |
LINK="$(tc-getCXX)" |
| 50 |
LINK_SHLIB="$(tc-getCXX)" |
| 51 |
- CFLAGS="${CFLAGS}" |
| 52 |
- CXXFLAGS="${CXXFLAGS}" |
| 53 |
- LFLAGS="${LDFLAGS}") |
| 54 |
+ LFLAGS="${LDFLAGS}" |
| 55 |
+ ) |
| 56 |
echo "${myconf[@]}" |
| 57 |
"${myconf[@]}" || die |
| 58 |
|
| 59 |
@@ -160,9 +162,9 @@ src_configure() { |
| 60 |
$(use opengl && echo QtOpenGL); do |
| 61 |
# Run eqmake4 inside the qpy subdirectories to respect |
| 62 |
# CC, CXX, CFLAGS, CXXFLAGS, LDFLAGS and avoid stripping. |
| 63 |
- pushd qpy/${mod} > /dev/null || return 1 |
| 64 |
+ pushd qpy/${mod} > /dev/null || return |
| 65 |
eqmake4 $(ls w_qpy*.pro) |
| 66 |
- popd > /dev/null || return 1 |
| 67 |
+ popd > /dev/null || return |
| 68 |
|
| 69 |
# Fix insecure runpaths. |
| 70 |
sed -e "/^LFLAGS[[:space:]]*=/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" \ |
| 71 |
@@ -171,9 +173,9 @@ src_configure() { |
| 72 |
|
| 73 |
# Avoid stripping of libpythonplugin.so. |
| 74 |
if use X; then |
| 75 |
- pushd designer > /dev/null || return 1 |
| 76 |
+ pushd designer > /dev/null || return |
| 77 |
eqmake4 python.pro |
| 78 |
- popd > /dev/null || return 1 |
| 79 |
+ popd > /dev/null || return |
| 80 |
fi |
| 81 |
} |
| 82 |
python_execute_function -s configuration |
Archives