Gentoo Archives: gentoo-commits

From: Priit Laes <plaes@×××××.org>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: eclass/
Date: Tue, 03 Jan 2012 11:56:26
Message-Id: 226b8ca0b690510e9336c5f01e2137f84badbd71.plaes@gentoo
1 commit: 226b8ca0b690510e9336c5f01e2137f84badbd71
2 Author: Priit Laes <plaes <AT> plaes <DOT> org>
3 AuthorDate: Tue Jan 3 11:50:17 2012 +0000
4 Commit: Priit Laes <plaes <AT> plaes <DOT> org>
5 CommitDate: Tue Jan 3 11:50:17 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=226b8ca0
7
8 Compatibility fix for automake-1.11.2's py-compile changes
9
10 Thanks to nirbheek and ssuominen for suggestions and solutions.
11
12 ---
13 eclass/gnome2-live.eclass | 2 +-
14 eclass/gnome2-python.eclass | 5 ++---
15 2 files changed, 3 insertions(+), 4 deletions(-)
16
17 diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
18 index 1d9988a..bf6ca7f 100644
19 --- a/eclass/gnome2-live.eclass
20 +++ b/eclass/gnome2-live.eclass
21 @@ -151,7 +151,7 @@ gnome2-live_src_prepare() {
22 fi
23
24 # Disable pyc compiling. Doesn't harm if DNE
25 - ln -sf $(type -P true) py-compile
26 + > py-compile
27
28 ### Keep this in-sync with gnome2.eclass!
29
30
31 diff --git a/eclass/gnome2-python.eclass b/eclass/gnome2-python.eclass
32 index d4dc393..6fbe441 100644
33 --- a/eclass/gnome2-python.eclass
34 +++ b/eclass/gnome2-python.eclass
35 @@ -28,10 +28,9 @@ gnome2-python_pkg_setup() {
36 }
37
38 gnome2-python_src_prepare() {
39 + # disable pyc compiling
40 if [ -f py-compile ]; then
41 - # disable pyc compiling
42 - mv py-compile py-compile.orig
43 - ln -s $(type -P true) py-compile
44 + > py-compile
45 fi
46
47 gnome2_src_prepare