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

8268895: Do not filter out man pages from build

Browse Source 
Reviewed-by: dholmes, jwaters
This commit is contained in:
Magnus Ihse Bursie 2024-11-11 10:15:02 +00:00
parent ec13364cda
commit cbe8448f28
4 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
make/autoconf/jdk-options.m4
View File

@ -638,14 +638,11 @@ AC_DEFUN([JDKOPT_EXCLUDE_TRANSLATIONS],
################################################################################ ################################################################################
# #
# Optionally disable man pages # Optionally disable man pages (deprecated)
# #
AC_DEFUN([JDKOPT_ENABLE_DISABLE_MANPAGES], AC_DEFUN([JDKOPT_ENABLE_DISABLE_MANPAGES],
[ [
UTIL_ARG_ENABLE(NAME: manpages, DEFAULT: true, RESULT: BUILD_MANPAGES, UTIL_DEPRECATED_ARG_ENABLE(manpages)
DESC: [enable copying of static man pages],
CHECKING_MSG: [if static man pages should be copied])
AC_SUBST(BUILD_MANPAGES)
]) ])
################################################################################ ################################################################################

2
make/autoconf/spec.gmk.template
View File

@ -367,8 +367,6 @@ ENABLE_GENERATE_CLASSLIST := @ENABLE_GENERATE_CLASSLIST@
EXCLUDE_TRANSLATIONS := @EXCLUDE_TRANSLATIONS@ EXCLUDE_TRANSLATIONS := @EXCLUDE_TRANSLATIONS@
BUILD_MANPAGES := @BUILD_MANPAGES@
BUILD_CDS_ARCHIVE := @BUILD_CDS_ARCHIVE@ BUILD_CDS_ARCHIVE := @BUILD_CDS_ARCHIVE@
BUILD_CDS_ARCHIVE_COH := @BUILD_CDS_ARCHIVE_COH@ BUILD_CDS_ARCHIVE_COH := @BUILD_CDS_ARCHIVE_COH@

13
make/common/modules/LauncherCommon.gmk
View File

@ -228,14 +228,11 @@ ifeq ($(call isTargetOsType, unix)+$(MAKEFILE_PREFIX), true+Launcher)
endif endif
else else
# No markdown man pages present # No markdown man pages present
ifeq ($(BUILD_MANPAGES), true) $(eval $(call SetupCopyFiles, COPY_MAN_PAGES, \
# BUILD_MANPAGES is a mis-nomer. It really means "copy the pre-generated man pages". DEST := $(SUPPORT_OUTPUTDIR)/modules_man/$(MODULE)/man1, \
$(eval $(call SetupCopyFiles, COPY_MAN_PAGES, \ FILES := $(MAN_FILES_TROFF), \
DEST := $(SUPPORT_OUTPUTDIR)/modules_man/$(MODULE)/man1, \ ))
FILES := $(MAN_FILES_TROFF), \
))
TARGETS += $(COPY_MAN_PAGES) TARGETS += $(COPY_MAN_PAGES)
endif
endif endif
endif endif

1
make/conf/jib-profiles.js
View File

@ -252,7 +252,6 @@ var getJibProfilesCommon = function (input, data) {
default_make_targets: ["product-bundles", "test-bundles", "static-libs-bundles"], default_make_targets: ["product-bundles", "test-bundles", "static-libs-bundles"],
configure_args: concat( configure_args: concat(
"--with-exclude-translations=es,fr,it,ko,pt_BR,sv,ca,tr,cs,sk,ja_JP_A,ja_JP_HA,ja_JP_HI,ja_JP_I,zh_TW,zh_HK", "--with-exclude-translations=es,fr,it,ko,pt_BR,sv,ca,tr,cs,sk,ja_JP_A,ja_JP_HA,ja_JP_HI,ja_JP_I,zh_TW,zh_HK",
"--disable-manpages",
"--disable-jvm-feature-shenandoahgc", "--disable-jvm-feature-shenandoahgc",
versionArgs(input, common)) versionArgs(input, common))
}; };