The device/emulator distributions include now only the shared libraries from the external libraries

xdegaye · xdegaye · commit 3161893d9335 · 2017-08-09T19:45:25.000+02:00
diff --git a/Android/README.rst b/Android/README.rst
@@ -159,9 +159,8 @@ Build and run on termux
 
 4. Run the Python interpreter on termux::
 
+     $ export TERM=linux; export TERMINFO=$HOME/../usr/lib/terminfo
      $ export SYS_EXEC_PREFIX=/data/data/com.termux/files/usr/local
-     $ export TERM=linux
-     $ export TERMINFO=$SYS_EXEC_PREFIX/share/terminfo
      $ LD_LIBRARY_PATH=$SYS_EXEC_PREFIX/lib:$LD_LIBRARY_PATH $SYS_EXEC_PREFIX/bin/python3
 
 Requirements
@@ -316,10 +315,10 @@ Common Makefile targets
 
 *distclean*
     Make things clean, before making a distribution. This also removes the
-    ``PY_DESTDIR`` directory where the external libraries have been installed
+    DESTDIR directory where the external libraries have been copied
     and where the cross-compiled Python has been installed by the command ``make
-    DESTDIR=$(PY_DESTDIR) install`` run on Python own Makefile. As a side effect
-    the external libraries will be rebuilt on the next make invocation.
+    DESTDIR=$(PY_DESTDIR) install`` run on Python own Makefile. The external
+    libraries will not be rebuilt on the next make invocation.
 
 *clean*
     Remove everything for the given (api, architecture) except the AVD.
diff --git a/Android/build.mk b/Android/build.mk
@@ -8,7 +8,8 @@ native_build_dir := $(BUILD_DIR)/python-native
 py_name := python$(py_version)
 export BUILD_TYPE := android-$(ANDROID_API)-$(ANDROID_ARCH)
 py_host_dir := $(BUILD_DIR)/$(py_name)-$(BUILD_TYPE)
-export PY_DESTDIR := $(BUILD_DIR)/$(py_name)-install-$(BUILD_TYPE)
+export PY_EXTDIR := $(BUILD_DIR)/$(py_name)-extlibs-$(BUILD_TYPE)
+PY_DESTDIR := $(BUILD_DIR)/$(py_name)-install-$(BUILD_TYPE)
 abiflags = $(shell echo $$(cat $(py_host_dir)/Makefile | \
     sed -e "s/^ABIFLAGS[= \t]*\(.*\)[ \t]*$$\|^.*$$/\1/" -e "/^$$/d"))
 py_fullname = python$(py_version)$(abiflags)
@@ -59,8 +60,8 @@ native_python: $(native_build_dir)/config.status $(native_build_dir)/Modules/Set
 	$(MAKE) -C $(native_build_dir)
 
 # Target-specific exported variables.
-$(config_status):           export CPPFLAGS := -I$(PY_DESTDIR)/$(SYS_EXEC_PREFIX)/include
-$(config_status):           export LDFLAGS := -L$(PY_DESTDIR)/$(SYS_EXEC_PREFIX)/lib
+$(config_status):           export CPPFLAGS := -I$(PY_EXTDIR)/$(SYS_EXEC_PREFIX)/include
+$(config_status):           export LDFLAGS := -L$(PY_EXTDIR)/$(SYS_EXEC_PREFIX)/lib
 build configure host python_dist: \
                             export PATH := $(native_build_dir):$(PATH)
 external_libraries:         export CC := $(CC)
@@ -118,6 +119,8 @@ host:
 python_dist: $(python)
 	@echo "---> Install Python for $(BUILD_TYPE)."
 	$(MAKE) DESTDIR=$(PY_DESTDIR) -C $(py_host_dir) install
+	cp --no-dereference $(PY_EXTDIR)/$(SYS_EXEC_PREFIX)/lib/*.so* $(PY_DESTDIR)/$(SYS_EXEC_PREFIX)/lib
+	chmod u+w $(PY_DESTDIR)/$(SYS_EXEC_PREFIX)/lib/*.so*
 ifdef DEVICE_PREFIXES
 	# This won't be needed anymore when issue 31046 is fixed.
 	rm -rf $(PY_DESTDIR)/usr
@@ -184,6 +187,7 @@ clean: distclean
 	rm -rf $(py_host_dir)
 	rm -rf $(BUILD_DIR)/external-libraries/*-$(BUILD_TYPE)
 	-rmdir $(BUILD_DIR)/external-libraries
+	rm -rf $(PY_EXTDIR)
 	-rmdir $(BUILD_DIR)
 	-rmdir $(avd_dir)
 	rm -rf $(DIST_DIR)/gdb/android-$(ANDROID_API)-$(ANDROID_ARCH)
diff --git a/Android/external-libraries/Makefile b/Android/external-libraries/Makefile
@@ -6,7 +6,7 @@ SQLITE := sqlite3
 SQLITE_FNAME := sqlite-autoconf-3080803
 LIBFFI := libffi-3.2.1
 BUILD_DIR := $(BUILD_DIR)/external-libraries
-py_install_dir := $(PY_DESTDIR)/$(SYS_EXEC_PREFIX)
+py_install_dir := $(PY_EXTDIR)/$(SYS_EXEC_PREFIX)
 
 all: $(py_install_dir)/lib/libncursesw.a $(py_install_dir)/lib/libreadline.a \
         $(py_install_dir)/lib/libsqlite3.a $(py_install_dir)/lib/libffi.a
diff --git a/Android/external-libraries/Makefile.openssl b/Android/external-libraries/Makefile.openssl
@@ -14,7 +14,7 @@ export HOSTCC := gcc
 export CROSS_COMPILE := $(ANDROID_HOST)-
 
 BUILD_DIR := $(BUILD_DIR)/external-libraries
-py_install_dir := $(PY_DESTDIR)/$(SYS_EXEC_PREFIX)
+py_install_dir := $(PY_EXTDIR)/$(SYS_EXEC_PREFIX)
 BUILD_OPENSSL := $(py_install_dir)/lib/libcrypto.so
 ifeq ($(ANDROID_ARCH), x86)
     export MACHINE := i686
