firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-02-02 09:20:39 +01:00
Code Issues

Fixed cross build for android/arm 32-bit

Browse Source
This commit is contained in:
AlexPeshkoff 2018-02-08 20:21:48 +03:00
parent 2c30ddfab0
commit 9bb4ce764b
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builds/posix/Makefile.in
View File

@ -192,10 +192,10 @@ $(TOMMATH_LIB): $(TOM_Objs)
.PHONY: tomcrypt
TOMCRYPT_LIB=$(LIB)/libtomcrypt.a
TOM_Src:=hashes\md5.c hashes\sha1.c hashes\sha2\sha256.c hashes\sha2\sha512.c misc\crypt\crypt_argchk.c
TOM_Src:=$(addprefix ../extern/libtomcrypt/src, $(TOM_Src))
TOM_Src:=hashes/md5.c hashes/sha1.c hashes/sha2/sha256.c hashes/sha2/sha512.c misc/crypt/crypt_argchk.c
TOM_Src:=$(addprefix ../extern/libtomcrypt/src/, $(TOM_Src))
TOM_Objs=$(addprefix ../extern/libtomcrypt/,$(call doObjects,$(TOM_Src)))
TOM_Objs=$(call doObjects,$(TOM_Src))
tomcrypt: $(TOMCRYPT_LIB)
@ -547,7 +547,7 @@ udf_compat: $(UDF_BACKWARD_COMPATIBILITY) $(COMPAT_SQL)
$(UDF_BACKWARD_COMPATIBILITY): $(COMPAT_Objects)
$(LIB_LINK) $(LIB_LINK_OPTIONS) $(call LIB_LINK_SONAME,$(UDF_BACKWARD_COMPATIBILITY_BASENAME)) \
$(LINK_UDR_PLUGIN_SYMBOLS) $(LIB_PATH_OPTS) $(UNDEF_FLAGS) -o $@ $^ $(THR_LIBS)
$(LINK_UDR_PLUGIN_SYMBOLS) $(LIB_PATH_OPTS) $(UNDEF_FLAGS) -o $@ $^ $(THR_LIBS) $(UDR_SUPPORT_LIBS)
$(COMPAT_SQL): $(SRC_COMPAT_SQL)
cp $^ $@

1
builds/posix/make.android.arme
View File

@ -65,6 +65,7 @@ CROSS_CONFIG=android.arme
LDFLAGS += --sysroot=$(CROSS_PLATFORM) -L$(NDK)/sources/cxx-stl/gnu-libstdc++/$(NDK_TOOLCHAIN_VERSION)/libs/armeabi \
-L$(NDK)/sources/cxx-stl/gnu-libstdc++/libs/armeabi
DroidLibs := -lm -ldl -lsupc++ $(DECLIB)
UDR_SUPPORT_LIBS := -lgnustl_shared
LINK_LIBS = $(DroidLibs)
SO_LINK_LIBS = $(DroidLibs)

1
builds/posix/make.defaults
View File

@ -291,6 +291,7 @@ LINK_UDR_PLUGIN_SYMBOLS = $(call LIB_LINK_MAPFILE,$(UDR_PLUGIN_VERS))
LINK_EMPTY_SYMBOLS = $(call LIB_LINK_MAPFILE,$(EMPTY_VERS))
LINK_PLUGIN_SYMBOLS = $(call LIB_LINK_MAPFILE,$(PLUGIN_VERS))
LINK_EXEC_EXPORT=-rdynamic
UDR_SUPPORT_LIBS=
LIB_PLATFORM_RPATH = -Wl,-rpath,$(1)