public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4268 from ftrvxmtrx/androidndk-fix-make-standalone-toolchain 

androidndk: fix make-standalone-toolchain.sh helper script
This commit is contained in:
Sander van der Burg 2014-09-26 17:44:12 +02:00
parent d1c7ac1388 ec1118cbb9
commit 261a3574f1
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/mobile/androidenv/androidndk.nix
View File

@ -22,6 +22,10 @@ stdenv.mkDerivation rec {
mkdir -pv $out mkdir -pv $out
tar xf $src tar xf $src
mv */* $out mv */* $out
# so that it doesn't fail because of read-only permissions set
patch -p1 -d $out < ${ ./make-standalone-toolchain.patch }
find $out \( \ find $out \( \
\( -type f -a -name "*.so*" \) -o \ \( -type f -a -name "*.so*" \) -o \
\( -type f -a -perm +0100 \) \ \( -type f -a -perm +0100 \) \

13
pkgs/development/mobile/androidenv/make-standalone-toolchain.patch Normal file
View File

@ -0,0 +1,13 @@
diff -ru android-ndk-r9d.old/build/tools/make-standalone-toolchain.sh android-ndk-r9d/build/tools/make-standalone-toolchain.sh
--- android-ndk-r9d.old/build/tools/make-standalone-toolchain.sh 2014-09-25 11:42:09.990500975 +0200
+++ android-ndk-r9d/build/tools/make-standalone-toolchain.sh 2014-09-25 11:43:06.097501636 +0200
@@ -252,6 +252,9 @@
# Now copy the GCC toolchain prebuilt binaries
run copy_directory "$TOOLCHAIN_PATH" "$TMPDIR"
+# Making it writable again
+chmod -R +w "$TMPDIR"
+
# Replace soft-link mcld by real file
ALL_LDS=`find $TMPDIR -name "*mcld"`
for LD in $ALL_LDS; do