X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/c2d4c0a9c3d27d8366111caa92b87a6a4e6ad5cb..988e9ce477cd1e23845dbf56b58eb79604e19c40:/README.md

diff --git a/README.md b/README.md
index 06128267..a750b173 100644
--- 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