Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8153257: Jib profiles config broken after JDK-8031767
authorerikj
Fri, 01 Apr 2016 17:06:44 +0200
changeset 36724 32a7658a6e0e
parent 36723 295e7ec5d8f9
child 36725 f458544b0d76
8153257: Jib profiles config broken after JDK-8031767 Reviewed-by: tbell
common/conf/jib-profiles.js file | annotate | diff | comparison | revisions 
--- a/common/conf/jib-profiles.js	Thu Mar 31 14:11:15 2016 -0700
+++ b/common/conf/jib-profiles.js	Fri Apr 01 17:06:44 2016 +0200
@@ -241,8 +241,7 @@
             target_os: "linux",
             target_cpu: "x64",
             dependencies: concat(common.dependencies, "devkit"),
-            configure_args: common.configure_args,
-	    configure_args: concat(common.configure_args, "--with-zlib=system"),
+            configure_args: concat(common.configure_args, "--with-zlib=system"),
             make_args: common.make_args
         },
 
@@ -251,8 +250,8 @@
             target_cpu: "x86",
             build_cpu: "x64",
             dependencies: concat(common.dependencies, "devkit"),
-            configure_args: concat(common.configure_args, common.configure_args_32bit),
-	    configure_args: concat(common.configure_args, "--with-zlib=system"),
+            configure_args: concat(common.configure_args, common.configure_args_32bit
+                "--with-zlib=system"),
             make_args: common.make_args
         },
 
@@ -260,8 +259,7 @@
             target_os: "macosx",
             target_cpu: "x64",
             dependencies: concat(common.dependencies, "devkit"),
-            configure_args: common.configure_args,
-	    configure_args: concat(common.configure_args, "--with-zlib=system"),
+            configure_args: concat(common.configure_args, "--with-zlib=system"),
             make_args: common.make_args
         },
 
@@ -269,8 +267,7 @@
             target_os: "solaris",
             target_cpu: "x64",
             dependencies: concat(common.dependencies, "devkit", "cups"),
-            configure_args: common.configure_args,
-	    configure_args: concat(common.configure_args, "--with-zlib=system"),
+            configure_args: concat(common.configure_args, "--with-zlib=system"),
             make_args: common.make_args
         },
 
@@ -278,8 +275,7 @@
             target_os: "solaris",
             target_cpu: "sparcv9",
             dependencies: concat(common.dependencies, "devkit", "cups"),
-            configure_args: common.configure_args,
-	    configure_args: concat(common.configure_args, "--with-zlib=system"),
+            configure_args: concat(common.configure_args, "--with-zlib=system"),
             make_args: common.make_args
         },
jdk-sandbox