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.
Merge
authorjwilhelm
Tue, 22 Aug 2017 16:20:29 +0200
changeset 46934 80130bc22863
parent 46933 4564c96b8292 (current diff)
parent 46252 15f3e60ff095 (diff)
child 46935 aff9d4e61eee
child 46936 b440e4b33965
Merge
common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions 
--- a/common/autoconf/lib-freetype.m4	Wed Aug 16 14:49:18 2017 -0400
+++ b/common/autoconf/lib-freetype.m4	Tue Aug 22 16:20:29 2017 +0200
@@ -366,7 +366,7 @@
           if test "x$FOUND_FREETYPE" != xyes; then
             FREETYPE_BASE_DIR="$SYSROOT/usr"
             if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-              LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib/x86_64-linux-gnu], [well-known location])
+              LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib/$OPENJDK_TARGET_CPU-linux-gnu], [well-known location])
             else
               LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib/i386-linux-gnu], [well-known location])
               if test "x$FOUND_FREETYPE" != xyes; then
--- a/common/conf/jib-profiles.js	Wed Aug 16 14:49:18 2017 -0400
+++ b/common/conf/jib-profiles.js	Tue Aug 22 16:20:29 2017 +0200
@@ -974,7 +974,7 @@
         jtreg: {
             server: "javare",
             revision: "4.2",
-            build_number: "b07",
+            build_number: "b08",
             checksum_file: "MD5_VALUES",
             file: "jtreg_bin-4.2.zip",
             environment_name: "JT_HOME",
jdk-sandbox