summaryrefslogtreecommitdiffstats
path: root/lib/buildsystem/autoconf.sh
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2014-01-20 15:32:14 (EST)
committer P. J. McDermott <pjm@nac.net>2014-01-20 15:32:14 (EST)
commit8d1159dbe468fb0f5f47fa7c388dbf1745cfad80 (patch)
tree952a9ca9320298391f673c41788e1e55dbef29f8 /lib/buildsystem/autoconf.sh
parentec05ea4c72cbd20f726541ebfc52585c4fe2a762 (diff)
lib/buildsystem/*.sh: Remove _oh_local.
Diffstat (limited to 'lib/buildsystem/autoconf.sh')
-rw-r--r--lib/buildsystem/autoconf.sh25
1 files changed, 13 insertions, 12 deletions
diff --git a/lib/buildsystem/autoconf.sh b/lib/buildsystem/autoconf.sh
index cc727e7..35ae452 100644
--- a/lib/buildsystem/autoconf.sh
+++ b/lib/buildsystem/autoconf.sh
@@ -27,52 +27,53 @@ _oh_autoconf_can_configure()
_oh_autoconf_configure()
{
- _oh_local _ohbsbac_arch_opts _ohbsbac_libdir _ohbsbac_rc
+ local arch_opts=
+ local libdir=
+ local rc=
mkdir -p "${_OH_BUILDSYSTEM_BUILD_DIR}"
cd "${_OH_BUILDSYSTEM_BUILD_DIR}"
- _ohbsbac_arch_opts="
+ arch_opts="
--build=$(oh_buildsystem_arch "${OPK_BUILD_ARCH}" 'autoconf')
"
if [ "${OPK_BUILD_ARCH}" != "${OPK_HOST_ARCH}" ]; then
- _ohbsbac_arch_opts="${_ohbsbac_arch_opts}
+ arch_opts="${arch_opts}
--host=$(oh_buildsystem_arch \
"${OPK_HOST_ARCH}" 'autoconf')"
fi
if [ -n "${_OH_BUILDSYSTEM_TARGET_ARCH}" ]; then
- _ohbsbac_arch_opts="${_ohbsbac_arch_opts}
+ arch_opts="${arch_opts}
--target=$(oh_buildsystem_arch \
"${_OH_BUILDSYSTEM_TARGET_ARCH}" 'autoconf')"
fi
if [ '@@MULTIARCH_LIBDIR@@' = 'true' ]; then
- _ohbsbac_libdir='${prefix}/lib/'"${OPK_HOST_ARCH}"
+ libdir='${prefix}/lib/'"${OPK_HOST_ARCH}"
else
- _ohbsbac_libdir='${prefix}/lib/'
+ libdir='${prefix}/lib/'
fi
"${_OH_BUILDSYSTEM_SOURCE_DIR}/configure" \
--prefix='/usr' \
--bindir='${prefix}/bin' \
--sbindir='${prefix}/sbin' \
- --libexecdir="${_ohbsbac_libdir}" \
+ --libexecdir="${libdir}" \
--sysconfdir='/etc' \
--localstatedir='/var' \
- --libdir="${_ohbsbac_libdir}" \
+ --libdir="${libdir}" \
--includedir='${prefix}/include' \
--infodir='${prefix}/share/info' \
--mandir='${prefix}/share/man' \
- ${_ohbsbac_arch_opts} \
+ ${arch_opts} \
--disable-maintainer-mode \
--disable-dependency-tracking \
"${@}"
- _ohbsbac_rc=${?}
+ rc=${?}
cd "${_OH_BUILDSYSTEM_WORK_AREA}"
- _oh_return ${_ohbsbac_rc}
- return ${?}
+ return ${rc}
}
_oh_autoconf_can_build()