diff options
| -rw-r--r-- | eclass/java-utils-2.eclass | 18 | ||||
| -rw-r--r-- | profiles/prefix/linux-standalone/ppc64/eapi | 1 | ||||
| -rw-r--r-- | profiles/prefix/linux-standalone/ppc64/make.defaults | 5 | ||||
| -rw-r--r-- | profiles/prefix/linux-standalone/ppc64/parent | 2 | ||||
| -rw-r--r-- | profiles/prefix/linux-standalone/profile.bashrc | 2 | ||||
| -rw-r--r-- | profiles/profiles.desc | 1 |
6 files changed, 19 insertions, 10 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index ee4c31991407..e46a53d7d546 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -1,4 +1,4 @@ -# Copyright 2004-2015 Gentoo Foundation +# Copyright 2004-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -338,7 +338,7 @@ java-pkg_dojar() { if [[ -e "${jar}" ]] ; then # Don't overwrite if jar has already been installed with the same # name - local dest="${D}${JAVA_PKG_JARDEST}/${jar_basename}" + local dest="${ED}${JAVA_PKG_JARDEST}/${jar_basename}" if [[ -e "${dest}" ]]; then ewarn "Overwriting ${dest}" fi @@ -352,13 +352,13 @@ java-pkg_dojar() { insinto "${JAVA_PKG_JARDEST}" doins "${jar}" ) || die "failed to install ${jar}" - java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}" - debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}" + java-pkg_append_ JAVA_PKG_CLASSPATH "${EPREFIX}/${JAVA_PKG_JARDEST}/${jar_basename}" + debug-print "installed ${jar} to ${ED}${JAVA_PKG_JARDEST}" # make a symlink to the original jar if it's symlink else # TODO use dosym, once we find something that could use it # -nichoj - ln -s "$(readlink "${jar}")" "${D}${JAVA_PKG_JARDEST}/${jar_basename}" + ln -s "$(readlink "${jar}")" "${ED}${JAVA_PKG_JARDEST}/${jar_basename}" debug-print "${jar} is a symlink, linking accordingly" fi else @@ -828,7 +828,7 @@ java-pkg_dolauncher() { echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}" cat "${var_tmp}" >> "${target}" rm -f "${var_tmp}" - echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}" + echo "source ${EPREFIX}/usr/share/java-config-2/launcher/launcher.bash" >> "${target}" if [[ -n "${target_dir}" ]]; then ( @@ -1745,7 +1745,7 @@ java-pkg_register-ant-task() { local TASK_NAME="${1:-${JAVA_PKG_NAME}}" dodir /usr/share/ant/${TASKS_DIR} - touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}" + touch "${ED}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}" } # @FUNCTION: java-pkg_ant-tasks-depend @@ -2339,9 +2339,9 @@ java-pkg_init_paths_() { JAVA_PKG_SHAREPATH="/usr/share/${JAVA_PKG_NAME}" JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/" - JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env" + JAVA_PKG_ENV="${ED}${JAVA_PKG_SHAREPATH}/package.env" JAVA_PKG_VIRTUALS_PATH="/usr/share/java-config-2/virtuals" - JAVA_PKG_VIRTUAL_PROVIDER="${D}/${JAVA_PKG_VIRTUALS_PATH}/${JAVA_PKG_NAME}" + JAVA_PKG_VIRTUAL_PROVIDER="${ED}${JAVA_PKG_VIRTUALS_PATH}/${JAVA_PKG_NAME}" [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib" [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="/usr/$(get_libdir)/${JAVA_PKG_NAME}" diff --git a/profiles/prefix/linux-standalone/ppc64/eapi b/profiles/prefix/linux-standalone/ppc64/eapi new file mode 100644 index 000000000000..7ed6ff82de6b --- /dev/null +++ b/profiles/prefix/linux-standalone/ppc64/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/prefix/linux-standalone/ppc64/make.defaults b/profiles/prefix/linux-standalone/ppc64/make.defaults new file mode 100644 index 000000000000..04e73caaa1d7 --- /dev/null +++ b/profiles/prefix/linux-standalone/ppc64/make.defaults @@ -0,0 +1,5 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +ACCEPT_KEYWORDS="~${ARCH}" diff --git a/profiles/prefix/linux-standalone/ppc64/parent b/profiles/prefix/linux-standalone/ppc64/parent new file mode 100644 index 000000000000..51fedc0bc3e6 --- /dev/null +++ b/profiles/prefix/linux-standalone/ppc64/parent @@ -0,0 +1,2 @@ +../../../default/linux/powerpc/ppc64/13.0/64bit-userland +.. diff --git a/profiles/prefix/linux-standalone/profile.bashrc b/profiles/prefix/linux-standalone/profile.bashrc index b46c49efdc6c..4b39a3e25d5b 100644 --- a/profiles/prefix/linux-standalone/profile.bashrc +++ b/profiles/prefix/linux-standalone/profile.bashrc @@ -11,7 +11,7 @@ if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE} == configure ]]; the einfo "Prefixifying dynamic linkers..." for h in gcc/config/*/*linux*.h; do ebegin " Updating $h" - sed -i -r "s,(_DYNAMIC_LINKER.*\")(/lib),\1${EPREFIX}\2," $h + sed -i -r "/_DYNAMIC_LINKER/s,([\":])(/lib),\1${EPREFIX}\2,g" $h eend $? done diff --git a/profiles/profiles.desc b/profiles/profiles.desc index 288c9c3fc8a1..7a67bde8c082 100644 --- a/profiles/profiles.desc +++ b/profiles/profiles.desc @@ -264,6 +264,7 @@ x86-linux prefix/linux-standalone/x86 exp x86-linux prefix/linux-standalone/x86/legacy exp arm-linux prefix/linux-standalone/arm/armv7a exp arm64-linux prefix/linux-standalone/arm64 exp +ppc64-linux prefix/linux-standalone/ppc64 exp # Mac OS X Profiles ppc-macos prefix/darwin/macos/10.4/ppc exp |