mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-12 15:36:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

eclass/java-utils-2: Sync with Gentoo

Browse Source 
It's from Gentoo commit 0a8a487f6ea6713400505929f0b335db009d7e87.
This commit is contained in:
Flatcar Buildbot 2023-09-25 07:13:01 +00:00 committed by Krzesimir Nowak
parent 217e0ca6e2
commit 4725825d65
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sdk_container/src/third_party/portage-stable/eclass/java-utils-2.eclass vendored
View File

@ -577,7 +577,7 @@ java-pkg_regso() {
java-pkg_append_ JAVA_PKG_LIBRARY "/${target_dir#${D}}" java-pkg_append_ JAVA_PKG_LIBRARY "/${target_dir#${D}}"
# Check the path of the lib relative to ${D} # Check the path of the lib relative to ${D}
elif [[ -e "${D}${lib}" ]]; then elif [[ -e "${D}${lib}" ]]; then
target_dir="$(java-pkg_expand_dir_ ${D}${lib})" target_dir="$(java-pkg_expand_dir_ "${D}${lib}")"
java-pkg_append_ JAVA_PKG_LIBRARY "${target_dir}" java-pkg_append_ JAVA_PKG_LIBRARY "${target_dir}"
else else
die "${lib} does not exist" die "${lib} does not exist"
@ -924,7 +924,7 @@ java-pkg_recordjavadoc()
debug-print-function ${FUNCNAME} $* debug-print-function ${FUNCNAME} $*
# the find statement is important # the find statement is important
# as some packages include multiple trees of javadoc # as some packages include multiple trees of javadoc
JAVADOC_PATH="$(find ${D}/usr/share/doc/ -name allclasses-frame.html -printf '%h:')" JAVADOC_PATH="$(find "${D}"/usr/share/doc/ -name allclasses-frame.html -printf '%h:')"
# remove $D - TODO: check this is ok with all cases of the above # remove $D - TODO: check this is ok with all cases of the above
JAVADOC_PATH="${JAVADOC_PATH//${D}}" JAVADOC_PATH="${JAVADOC_PATH//${D}}"
if [[ -n "${JAVADOC_PATH}" ]] ; then if [[ -n "${JAVADOC_PATH}" ]] ; then
@ -2390,7 +2390,7 @@ java-pkg_init-compiler_() {
} }
# @FUNCTION: init_paths_ # @FUNCTION: java-pkg_init_paths_
# @INTERNAL # @INTERNAL
# @DESCRIPTION: # @DESCRIPTION:
# Initializes some variables that will be used. These variables are mostly used # Initializes some variables that will be used. These variables are mostly used