mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-05 22:20:24 -08:00
Code Issues Projects Releases Wiki Activity

Update Android port

Browse source 
* cross/Makefile.in (lib/gnulib.mk): Edit out
build-aux stuff.
* m4/ndk-build.m4: Also look for cross ranlib.
This commit is contained in:
Po Lu 2023-03-15 16:17:32 +08:00
parent 4e05371fd1
commit af7f0b6f9b
2 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cross/Makefile.in
View file

@ -96,9 +96,16 @@ lib-src/config.h: $(top_builddir)/src/config.h.android
$(AM_V_GEN) cp -f -p $(top_builddir)/src/config.h.android \ $(AM_V_GEN) cp -f -p $(top_builddir)/src/config.h.android \
lib-src/config.h lib-src/config.h
# Figure out where build-aux is.
# Then, replace the build-aux directory with its actual location,
# in case MKDIR_P points there.
relative_buildaux_dir := $(subst /,\/,$(top_srcdir)/build-aux)
lib/gnulib.mk: $(top_builddir)/lib/gnulib.mk.android lib/gnulib.mk: $(top_builddir)/lib/gnulib.mk.android
$(AM_V_GEN) \ $(AM_V_GEN) \
sed -e 's/^srcdir =.*$$/srcdir = $(subst /,\/,$(LIB_SRCDIR))/g' \ sed -e 's/^srcdir =.*$$/srcdir = $(subst /,\/,$(LIB_SRCDIR))/g' \
-e 's/$(relative_buildaux_dir)/$(subst /,\/,../$(top_builddir))\/build-aux/g' \
< $(top_builddir)/lib/gnulib.mk.android > $@ < $(top_builddir)/lib/gnulib.mk.android > $@
lib/Makefile: $(top_builddir)/lib/Makefile.android lib/Makefile: $(top_builddir)/lib/Makefile.android

14
m4/ndk-build.m4
View file

@ -228,10 +228,12 @@ ndk_subst_cc_onto_cxx () {
done done
} }
# Look for a suitable ar in the same directory as the C compiler. # Look for a suitable ar and ranlib in the same directory as the C
# compiler.
ndk_cc_firstword=`AS_ECHO(["$CC"]) | cut -d' ' -f1` ndk_cc_firstword=`AS_ECHO(["$CC"]) | cut -d' ' -f1`
ndk_where_cc=`which $ndk_cc_firstword` ndk_where_cc=`which $ndk_cc_firstword`
ndk_ar_search_path=$PATH ndk_ar_search_path=$PATH
ndk_ranlib_search_path=$RANLIB
# First, try to find $host_alias-ar in PATH. # First, try to find $host_alias-ar in PATH.
AC_PATH_PROGS([AR], [$host_alias-ar], [], [$ndk_ar_search_path]) AC_PATH_PROGS([AR], [$host_alias-ar], [], [$ndk_ar_search_path])
@ -242,6 +244,16 @@ AS_IF([test -z "$AR"],[
ndk_ar_search_path="`AS_DIRNAME([$ndk_where_cc])`:$ndk_ar_search_path" ndk_ar_search_path="`AS_DIRNAME([$ndk_where_cc])`:$ndk_ar_search_path"
AC_PATH_PROGS([AR], [$host_alias-ar llvm-ar], [], [$ndk_ar_search_path])]) AC_PATH_PROGS([AR], [$host_alias-ar llvm-ar], [], [$ndk_ar_search_path])])
# First, try to find $host_alias-ranlib in PATH.
AC_PATH_PROGS([RANLIB], [$host_alias-ranlib], [], [$ndk_ranlib_search_path])
AS_IF([test -z "$RANLIB"],[
# Next, try finding either that or llvm-ranlib in the directory
# holding CC.
ndk_ranlib_search_path="`AS_DIRNAME([$ndk_where_cc])`:$ndk_ranlib_search_path"
AC_PATH_PROGS([RANLIB], [$host_alias-ranlib llvm-ranlib], [],
[$ndk_ranlib_search_path])])
NDK_BUILD_NASM= NDK_BUILD_NASM=
# Next, try to find nasm on x86. This doesn't ship with the NDK. # Next, try to find nasm on x86. This doesn't ship with the NDK.