Changeset 158912 in webkit

Timestamp:

Nov 8, 2013 1:43:44 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[JHBUILD] Jhbuild Makefile build bug workaround
​https://bugs.webkit.org/show_bug.cgi?id=123971

Patch by Przemyslaw Szymanski <​p.szymanski3@samsung.com> on 2013-11-08
Reviewed by Ryosuke Niwa.

After Jhbuild repository is cloned (for instance when you use
Tools/Scripts/update-webkitefl-libs) it is built from sources.
If you have GREP_OPTIONS grep env variable set (for instance
GREP_OPTIONS=-n) then it is jhbuild build error. Makefile.plain
uses shell grep. For specific GREP_OPTIONS grep output will be
different than expected one by Jhbuild and there is an error
with Jhbuild build. Jhbuild will not be built and then WebKit
source also will not be built. This patch is a workaround to this
issue. It disables GREP_OPTIONS for Jhbuild build time.

• jhbuild/jhbuild-wrapper:

(install_jhbuild):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• jhbuild/jhbuild-wrapper (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-11-08  Przemyslaw Szymanski  <p.szymanski3@samsung.com>
+
+        [JHBUILD] Jhbuild Makefile build bug workaround
+        https://bugs.webkit.org/show_bug.cgi?id=123971
+
+        Reviewed by Ryosuke Niwa.
+
+        After Jhbuild repository is cloned (for instance when you use
+        Tools/Scripts/update-webkitefl-libs) it is built from sources.
+        If you have GREP_OPTIONS grep env variable set (for instance
+        GREP_OPTIONS=-n) then it is jhbuild build error. Makefile.plain
+        uses shell grep. For specific GREP_OPTIONS grep output will be
+        different than expected one by Jhbuild and there is an error
+        with Jhbuild build. Jhbuild will not be built and then WebKit
+        source also will not be built. This patch is a workaround to this
+        issue. It disables GREP_OPTIONS for Jhbuild build time.
+
+        * jhbuild/jhbuild-wrapper:
+        (install_jhbuild):
+
 2013-11-08  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Tools/jhbuild/jhbuild-wrapper

@@ -76 +76 @@
 
 def install_jhbuild():
+    if "GREP_OPTIONS" in os.environ:
+        del os.environ['GREP_OPTIONS']
     process = subprocess.Popen(['bash', './autogen.sh', '--prefix=%s' % installation_prefix], cwd=jhbuild_source_path)
     process.wait()