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

8005850: build-infra: Make --enable-openjdk-only really disable custom

Browse Source 
Reviewed-by: ohair, dholmes
This commit is contained in:
Erik Joelsson 2013-01-11 10:46:59 +01:00
parent 4ed6eedb66
commit ad4210a395
3 changed files with 320 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/autoconf/configure.ac
View File

@ -83,6 +83,9 @@ PLATFORM_SETUP_OPENJDK_BUILD_AND_TARGET
BASIC_SETUP_PATHS BASIC_SETUP_PATHS
BASIC_SETUP_LOGGING BASIC_SETUP_LOGGING
# Check if it's a pure open build or if custom sources are to be used.
JDKOPT_SETUP_OPEN_OR_CUSTOM
# These are needed to be able to create a configuration name (and thus the output directory) # These are needed to be able to create a configuration name (and thus the output directory)
JDKOPT_SETUP_JDK_VARIANT JDKOPT_SETUP_JDK_VARIANT
JDKOPT_SETUP_JVM_VARIANTS JDKOPT_SETUP_JVM_VARIANTS

585
common/autoconf/generated-configure.sh
View File

File diff suppressed because it is too large Load Diff

44
common/autoconf/jdk-options.m4
View File

@ -247,46 +247,50 @@ AC_SUBST(DEBUG_CLASSFILES)
AC_SUBST(BUILD_VARIANT_RELEASE) AC_SUBST(BUILD_VARIANT_RELEASE)
]) ])
AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
[
############################################################################### ###############################################################################
# #
# Should we build only OpenJDK even if closed sources are present? # Should we build only OpenJDK even if closed sources are present?
# #
AC_ARG_ENABLE([openjdk-only], [AS_HELP_STRING([--enable-openjdk-only], AC_DEFUN_ONCE([JDKOPT_SETUP_OPEN_OR_CUSTOM],
[supress building closed source even if present @<:@disabled@:>@])],,[enable_openjdk_only="no"]) [
AC_ARG_ENABLE([openjdk-only], [AS_HELP_STRING([--enable-openjdk-only],
[suppress building custom source even if present @<:@disabled@:>@])],,[enable_openjdk_only="no"])
AC_MSG_CHECKING([for presence of closed sources]) AC_MSG_CHECKING([for presence of closed sources])
if test -d "$SRC_ROOT/jdk/src/closed"; then if test -d "$SRC_ROOT/jdk/src/closed"; then
CLOSED_SOURCE_PRESENT=yes CLOSED_SOURCE_PRESENT=yes
else else
CLOSED_SOURCE_PRESENT=no CLOSED_SOURCE_PRESENT=no
fi fi
AC_MSG_RESULT([$CLOSED_SOURCE_PRESENT]) AC_MSG_RESULT([$CLOSED_SOURCE_PRESENT])
AC_MSG_CHECKING([if closed source is supressed (openjdk-only)]) AC_MSG_CHECKING([if closed source is suppressed (openjdk-only)])
SUPRESS_CLOSED_SOURCE="$enable_openjdk_only" SUPPRESS_CLOSED_SOURCE="$enable_openjdk_only"
AC_MSG_RESULT([$SUPRESS_CLOSED_SOURCE]) AC_MSG_RESULT([$SUPPRESS_CLOSED_SOURCE])
if test "x$CLOSED_SOURCE_PRESENT" = xno; then if test "x$CLOSED_SOURCE_PRESENT" = xno; then
OPENJDK=true OPENJDK=true
if test "x$SUPRESS_CLOSED_SOURCE" = "xyes"; then if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then
AC_MSG_WARN([No closed source present, --enable-openjdk-only makes no sense]) AC_MSG_WARN([No closed source present, --enable-openjdk-only makes no sense])
fi fi
else else
if test "x$SUPRESS_CLOSED_SOURCE" = "xyes"; then if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then
OPENJDK=true OPENJDK=true
else else
OPENJDK=false OPENJDK=false
fi fi
fi fi
if test "x$OPENJDK" = "xtrue"; then if test "x$OPENJDK" = "xtrue"; then
SET_OPENJDK="OPENJDK=true" SET_OPENJDK="OPENJDK=true"
fi fi
AC_SUBST(SET_OPENJDK) AC_SUBST(SET_OPENJDK)
])
AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
[
############################################################################### ###############################################################################
# #