Changeset 165452 in webkit

Timestamp:

Mar 11, 2014 8:09:12 AM (10 years ago)

Author:

Martin Robinson

Message:

[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+.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• efl/jhbuildrc (modified) (1 diff)
• gtk/jhbuildrc (modified) (1 diff)
• jhbuild/jhbuildrc_common.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2014-03-11  Martin Robinson  <mrobinson@igalia.com>
+
+        [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+.
+
 2014-03-11  László Langó  <llango.u-szeged@partner.samsung.com>
 

trunk/Tools/efl/jhbuildrc

@@ -23 +23 @@
 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'] = ''

trunk/Tools/gtk/jhbuildrc

@@ -26 +26 @@
 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

trunk/Tools/jhbuild/jhbuildrc_common.py

@@ -63 +63 @@
     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))