diff options
| author | Rechi <Rechi@users.noreply.github.com> | 2017-05-12 20:43:05 +0200 |
|---|---|---|
| committer | Rechi <Rechi@users.noreply.github.com> | 2017-05-12 20:43:05 +0200 |
| commit | dc52d708e9967fd075f4ce1d1ecf95bf029721d7 (patch) | |
| tree | d8e8a09dc8c40fbca42acfdd359e174e2d4436b9 /tools/darwin | |
| parent | fbbd8493d7d3ada357a83db356804da8e973ab05 (diff) | |
[depends][darwin] configure: remove special tarballs dir & nativeprefix
Diffstat (limited to 'tools/darwin')
| -rwxr-xr-x | tools/darwin/Support/Codesign.command | 4 | ||||
| -rw-r--r-- | tools/darwin/packaging/ios/mkdeb-ios.sh.in | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tools/darwin/Support/Codesign.command b/tools/darwin/Support/Codesign.command index 528f74a0be..07fde9b126 100755 --- a/tools/darwin/Support/Codesign.command +++ b/tools/darwin/Support/Codesign.command @@ -7,8 +7,8 @@ LIST_BINARY_EXTENSIONS="dylib so" export CODESIGN_ALLOCATE=`xcodebuild -find codesign_allocate` -GEN_ENTITLEMENTS="$XBMC_DEPENDS_ROOT/buildtools-native/bin/gen_entitlements.py" -LDID="$XBMC_DEPENDS_ROOT/buildtools-native/bin/ldid" +GEN_ENTITLEMENTS="$NATIVEPREFIX/bin/gen_entitlements.py" +LDID="$NATIVEPREFIX/bin/ldid" if [ ! -f ${GEN_ENTITLEMENTS} ]; then echo "error: $GEN_ENTITLEMENTS not found. Codesign won't work." diff --git a/tools/darwin/packaging/ios/mkdeb-ios.sh.in b/tools/darwin/packaging/ios/mkdeb-ios.sh.in index 4e9212688f..6aee2b042e 100644 --- a/tools/darwin/packaging/ios/mkdeb-ios.sh.in +++ b/tools/darwin/packaging/ios/mkdeb-ios.sh.in @@ -4,7 +4,7 @@ set -ex # usage: ./mkdeb-ios.sh release/debug (case insensitive) # Allows us to run mkdeb-ios.sh from anywhere in the three, rather than the tools/darwin/packaging/ios folder only -XBMC_DEPENDS_ROOT=@DEPENDS_ROOT_FOR_XCODE@ +NATIVEPREFIX=@NATIVEPREFIX@ SWITCH=`echo $1 | tr [A-Z] [a-z]` DIRNAME=`dirname $0` DSYM_TARGET_DIR=/Users/Shared/xbmc-depends/dSyms @@ -44,14 +44,14 @@ fi # also check for SIP (System Integrity Protection) here (via csrutil) - fakeroot et al are not working when it is enabled # fall back to oldschool sudo in that case -if [ -f "${XBMC_DEPENDS_ROOT}/buildtools-native/bin/fakeroot" -a "`csrutil status | grep enabled`"x == "x" ]; then - SUDO="${XBMC_DEPENDS_ROOT}/buildtools-native/bin/fakeroot" +if [ -f "${NATIVEPREFIX}/bin/fakeroot" -a "`csrutil status | grep enabled`"x == "x" ]; then + SUDO="${NATIVEPREFIX}/bin/fakeroot" elif [ -f "/usr/bin/sudo" ]; then SUDO="/usr/bin/sudo" fi -if [ -f "${XBMC_DEPENDS_ROOT}/buildtools-native/bin/dpkg-deb" ]; then +if [ -f "${NATIVEPREFIX}/bin/dpkg-deb" ]; then # make sure we pickup our tar, gnutar will fail when dpkg -i - bin_path=$(cd ${XBMC_DEPENDS_ROOT}/buildtools-native/bin; pwd) + bin_path=$(cd ${NATIVEPREFIX}/bin; pwd) export PATH=${bin_path}:${PATH} fi |