[gtk-osx] Don't set PYTHONPATH or PYTHON_SITE_PACKAGES in jhbuildrc
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-osx] Don't set PYTHONPATH or PYTHON_SITE_PACKAGES in jhbuildrc
- Date: Sun, 22 Mar 2015 08:29:50 +0000 (UTC)
commit 057a3be2cb0613e3f215a64b1f19f5f04d953a7d
Author: John Ralls <jralls ceridwen us>
Date: Sun Mar 22 10:51:23 2015 +0900
Don't set PYTHONPATH or PYTHON_SITE_PACKAGES in jhbuildrc
Since we require building Python2 (gtk-docs isn't ready for Python3)
for meta-gtk-osx-bootstrap, setting PYTHONPATH to include
$JHBUILD_PREFIX isn't needed. PYTHON_SITE_PACKAGES wasn't used anywhere.
jhbuildrc-gtk-osx | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index 85fd3b3..6b9344b 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -670,14 +670,10 @@ environ_prepend('CPPFLAGS', '-I' + prefix + '/include')
# Make sure that ltdl can find our libraries
addpath("LTDL_LIBRARY_PATH", prefix + "/lib")
-# Add additional Python/Perl paths so that our modules can be found.
-#
-_version = 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1])
-prependpath('PYTHONPATH', os.path.join(prefix , 'lib', _version, 'site-packages', 'gtk-2.0'))
-prependpath('PYTHONPATH', os.path.join(prefix , 'lib', _version))
+# Add additional Perl paths so that our modules can be found.
+
prependpath('PERL5LIB', prefix + '/lib/perl5/vendor_perl')
prependpath('PERL5LIB', prefix + '/lib/perl5/site_perl')
-os.environ['PYTHON_SITE_PACKAGES'] = os.path.join(prefix, 'lib', _version, 'site-packages')
# Point gtk-doc and other xsltproc users to our XML catalog.
#
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]