summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@gentoo.org>2012-01-03 12:18:17 +0000
committerNirbheek Chauhan <nirbheek@gentoo.org>2012-01-03 12:18:17 +0000
commit6c87c6f50d6aa913e88254e30bd220aba9f59fc0 (patch)
tree117e199544bb724ea9924948a7ee684c12248887
parentInitial commit. (diff)
downloadgentoo-2-6c87c6f50d6aa913e88254e30bd220aba9f59fc0.tar.gz
gentoo-2-6c87c6f50d6aa913e88254e30bd220aba9f59fc0.tar.bz2
gentoo-2-6c87c6f50d6aa913e88254e30bd220aba9f59fc0.zip
New automake uses $(SHELL) py-compile, which fails if py-compile is a symlink to /bin/true. Make it an executable empty file instead.
-rw-r--r--eclass/ChangeLog7
-rw-r--r--eclass/gnome-python-common.eclass7
2 files changed, 10 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index d023fac229e4..633e45758f4f 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.69 2012/01/03 08:59:01 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.70 2012/01/03 12:18:17 nirbheek Exp $
+
+ 03 Jan 2012; Nirbheek Chauhan <nirbheek@gentoo.org>
+ gnome-python-common.eclass:
+ New automake uses $(SHELL) py-compile, which fails if py-compile is a symlink
+ to /bin/true. Make it an executable empty file instead.
03 Jan 2012; Justin Lecher <jlec@gentoo.org> eutils.eclass:
Convert make_desktop_entry() comment block to be eclass-manpages conform,
diff --git a/eclass/gnome-python-common.eclass b/eclass/gnome-python-common.eclass
index 21cc37c1543c..19d978a82355 100644
--- a/eclass/gnome-python-common.eclass
+++ b/eclass/gnome-python-common.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome-python-common.eclass,v 1.13 2011/12/27 17:55:12 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome-python-common.eclass,v 1.14 2012/01/03 12:18:17 nirbheek Exp $
# Original Author: Arun Raghavan <ford_prefect@gentoo.org> (based on the
# gnome-python-desktop eclass by Jim Ramsay <lack@gentoo.org>)
@@ -89,7 +89,8 @@ gnome-python-common_src_prepare() {
# disable pyc compiling
if [[ -f py-compile ]]; then
rm py-compile
- ln -s $(type -P true) py-compile
+ echo > py-compile
+ chmod +x py-compile
fi
# The .pc file is installed by respective gnome-python*-base package