summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2017-12-29 21:30:29 +0100
committerFabian Groffen <grobian@gentoo.org>2017-12-29 21:30:29 +0100
commit353da60003022823a64948adc2662bf75e91679a (patch)
treee05aa0be24fabd3f4299e7f75c660592aeb039ba /sys-libs/tapi
parentdev-perl/XML-XPath: Version bump (diff)
downloadgentoo-353da60003022823a64948adc2662bf75e91679a.tar.gz
gentoo-353da60003022823a64948adc2662bf75e91679a.tar.bz2
gentoo-353da60003022823a64948adc2662bf75e91679a.zip
sys-libs/tapi: simplify by using S
Package-Manager: Portage-2.3.13, Repoman-2.3.3
Diffstat (limited to 'sys-libs/tapi')
-rw-r--r--sys-libs/tapi/tapi-2.0.0.ebuild11
1 files changed, 4 insertions, 7 deletions
diff --git a/sys-libs/tapi/tapi-2.0.0.ebuild b/sys-libs/tapi/tapi-2.0.0.ebuild
index 586bd1d95c27..a789277cf7a0 100644
--- a/sys-libs/tapi/tapi-2.0.0.ebuild
+++ b/sys-libs/tapi/tapi-2.0.0.ebuild
@@ -61,10 +61,7 @@ CLANG_S="${WORKDIR}"/${CLANG_P}.src
APPLE_LLVM_S="${WORKDIR}/${APPLE_LLVM_P}"/src
-TAPI_S="${WORKDIR}"/${TAPI_P}
-
-# to avoid ebuild dying
-S=${WORKDIR}
+S="${WORKDIR}"/${TAPI_P}
TAPI_BUILD="${WORKDIR}"/${P}_build
@@ -88,7 +85,7 @@ src_prepare() {
CMAKE_USE_DIR="${PWD}" \
cmake-utils_src_prepare
- cd "${TAPI_S}" || die
+ cd "${S}" || die
eapply "${FILESDIR}"/${PN}-2.0.0-standalone.patch
CMAKE_USE_DIR="${PWD}" \
cmake-utils_src_prepare
@@ -147,7 +144,7 @@ src_configure() {
-DOBJCMETADATA_LIBRARY_DIRS="${OBJCMD_ROOT}"/lib
)
- cd "${TAPI_S}" || die
+ cd "${S}" || die
BUILD_DIR="${TAPI_BUILD}/" \
CMAKE_USE_DIR="${PWD}" \
cmake-utils_src_configure
@@ -170,7 +167,7 @@ src_compile() {
${CMAKE_MAKEFILE_GENERATOR} install
# finally build tapi
- cd "${TAPI_S}" || die
+ cd "${S}" || die
BUILD_DIR="${TAPI_BUILD}" \
CMAKE_USE_DIR="${PWD}" \
cmake-utils_src_compile