diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-01-28 20:47:26 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-01-28 20:47:26 +0800 |
| commit | 22749d69e5892896f5ae9d26e7d6c43da67fa13d (patch) | |
| tree | 848c857ec4fafc07fe921eebaef8bbf3dd6b1cca /build-aux | |
| parent | 1ba1f277b6953f07b6449da6b7f074fb82f6f418 (diff) | |
| download | emacs-22749d69e5892896f5ae9d26e7d6c43da67fa13d.tar.gz | |
Add libtiff support to Android port
* INSTALL.android: Document how to build with libtiff.
* build-aux/ndk-build-helper-1.mk (NDK_SO_NAME):
* build-aux/ndk-build-helper-2.mk (NDK_A_NAME):
* build-aux/ndk-build-helper-4.mk: Decrease number of duplicate
dependencies found.
* configure.ac (ANDROID_SDK_18_OR_EARLIER, XCONFIGURE, PNG_CFLAGS)
(HAVE_TIFF): Allow using libtiff on Android.
* cross/ndk-build/ndk-clear-vars.mk: Undefine additional
variables.
* cross/ndk-build/ndk-resolve.mk: Split CFLAGS resolution from
a-name resolution, and do not recursively add archive or shared
object names for dependencies of shared libraries.
* src/Makefile.in (TIFF_CFLAGS): New variable.
(EMACS_CFLAGS): Use it.
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/ndk-build-helper-1.mk | 2 | ||||
| -rw-r--r-- | build-aux/ndk-build-helper-2.mk | 2 | ||||
| -rw-r--r-- | build-aux/ndk-build-helper-4.mk | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/build-aux/ndk-build-helper-1.mk b/build-aux/ndk-build-helper-1.mk index 50def5f1c2d..898edf3a137 100644 --- a/build-aux/ndk-build-helper-1.mk +++ b/build-aux/ndk-build-helper-1.mk @@ -59,7 +59,7 @@ else NDK_SO_NAME = lib$(1)_emacs.so endif -ifeq ($$(NDK_SO_NAMES:$$(NDK_SO_NAME)=),$$(NDK_SO_NAMES)) +ifeq ($$(findstring $$(NDK_SO_NAME),$$(NDK_SO_NAMES)),) NDK_SO_NAMES := $$(NDK_SO_NAMES) $$(NDK_SO_NAME) # Now recurse over this module's dependencies. diff --git a/build-aux/ndk-build-helper-2.mk b/build-aux/ndk-build-helper-2.mk index 3722437c53e..6be7f268fe7 100644 --- a/build-aux/ndk-build-helper-2.mk +++ b/build-aux/ndk-build-helper-2.mk @@ -48,7 +48,7 @@ else NDK_A_NAME = lib$(1).a endif -ifeq ($$(NDK_A_NAMES:$$(NDK_A_NAME)=),$$(NDK_A_NAMES)) +ifeq ($$(findstring $$(NDK_A_NAME),$$(NDK_A_NAMES)),) NDK_A_NAMES := $$(NDK_A_NAMES) $$(NDK_A_NAME) # Now recurse over this module's dependencies. diff --git a/build-aux/ndk-build-helper-4.mk b/build-aux/ndk-build-helper-4.mk index e1024f0a243..a41679c53af 100644 --- a/build-aux/ndk-build-helper-4.mk +++ b/build-aux/ndk-build-helper-4.mk @@ -34,5 +34,6 @@ undefine LOCAL_DISABLE_FORMAT_STRING_CHECKS undefine LOCAL_EXPORT_CFLAGS undefine LOCAL_EXPORT_CPPFLAGS undefine LOCAL_EXPORT_C_INCLUDES +undefine LOCAL_EXPORT_C_INCLUDE_DIRS undefine LOCAL_EXPORT_LDFLAGS undefine LOCAL_EXPORT_LDLIBS |