jdk8-mips64-public: changeset 721:78852ce176db

8014762: Add JMC configure option mapping to Jprt.gmk
Summary: Need to add the mapping between JPRT env var and configure flag for JMC, from ALT_JMC_ZIP_DIR to --with-jmc-zip-dir (same pattern as for Javafx)
Reviewed-by: tbell, erikj
Contributed-by: klara.ward@oracle.com

     1.1 --- a/common/autoconf/generated-configure.sh	Thu May 16 12:13:52 2013 -0700
     1.2 +++ b/common/autoconf/generated-configure.sh	Tue May 28 20:03:21 2013 +0200
     1.3 @@ -2844,7 +2844,7 @@
     1.4        || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     1.5  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     1.6  as_fn_error $? "failed to load site script $ac_site_file
     1.7 -See \`config.log' for more details" "$LINENO" 5 ; }
     1.8 +See \`config.log' for more details" "$LINENO" 5; }
     1.9    fi
    1.10  done
    1.11  
    1.12 @@ -3775,7 +3775,7 @@
    1.13  #CUSTOM_AUTOCONF_INCLUDE
    1.14  
    1.15  # Do not change or remove the following line, it is needed for consistency checks:
    1.16 -DATE_WHEN_GENERATED=1367502949
    1.17 +DATE_WHEN_GENERATED=1369764185
    1.18  
    1.19  ###############################################################################
    1.20  #
    1.21 @@ -6608,7 +6608,7 @@
    1.22  $as_echo "$ac_cv_build" >&6; }
    1.23  case $ac_cv_build in
    1.24  *-*-*) ;;
    1.25 -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
    1.26 +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
    1.27  esac
    1.28  build=$ac_cv_build
    1.29  ac_save_IFS=$IFS; IFS='-'
    1.30 @@ -6641,7 +6641,7 @@
    1.31  $as_echo "$ac_cv_host" >&6; }
    1.32  case $ac_cv_host in
    1.33  *-*-*) ;;
    1.34 -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
    1.35 +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
    1.36  esac
    1.37  host=$ac_cv_host
    1.38  ac_save_IFS=$IFS; IFS='-'
    1.39 @@ -6674,7 +6674,7 @@
    1.40  $as_echo "$ac_cv_target" >&6; }
    1.41  case $ac_cv_target in
    1.42  *-*-*) ;;
    1.43 -*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
    1.44 +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
    1.45  esac
    1.46  target=$ac_cv_target
    1.47  ac_save_IFS=$IFS; IFS='-'
    1.48 @@ -19747,7 +19747,7 @@
    1.49  test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    1.50  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    1.51  as_fn_error $? "no acceptable C compiler found in \$PATH
    1.52 -See \`config.log' for more details" "$LINENO" 5 ; }
    1.53 +See \`config.log' for more details" "$LINENO" 5; }
    1.54  
    1.55  # Provide some information about the compiler.
    1.56  $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
    1.57 @@ -19862,7 +19862,7 @@
    1.58  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    1.59  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    1.60  as_fn_error 77 "C compiler cannot create executables
    1.61 -See \`config.log' for more details" "$LINENO" 5 ; }
    1.62 +See \`config.log' for more details" "$LINENO" 5; }
    1.63  else
    1.64    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    1.65  $as_echo "yes" >&6; }
    1.66 @@ -19905,7 +19905,7 @@
    1.67    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    1.68  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    1.69  as_fn_error $? "cannot compute suffix of executables: cannot compile and link
    1.70 -See \`config.log' for more details" "$LINENO" 5 ; }
    1.71 +See \`config.log' for more details" "$LINENO" 5; }
    1.72  fi
    1.73  rm -f conftest conftest$ac_cv_exeext
    1.74  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
    1.75 @@ -19964,7 +19964,7 @@
    1.76  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    1.77  as_fn_error $? "cannot run C compiled programs.
    1.78  If you meant to cross compile, use \`--host'.
    1.79 -See \`config.log' for more details" "$LINENO" 5 ; }
    1.80 +See \`config.log' for more details" "$LINENO" 5; }
    1.81      fi
    1.82    fi
    1.83  fi
    1.84 @@ -20016,7 +20016,7 @@
    1.85  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    1.86  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    1.87  as_fn_error $? "cannot compute suffix of object files: cannot compile
    1.88 -See \`config.log' for more details" "$LINENO" 5 ; }
    1.89 +See \`config.log' for more details" "$LINENO" 5; }
    1.90  fi
    1.91  rm -f conftest.$ac_cv_objext conftest.$ac_ext
    1.92  fi
    1.93 @@ -24191,7 +24191,7 @@
    1.94    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    1.95  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    1.96  as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
    1.97 -See \`config.log' for more details" "$LINENO" 5 ; }
    1.98 +See \`config.log' for more details" "$LINENO" 5; }
    1.99  fi
   1.100  
   1.101  ac_ext=cpp
   1.102 @@ -24591,7 +24591,7 @@
   1.103    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
   1.104  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   1.105  as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
   1.106 -See \`config.log' for more details" "$LINENO" 5 ; }
   1.107 +See \`config.log' for more details" "$LINENO" 5; }
   1.108  fi
   1.109  
   1.110  ac_ext=cpp
   1.111 @@ -28426,7 +28426,7 @@
   1.112       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
   1.113  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   1.114  as_fn_error 77 "cannot compute sizeof (int *)
   1.115 -See \`config.log' for more details" "$LINENO" 5 ; }
   1.116 +See \`config.log' for more details" "$LINENO" 5; }
   1.117     else
   1.118       ac_cv_sizeof_int_p=0
   1.119     fi
   1.120 @@ -29640,7 +29640,7 @@
   1.121    have_x=disabled
   1.122  else
   1.123    case $x_includes,$x_libraries in #(
   1.124 -    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #(
   1.125 +    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
   1.126      *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
   1.127    $as_echo_n "(cached) " >&6
   1.128  else
   1.129 @@ -32295,7 +32295,7 @@
   1.130  See the pkg-config man page for more details.
   1.131  
   1.132  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
   1.133 -See \`config.log' for more details" "$LINENO" 5 ; }
   1.134 +See \`config.log' for more details" "$LINENO" 5; }
   1.135  else
   1.136  	LIBFFI_CFLAGS=$pkg_cv_LIBFFI_CFLAGS
   1.137  	LIBFFI_LIBS=$pkg_cv_LIBFFI_LIBS
   1.138 @@ -33825,7 +33825,7 @@
   1.139      "$OUTPUT_ROOT/spec.sh") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in" ;;
   1.140      "$OUTPUT_ROOT/Makefile") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in" ;;
   1.141  
   1.142 -  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
   1.143 +  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   1.144    esac
   1.145  done
   1.146  
   1.147 @@ -34140,7 +34140,7 @@
   1.148    esac
   1.149    case $ac_mode$ac_tag in
   1.150    :[FHL]*:*);;
   1.151 -  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
   1.152 +  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   1.153    :[FH]-) ac_tag=-:-;;
   1.154    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   1.155    esac
   1.156 @@ -34168,7 +34168,7 @@
   1.157  	   [\\/$]*) false;;
   1.158  	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
   1.159  	   esac ||
   1.160 -	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
   1.161 +	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
   1.162        esac
   1.163        case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
   1.164        as_fn_append ac_file_inputs " '$ac_f'"
   1.165 @@ -34195,7 +34195,7 @@
   1.166  
   1.167      case $ac_tag in
   1.168      *:-:* | *:-) cat >"$tmp/stdin" \
   1.169 -      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
   1.170 +      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
   1.171      esac
   1.172      ;;
   1.173    esac

     2.1 --- a/common/makefiles/Jprt.gmk	Thu May 16 12:13:52 2013 -0700
     2.2 +++ b/common/makefiles/Jprt.gmk	Tue May 28 20:03:21 2013 +0200
     2.3 @@ -127,6 +127,9 @@
     2.4    ifdef ALT_JAVAFX_ZIP_DIR
     2.5  	@$(ECHO) " --with-javafx-zip-dir=$(call UnixPath,$(ALT_JAVAFX_ZIP_DIR)) " >> $@.tmp
     2.6    endif
     2.7 +  ifdef ALT_JMC_ZIP_DIR
     2.8 +	@$(ECHO) " --with-jmc-zip-dir=$(call UnixPath,$(ALT_JMC_ZIP_DIR)) " >> $@.tmp
     2.9 +  endif
    2.10    ifdef ALT_WIXDIR
    2.11  	@$(ECHO) " --with-wix=$(call UnixPath,$(ALT_WIXDIR)) " >> $@.tmp
    2.12    endif

common/autoconf/generated-configure.sh		file \| annotate \| diff \| comparison \| revisions
common/makefiles/Jprt.gmk		file \| annotate \| diff \| comparison \| revisions

Mercurial > jdk8-mips64-public / changeset

changeset

8014762: Add JMC configure option mapping to Jprt.gmk