<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[166286] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/166286">166286</a></dd>
<dt>Author</dt> <dd>philn@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-26 00:33:08 -0700 (Wed, 26 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] The gnumake package is no longer needed in jhbuild
https://bugs.webkit.org/show_bug.cgi?id=130121
Reviewed by Martin Robinson.
For GTK build-webkit now relies on cmake and ninja/gnumake. Even
for a debug build cmake/system-gnumake worked just fine for me.
* gtk/jhbuild.modules: Removed gnumake.
* gtk/patches/make-3.82-arg-list-length.patch: Removed.
* gtk/patches/make-3.82-parallel-build.patch: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsgtkjhbuildmodules">trunk/Tools/gtk/jhbuild.modules</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkToolsgtkpatchesmake382arglistlengthpatch">trunk/Tools/gtk/patches/make-3.82-arg-list-length.patch</a></li>
<li><a href="#trunkToolsgtkpatchesmake382parallelbuildpatch">trunk/Tools/gtk/patches/make-3.82-parallel-build.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (166285 => 166286)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-03-26 07:03:20 UTC (rev 166285)
+++ trunk/Tools/ChangeLog 2014-03-26 07:33:08 UTC (rev 166286)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-03-12 Philippe Normand <pnormand@igalia.com>
+
+ [GTK] The gnumake package is no longer needed in jhbuild
+ https://bugs.webkit.org/show_bug.cgi?id=130121
+
+ Reviewed by Martin Robinson.
+
+ For GTK build-webkit now relies on cmake and ninja/gnumake. Even
+ for a debug build cmake/system-gnumake worked just fine for me.
+
+ * gtk/jhbuild.modules: Removed gnumake.
+ * gtk/patches/make-3.82-arg-list-length.patch: Removed.
+ * gtk/patches/make-3.82-parallel-build.patch: Removed.
+
</ins><span class="cx"> 2014-03-25 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix a failing API test on Mountain Lion and remove temporary debug logging.
</span></span></pre></div>
<a id="trunkToolsgtkjhbuildmodules"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/jhbuild.modules (166285 => 166286)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/jhbuild.modules 2014-03-26 07:03:20 UTC (rev 166285)
+++ trunk/Tools/gtk/jhbuild.modules 2014-03-26 07:33:08 UTC (rev 166286)
</span><span class="lines">@@ -5,7 +5,6 @@
</span><span class="cx">
</span><span class="cx"> <metamodule id="webkitgtk-testing-dependencies">
</span><span class="cx"> <dependencies>
</span><del>- <dep package="make"/>
</del><span class="cx"> <dep package="cairo"/>
</span><span class="cx"> <dep package="fonts"/>
</span><span class="cx"> <dep package="fontconfig"/>
</span><span class="lines">@@ -35,8 +34,6 @@
</span><span class="cx">
</span><span class="cx"> <include href="jhbuild-optional.modules"/>
</span><span class="cx">
</span><del>- <repository type="tarball" name="ftp.gnu.org"
- href="ftp://ftp.gnu.org/gnu/"/>
</del><span class="cx"> <repository type="git" name="github.com"
</span><span class="cx"> href="git://github.com"/>
</span><span class="cx"> <repository type="tarball" name="sourceware.org-mirror"
</span><span class="lines">@@ -58,14 +55,6 @@
</span><span class="cx"> <repository type="tarball" name="savannah.gnu.org"
</span><span class="cx"> href="http://download.savannah.gnu.org/releases/"/>
</span><span class="cx">
</span><del>- <autotools id="make" autogen-sh="configure">
- <branch repo="ftp.gnu.org"
- module="make/make-3.82.tar.bz2" version="3.82"
- size="1242186" md5sum="1a11100f3c63fcf5753818e59d63088f">
- <patch file="make-3.82-arg-list-length.patch" strip="1"/>
- <patch file="make-3.82-parallel-build.patch" strip="1"/>
- </branch>
- </autotools>
</del><span class="cx">
</span><span class="cx"> <autotools id="cairo" autogen-sh="configure"
</span><span class="cx"> autogenargs="--enable-gl=yes --enable-egl=yes --enable-glx=yes"
</span></span></pre></div>
<a id="trunkToolsgtkpatchesmake382arglistlengthpatch"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/gtk/patches/make-3.82-arg-list-length.patch (166285 => 166286)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/patches/make-3.82-arg-list-length.patch 2014-03-26 07:03:20 UTC (rev 166285)
+++ trunk/Tools/gtk/patches/make-3.82-arg-list-length.patch 2014-03-26 07:33:08 UTC (rev 166286)
</span><span class="lines">@@ -1,107 +0,0 @@
</span><del>-diff -u make-3.82-orig/configure.in make-3.82/configure.in
---- make-3.82-orig/configure.in 2010-07-28 07:39:50.000000000 +0200
-+++ make-3.82/configure.in 2012-03-21 12:34:20.000000000 +0100
-@@ -64,7 +64,8 @@
- AC_HEADER_STAT
- AC_HEADER_TIME
- AC_CHECK_HEADERS(stdlib.h locale.h unistd.h limits.h fcntl.h string.h \
-- memory.h sys/param.h sys/resource.h sys/time.h sys/timeb.h)
-+ memory.h sys/param.h sys/resource.h sys/time.h sys/timeb.h \
-+ sys/user.h linux/binfmts.h)
-
- # Set a flag if we have an ANSI C compiler
- if test "$ac_cv_prog_cc_stdc" != no; then
-Subdirectorios comunes: make-3.82-orig/doc y make-3.82/doc
-Subdirectorios comunes: make-3.82-orig/glob y make-3.82/glob
-diff -u make-3.82-orig/job.c make-3.82/job.c
---- make-3.82-orig/job.c 2010-07-24 10:27:50.000000000 +0200
-+++ make-3.82/job.c 2012-03-21 12:34:20.000000000 +0100
-@@ -29,6 +29,11 @@
-
- #include <string.h>
-
-+#if defined (HAVE_LINUX_BINFMTS_H) && defined (HAVE_SYS_USER_H)
-+#include <sys/user.h>
-+#include <linux/binfmts.h>
-+#endif
-+
- /* Default shell to use. */
- #ifdef WINDOWS32
- #include <windows.h>
-@@ -2795,6 +2800,7 @@
- unsigned int sflags_len = strlen (shellflags);
- char *command_ptr = NULL; /* used for batch_mode_shell mode */
- char *new_line;
-+ char *args_ptr;
-
- # ifdef __EMX__ /* is this necessary? */
- if (!unixy_shell)
-@@ -2865,8 +2871,20 @@
- return new_argv;
- }
-
-+#ifdef MAX_ARG_STRLEN
-+#ifndef PAGE_SIZE
-+#define PAGE_SIZE sysconf(_SC_PAGESIZE)
-+#endif
-+ static char eval_line[] = "eval\\ \\\"set\\ x\\;\\ shift\\;\\ ";
-+#define ARG_NUMBER_DIGITS 5
-+#define EVAL_LEN (sizeof(eval_line)-1 + shell_len + 4 \
-+ + (7 + ARG_NUMBER_DIGITS) * 2 * line_len / (MAX_ARG_STRLEN - 2))
-+#else
-+#define EVAL_LEN 0
-+#endif
-+
- new_line = alloca (shell_len + 1 + sflags_len + 1
-- + (line_len*2) + 1);
-+ + (line_len*2) + 1 + EVAL_LEN);
- ap = new_line;
- memcpy (ap, shell, shell_len);
- ap += shell_len;
-@@ -2875,6 +2890,30 @@
- ap += sflags_len;
- *(ap++) = ' ';
- command_ptr = ap;
-+
-+#if !defined (WINDOWS32) && defined (MAX_ARG_STRLEN)
-+ if (unixy_shell && line_len > MAX_ARG_STRLEN)
-+ {
-+ unsigned j;
-+ memcpy (ap, eval_line, sizeof (eval_line) - 1);
-+ ap += sizeof (eval_line) - 1;
-+ for (j = 1; j <= 2 * line_len / (MAX_ARG_STRLEN - 2); j++)
-+ ap += sprintf (ap, "\\$\\{%u\\}", j);
-+ *ap++ = '\\';
-+ *ap++ = '"';
-+ *ap++ = ' ';
-+ /* Copy only the first word of SHELL to $0. */
-+ for (p = shell; *p != '\0'; ++p)
-+ {
-+ if (isspace ((unsigned char)*p))
-+ break;
-+ *ap++ = *p;
-+ }
-+ *ap++ = ' ';
-+ }
-+#endif
-+ args_ptr = ap;
-+
- for (p = line; *p != '\0'; ++p)
- {
- if (restp != NULL && *p == '\n')
-@@ -2922,6 +2961,14 @@
- }
- #endif
- *ap++ = *p;
-+
-+#if !defined (WINDOWS32) && defined (MAX_ARG_STRLEN)
-+ if (unixy_shell && line_len > MAX_ARG_STRLEN && (ap - args_ptr > MAX_ARG_STRLEN - 2))
-+ {
-+ *ap++ = ' ';
-+ args_ptr = ap;
-+ }
-+#endif
- }
- if (ap == new_line + shell_len + sflags_len + 2)
- /* Line was empty. */
-
</del></span></pre></div>
<a id="trunkToolsgtkpatchesmake382parallelbuildpatch"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/gtk/patches/make-3.82-parallel-build.patch (166285 => 166286)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/patches/make-3.82-parallel-build.patch 2014-03-26 07:03:20 UTC (rev 166285)
+++ trunk/Tools/gtk/patches/make-3.82-parallel-build.patch 2014-03-26 07:33:08 UTC (rev 166286)
</span><span class="lines">@@ -1,26 +0,0 @@
</span><del>-diff -u make-3.82-orig/remake.c make-3.82/remake.c
---- make-3.82-orig/remake.c 2010-07-13 03:20:42.000000000 +0200
-+++ make-3.82/remake.c 2012-03-21 12:47:52.000000000 +0100
-@@ -301,7 +301,7 @@
- /* Check for the case where a target has been tried and failed but
- the diagnostics hasn't been issued. If we need the diagnostics
- then we will have to continue. */
-- if (!(f->updated && f->update_status > 0 && !f->dontcare && f->no_diag))
-+ if (!(f->updated && f->update_status > 0 && !f->dontcare && f->no_diag) && f->command_state!=cs_not_started )
- {
- DBF (DB_VERBOSE, _("Pruning file `%s'.\n"));
- return f->command_state == cs_finished ? f->update_status : 0;
-@@ -614,6 +614,12 @@
- d->file->dontcare = file->dontcare;
- }
-
-+ /* We may have already encountered this file earlier in the same
-+ * pass before we knew we'd be updating this target. In that
-+ * case calling update_file now would result in the file being
-+ * inappropriately pruned so we toggle the considered bit back
-+ * off first. */
-+ d->file->considered = !considered;
-
- dep_status |= update_file (d->file, depth);
-
-
</del></span></pre>
</div>
</div>
</body>
</html>