stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8031767: Support system or alternative implementations of zlib

Browse Source 
Reviewed-by: alanb, erikj
This commit is contained in:
Xueming Shen 2016-03-25 10:55:56 -07:00
parent 0c67cefd42
commit 109b51a79b
3 changed files with 14 additions and 9 deletions

10
common/autoconf/generated-configure.sh

@ -4950,7 +4950,7 @@ VS_SDK_PLATFORM_NAME_2013=
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1458558778
DATE_WHEN_GENERATED=1458755892
###############################################################################
#
@ -61707,10 +61707,10 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for which zlib to use" >&5
$as_echo_n "checking for which zlib to use... " >&6; }
DEFAULT_ZLIB=bundled
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
# On macosx default is system...on others default is bundled
DEFAULT_ZLIB=system
DEFAULT_ZLIB=system
if test "x$OPENJDK_TARGET_OS" = xwindows; then
# On windows default is bundled...on others default is system
DEFAULT_ZLIB=bundled
fi
if test "x${ZLIB_FOUND}" != "xyes"; then

8
common/autoconf/lib-bundled.m4

@ -157,10 +157,10 @@ AC_DEFUN_ONCE([LIB_SETUP_ZLIB],
AC_MSG_CHECKING([for which zlib to use])
DEFAULT_ZLIB=bundled
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
# On macosx default is system...on others default is bundled
DEFAULT_ZLIB=system
DEFAULT_ZLIB=system
if test "x$OPENJDK_TARGET_OS" = xwindows; then
# On windows default is bundled...on others default is system
DEFAULT_ZLIB=bundled
fi
if test "x${ZLIB_FOUND}" != "xyes"; then

5
common/conf/jib-profiles.js

@ -242,6 +242,7 @@ var getJibProfilesProfiles = function (input, common) {
target_cpu: "x64",
dependencies: concat(common.dependencies, "devkit"),
configure_args: common.configure_args,
configure_args: concat(common.configure_args, "--with-zlib=system"),
make_args: common.make_args
},
@ -251,6 +252,7 @@ var getJibProfilesProfiles = function (input, common) {
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"),
make_args: common.make_args
},
@ -259,6 +261,7 @@ var getJibProfilesProfiles = function (input, common) {
target_cpu: "x64",
dependencies: concat(common.dependencies, "devkit"),
configure_args: common.configure_args,
configure_args: concat(common.configure_args, "--with-zlib=system"),
make_args: common.make_args
},
@ -267,6 +270,7 @@ var getJibProfilesProfiles = function (input, common) {
target_cpu: "x64",
dependencies: concat(common.dependencies, "devkit", "cups"),
configure_args: common.configure_args,
configure_args: concat(common.configure_args, "--with-zlib=system"),
make_args: common.make_args
},
@ -275,6 +279,7 @@ var getJibProfilesProfiles = function (input, common) {
target_cpu: "sparcv9",
dependencies: concat(common.dependencies, "devkit", "cups"),
configure_args: common.configure_args,
configure_args: concat(common.configure_args, "--with-zlib=system"),
make_args: common.make_args
},