changeset 2797:0881b0b83535

Merge
author jwilhelm
date Tue, 22 Aug 2017 16:20:29 +0200
parents 56d1e05e0def 786d4184f07c
children 3933a3e729f6 0c85aa3795ce
files common/autoconf/generated-configure.sh
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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",