clang: Depend on ndk-stl and remove triplet mess

[termux-packages] / README.md

diff --git a/README.md b/README.md
index af9267f..971d589 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,14 +1,21 @@
-termux-packages
+Termux packages
 ===============
+[![Join the chat at https://gitter.im/termux/termux](https://badges.gitter.im/termux/termux.svg)](https://gitter.im/termux/termux)
+
 This project contains scripts and patches to cross compile and package packages for
 the [Termux](http://termux.com/) Android application.
 
+The scripts and patches to build each package is licensed under the same license as
+the actual package (so the patches and scripts to build bash are licensed under
+the same license as bash, while the patches and scripts to build python are licensed
+under the same license as python, etc).
+
 NOTE: This is in a rough state - be prepared for some work and frustrations, and give
 feedback if you find incorrect our outdated things!
 
 Initial setup
 =============
-Building packages are for now only tested to work on Ubuntu 15.04. Perform the following
+Building packages are for now only tested to work on Ubuntu 15.10. Perform the following
 setup steps:
 
 * Run `ubuntu-setup.sh` to install required packages and setup the `/data/` folder (see below).
@@ -16,9 +23,20 @@ setup steps:
 * Install the Android SDK at `$HOME/lib/android-sdk`. Override this by setting the environment
 variable `$ANDROID_HOME` to point at another location.
 
-* Install the Android NDK, version r10e, at `$HOME/lib/android-ndk`. Override this by setting
+* Install the Android NDK, version r11, at `$HOME/lib/android-ndk`. Override this by setting
 the environment variable `$NDK` to point at another location.
 
+Alternatively a Dockerfile is provided which sets up a pristine image
+suitable for building packages. To build the docker image, run the
+following command:
+
+    docker build --rm=true -t termux .
+
+After build is successful, you can open an interactive prompt inside the
+container using:
+
+    docker run --rm=true -ti termux /bin/bash
+
 
 Building a package
 ==================
@@ -93,11 +111,6 @@ contains these and may be used by all packages.
 
 * glob(3) system function (glob.h) - not in bionic, but use the `libandroid-glob` package
 
-* undefined reference to 'rpl_malloc' and/or 'rpl_realloc': These functions are added by some autoconf setups
-  when it fails to detect 0-safe malloc and realloc during cross-compilating. Avoided by defining
-  "ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes".
-  See http://wiki.buici.com/xwiki/bin/view/Programing+C+and+C%2B%2B/Autoconf+and+RPL_MALLOC
-
 * cmake and cross compiling: http://www.cmake.org/Wiki/CMake_Cross_Compiling
   CMAKE_FIND_ROOT_PATH=$TERMUX_PREFIX to search there.
   CMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY and
@@ -112,16 +125,17 @@ contains these and may be used by all packages.
 
 dlopen() and RTLD_* flags
 =================================
-<dlfn.h> declares
+<dlfcn.h> originally declares
 
     enum { RTLD_NOW=0, RTLD_LAZY=1, RTLD_LOCAL=0, RTLD_GLOBAL=2,       RTLD_NOLOAD=4}; // 32-bit
     enum { RTLD_NOW=2, RTLD_LAZY=1, RTLD_LOCAL=0, RTLD_GLOBAL=0x00100, RTLD_NOLOAD=4}; // 64-bit
 
 These differs from glibc ones in that
 
-1. They are not preprocessor #define:s so cannot be checked for with #ifdef RTLD_GLOBAL (dln.c in ruby does this)
+1. They are not preprocessor #define:s so cannot be checked for with `#ifdef RTLD_GLOBAL`. Termux patches this to
+   #define values for compatibility with several packages.
 2. They differ in value from glibc ones, so cannot be hardcoded in files (DLFCN.py in python does this)
-3. They are missing some values (RTLD_BINDING_MASK, RTLD_NOLOAD, ...)
+3. They are missing some values (`RTLD_BINDING_MASK`, `RTLD_NOLOAD`, ...)
 
 
 RPATH, LD_LIBRARY_PATH AND RUNPATH
@@ -145,35 +159,3 @@ These may come from version scripts in a Makefile such as:
 
     -Wl,--version-script=$(top_srcdir)/proc/libprocps.sym
 The termux-elf-cleaner utilty is run from build-package.sh and should normally take care of that problem.
-
-Obtaining shell access on an emulator
-=====================================
-First install and start sshd on device:
-
-    apt install openssh
-    sshd
-Then follow the below steps:
-
-    # Find out the linux user for the package to use in the chown command later:
-    adb shell dumpsys package com.termux | grep userId=
-    # Push your public ssh key:
-    adb push $HOME/.ssh/id_dsa.pub /data/data/com.termux/files/home/.ssh/authorized_keys
-    # Use the linux user for the package, 10053 below, to set ownerhip and permissions:
-    adb shell chown -R 10053 /data/data/com.termux/files/home/.ssh/
-    adb shell chmod -R 0700 /data/data/com.termux/files/home/.ssh/
-    # Forward port 8022 to the emulator:
-    adb forward tcp:8022 tcp:8022
-    # Finally connect with ssh:
-    ssh -p 8022 localhost
-
-Bootstrapping on device
-=======================
-To get files on device one option is:
-
-    udpsvd -vE 0.0.0.0 8069 tftpd -c . # Run on device. -c arg to allow file uploading
-    printf "mode binary\nput out.md\nquit" | tftp 192.168.0.12 8069 # on computer
-Another is with ftp:
-
-    tcpsvd -vE 0.0.0.0 8021 ftpd -w . # Run on device. -w arg to allow file uploading
-    printf "put tmp.c\nquit" | ftp -n 192.168.0.12 8021 # Run on computer. -n arg to use anonymous login
-NOTE: The ftpd and tftpd programs has been patched to run without chroot. This means that the directory serving is only the starting point and clients may cd out of if the access the whole system!