Merge
authorjwilhelm
Tue, 22 Aug 2017 16:20:29 +0200
changeset 46254 d7b71e3bc896
parent 46252 15f3e60ff095 (diff)
parent 46253 f7daf2e39cc8 (current diff)
child 46255 28032e2ab1b3
Merge
common/autoconf/generated-configure.sh
--- a/common/autoconf/generated-configure.sh	Mon Aug 21 12:08:03 2017 -0400
+++ b/common/autoconf/generated-configure.sh	Tue Aug 22 16:20:29 2017 +0200
@@ -5151,7 +5151,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1503331667
+DATE_WHEN_GENERATED=1503411624
 
 ###############################################################################
 #
@@ -62617,7 +62617,7 @@
             if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
 
   POTENTIAL_FREETYPE_INCLUDE_PATH="$FREETYPE_BASE_DIR/include"
-  POTENTIAL_FREETYPE_LIB_PATH="$FREETYPE_BASE_DIR/lib/x86_64-linux-gnu"
+  POTENTIAL_FREETYPE_LIB_PATH="$FREETYPE_BASE_DIR/lib/$OPENJDK_TARGET_CPU-linux-gnu"
   METHOD="well-known location"
 
   # Let's start with an optimistic view of the world :-)
--- a/common/autoconf/lib-freetype.m4	Mon Aug 21 12:08:03 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	Mon Aug 21 12:08:03 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",