diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/games.eclass | 4 | ||||
| -rw-r--r-- | eclass/gnome2-utils.eclass | 4 | ||||
| -rw-r--r-- | eclass/office-ext-r1.eclass | 2 | ||||
| -rw-r--r-- | eclass/python-utils-r1.eclass | 3 | ||||
| -rw-r--r-- | eclass/ros-catkin.eclass | 2 | ||||
| -rw-r--r-- | eclass/toolchain-funcs.eclass | 1 |
6 files changed, 10 insertions, 6 deletions
diff --git a/eclass/games.eclass b/eclass/games.eclass index 03421b332e76..7d231e186cc9 100644 --- a/eclass/games.eclass +++ b/eclass/games.eclass @@ -247,14 +247,14 @@ prepgamesdirs() { find "${D}/${dir}" -type f -print0 | xargs -0 chmod $mode # common trees should not be games owned #264872 #537580 - fowners root:root "${dir}" + fowners root:0 "${dir}" fperms 755 "${dir}" if [[ ${dir} == "${GAMES_PREFIX}" \ || ${dir} == "${GAMES_PREFIX_OPT}" ]] ; then for d in $(get_libdir) bin ; do # check if dirs exist to avoid "nonfatal" option if [[ -e ${D}/${dir}/${d} ]] ; then - fowners root:root "${dir}/${d}" + fowners root:0 "${dir}/${d}" fperms 755 "${dir}/${d}" fi done diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass index 476fb2882370..59ab5861c356 100644 --- a/eclass/gnome2-utils.eclass +++ b/eclass/gnome2-utils.eclass @@ -15,7 +15,7 @@ # * GConf schemas management # * scrollkeeper (old Gnome help system) management -inherit multilib +inherit eutils multilib case "${EAPI:-0}" in 0|1|2|3|4|5) ;; @@ -431,7 +431,7 @@ gnome2_gdk_pixbuf_update() { fi ebegin "Updating gdk-pixbuf loader cache" - local tmp_file=$(mktemp -t tmp.XXXXXXXXXX_gdkpixbuf) + local tmp_file=$(emktemp) ${updater} 1> "${tmp_file}" && chmod 0644 "${tmp_file}" && cp -f "${tmp_file}" "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache" && diff --git a/eclass/office-ext-r1.eclass b/eclass/office-ext-r1.eclass index a7afb15e4d84..f9492a839f31 100644 --- a/eclass/office-ext-r1.eclass +++ b/eclass/office-ext-r1.eclass @@ -164,7 +164,7 @@ UNOPKG_BINARY="/usr/lib64/openoffice/program/unopkg" office-ext-r1_add_extension() { debug-print-function ${FUNCNAME} "$@" local ext=$1 - local tmpdir=$(mktemp -d --tmpdir="${T}") + local tmpdir=$(emktemp -d) debug-print "${FUNCNAME}: ${UNOPKG_BINARY} add --shared \"${ext}\"" ebegin "Adding office extension: \"${ext}\"" diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 622cb591c42d..a80bdf436eb8 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -1117,6 +1117,9 @@ python_fix_shebang() { python_export_utf8_locale() { debug-print-function ${FUNCNAME} "${@}" + # If the locale program isn't available, just return. + type locale >/dev/null || return 0 + if [[ $(locale charmap) != UTF-8 ]]; then if [[ -n ${LC_ALL} ]]; then ewarn "LC_ALL is set to a locale with a charmap other than UTF-8." diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass index f1bc32eb8f94..412ff66e01c9 100644 --- a/eclass/ros-catkin.eclass +++ b/eclass/ros-catkin.eclass @@ -125,7 +125,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then S=${WORKDIR}/${P}/${ROS_SUBDIR} else SRC_URI="${ROS_REPO_URI}/archive/${VER_PREFIX}${PV%_*}${VER_SUFFIX}.tar.gz -> ${ROS_REPO_URI##*/}-${PV}.tar.gz" - S=${WORKDIR}/${VER_PREFIX}${ROS_REPO_URI##*/}-${PV}/${ROS_SUBDIR} + S=${WORKDIR}/${VER_PREFIX}${ROS_REPO_URI##*/}-${PV}${VER_SUFFIX}/${ROS_SUBDIR} fi HOMEPAGE="http://wiki.ros.org/${PN}" diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass index b6d1ab0fd1fc..59c28617aec4 100644 --- a/eclass/toolchain-funcs.eclass +++ b/eclass/toolchain-funcs.eclass @@ -725,6 +725,7 @@ gen_usr_ldscript() { # Eventually we'd like to get rid of this func completely #417451 case ${CTARGET:-${CHOST}} in *-darwin*) ;; + *-android*) return 0 ;; *linux*|*-freebsd*|*-openbsd*|*-netbsd*) use prefix && return 0 ;; *) return 0 ;; |