Title: [168723] releases/WebKitGTK/webkit-2.4/Tools
- Revision
- 168723
- Author
- g...@gnome.org
- Date
- 2014-05-13 12:32:18 -0700 (Tue, 13 May 2014)
Log Message
Merge 165452 - [GTK] The jhbuild environment should set CMAKE_PREFIX_PATH and CMAKE_LIBRARY_PATH
https://bugs.webkit.org/show_bug.cgi?id=130064
Reviewed by Philippe Normand.
* efl/jhbuildrc: Remove duplicated code.
* gtk/jhbuildrc: Remove duplicated code.
* jhbuild/jhbuildrc_common.py:
(init): Move duplicated code from jhbuildrc's and extend setting CMake environment variables to
GTK+. We always set the CMAKE_LIBRARY_PATH, which should be harmless for EFL 32-bit systems.
and is apparently necessary for GTK+.
Conflicts:
Tools/ChangeLog
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Tools/efl/jhbuildrc (168722 => 168723)
--- releases/WebKitGTK/webkit-2.4/Tools/efl/jhbuildrc 2014-05-13 19:32:04 UTC (rev 168722)
+++ releases/WebKitGTK/webkit-2.4/Tools/efl/jhbuildrc 2014-05-13 19:32:18 UTC (rev 168723)
@@ -22,33 +22,7 @@
import jhbuildrc_common
jhbuildrc_common.init(globals(), "efl")
-if 'NUMBER_OF_PROCESSORS' in os.environ:
- jobs = os.environ['NUMBER_OF_PROCESSORS']
-
-# Use system libraries while building.
-if use_lib64:
- _libdir = 'lib64'
-else:
- _libdir = 'lib'
-addpath('PKG_CONFIG_PATH', os.path.join(os.sep, 'usr', _libdir, 'pkgconfig'))
-addpath('PKG_CONFIG_PATH', os.path.join(os.sep, 'usr', 'share', 'pkgconfig'))
-
addpath('XDG_DATA_DIRS', '/usr/share')
addpath('XDG_CONFIG_DIRS', '/etc/xdg')
-addpath('CMAKE_PREFIX_PATH', prefix)
-
-# jhbuild installs libraries into lib64/ by default when building on
-# 64-bit Linux installations, while CMake does not look for libraries
-# in lib64/ if /etc/debian_version exists. For now we just pass the
-# lib64/ directory to the CMAKE_LIBRARY_PATH environment variable to
-# make sure the libraries installed by jhbuild are found by CMake on
-# Debian-based systems as well.
-if use_lib64:
- addpath('CMAKE_LIBRARY_PATH', os.path.join(prefix, _libdir))
-
partial_build = False
-
-# Avoid runtime conflicts with GStreamer system-wide plugins. We want
-# to use only the plugins we build in JHBuild.
-os.environ['GST_PLUGIN_SYSTEM_PATH'] = ''
Modified: releases/WebKitGTK/webkit-2.4/Tools/gtk/jhbuildrc (168722 => 168723)
--- releases/WebKitGTK/webkit-2.4/Tools/gtk/jhbuildrc 2014-05-13 19:32:04 UTC (rev 168722)
+++ releases/WebKitGTK/webkit-2.4/Tools/gtk/jhbuildrc 2014-05-13 19:32:18 UTC (rev 168723)
@@ -25,16 +25,9 @@
sys.path = [__gtk_tools_directory] + sys.path
import common
-if 'NUMBER_OF_PROCESSORS' in os.environ:
- jobs = os.environ['NUMBER_OF_PROCESSORS']
-
# GTK+ 3.0.12 misses the -lm flag when linking the tests.
module_makeargs['gtk+'] = 'LDFLAGS="-lm" ' + makeargs
-# Avoid runtime conflicts with GStreamer system-wide plugins. We want
-# to use only the plugins we build in JHBuild.
-os.environ['GST_PLUGIN_SYSTEM_PATH'] = ''
-
# We always enable introspection so that we can sniff out problems with our
# annotations sooner rather than later.
autogenargs='--enable-introspection'
Modified: releases/WebKitGTK/webkit-2.4/Tools/jhbuild/jhbuildrc_common.py (168722 => 168723)
--- releases/WebKitGTK/webkit-2.4/Tools/jhbuild/jhbuildrc_common.py 2014-05-13 19:32:04 UTC (rev 168722)
+++ releases/WebKitGTK/webkit-2.4/Tools/jhbuild/jhbuildrc_common.py 2014-05-13 19:32:18 UTC (rev 168723)
@@ -62,3 +62,23 @@
jhbuildrc_globals["nonotify"] = True
jhbuildrc_globals["notrayicon"] = True
+
+ if 'NUMBER_OF_PROCESSORS' in os.environ:
+ jhbuildrc_globals['jobs'] = os.environ['NUMBER_OF_PROCESSORS']
+
+ # Avoid runtime conflicts with GStreamer system-wide plugins. We want
+ # to use only the plugins we build in JHBuild.
+ os.environ['GST_PLUGIN_SYSTEM_PATH'] = ''
+
+ # Use system libraries while building.
+ if jhbuildrc_globals['use_lib64']:
+ _library_dir = 'lib64'
+ else:
+ _library_dir = 'lib'
+ addpath = jhbuildrc_globals['addpath']
+ addpath('PKG_CONFIG_PATH', os.path.join(os.sep, 'usr', _library_dir, 'pkgconfig'))
+ addpath('PKG_CONFIG_PATH', os.path.join(os.sep, 'usr', 'share', 'pkgconfig'))
+
+ prefix = jhbuildrc_globals['prefix']
+ addpath('CMAKE_PREFIX_PATH', prefix)
+ addpath('CMAKE_LIBRARY_PATH', os.path.join(prefix, _library_dir))
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
