| 1 |
commit: 353da60003022823a64948adc2662bf75e91679a |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 29 20:30:29 2017 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 29 20:30:29 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=353da600 |
| 7 |
|
| 8 |
sys-libs/tapi: simplify by using S |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
| 11 |
|
| 12 |
sys-libs/tapi/tapi-2.0.0.ebuild | 11 ++++------- |
| 13 |
1 file changed, 4 insertions(+), 7 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-libs/tapi/tapi-2.0.0.ebuild b/sys-libs/tapi/tapi-2.0.0.ebuild |
| 16 |
index 586bd1d95c2..a789277cf7a 100644 |
| 17 |
--- a/sys-libs/tapi/tapi-2.0.0.ebuild |
| 18 |
+++ b/sys-libs/tapi/tapi-2.0.0.ebuild |
| 19 |
@@ -61,10 +61,7 @@ CLANG_S="${WORKDIR}"/${CLANG_P}.src |
| 20 |
|
| 21 |
APPLE_LLVM_S="${WORKDIR}/${APPLE_LLVM_P}"/src |
| 22 |
|
| 23 |
-TAPI_S="${WORKDIR}"/${TAPI_P} |
| 24 |
- |
| 25 |
-# to avoid ebuild dying |
| 26 |
-S=${WORKDIR} |
| 27 |
+S="${WORKDIR}"/${TAPI_P} |
| 28 |
|
| 29 |
TAPI_BUILD="${WORKDIR}"/${P}_build |
| 30 |
|
| 31 |
@@ -88,7 +85,7 @@ src_prepare() { |
| 32 |
CMAKE_USE_DIR="${PWD}" \ |
| 33 |
cmake-utils_src_prepare |
| 34 |
|
| 35 |
- cd "${TAPI_S}" || die |
| 36 |
+ cd "${S}" || die |
| 37 |
eapply "${FILESDIR}"/${PN}-2.0.0-standalone.patch |
| 38 |
CMAKE_USE_DIR="${PWD}" \ |
| 39 |
cmake-utils_src_prepare |
| 40 |
@@ -147,7 +144,7 @@ src_configure() { |
| 41 |
-DOBJCMETADATA_LIBRARY_DIRS="${OBJCMD_ROOT}"/lib |
| 42 |
) |
| 43 |
|
| 44 |
- cd "${TAPI_S}" || die |
| 45 |
+ cd "${S}" || die |
| 46 |
BUILD_DIR="${TAPI_BUILD}/" \ |
| 47 |
CMAKE_USE_DIR="${PWD}" \ |
| 48 |
cmake-utils_src_configure |
| 49 |
@@ -170,7 +167,7 @@ src_compile() { |
| 50 |
${CMAKE_MAKEFILE_GENERATOR} install |
| 51 |
|
| 52 |
# finally build tapi |
| 53 |
- cd "${TAPI_S}" || die |
| 54 |
+ cd "${S}" || die |
| 55 |
BUILD_DIR="${TAPI_BUILD}" \ |
| 56 |
CMAKE_USE_DIR="${PWD}" \ |
| 57 |
cmake-utils_src_compile |
Archives