Title: [158912] trunk/Tools
- Revision
- 158912
- Author
- [email protected]
- Date
- 2013-11-08 01:43:44 -0800 (Fri, 08 Nov 2013)
Log Message
[JHBUILD] Jhbuild Makefile build bug workaround
https://bugs.webkit.org/show_bug.cgi?id=123971
Patch by Przemyslaw Szymanski <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (158911 => 158912)
--- trunk/Tools/ChangeLog 2013-11-08 09:06:21 UTC (rev 158911)
+++ trunk/Tools/ChangeLog 2013-11-08 09:43:44 UTC (rev 158912)
@@ -1,3 +1,23 @@
+2013-11-08 Przemyslaw Szymanski <[email protected]>
+
+ [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 <[email protected]>
[GTK] Ignore deprecated macros when generating gtk-doc
Modified: trunk/Tools/jhbuild/jhbuild-wrapper (158911 => 158912)
--- trunk/Tools/jhbuild/jhbuild-wrapper 2013-11-08 09:06:21 UTC (rev 158911)
+++ trunk/Tools/jhbuild/jhbuild-wrapper 2013-11-08 09:43:44 UTC (rev 158912)
@@ -75,6 +75,8 @@
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()
if process.returncode != 0:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
