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

ICU for Android: set rpath to '$ORIGIN', adjust build scripts, remove duplicated data file and save libname.major.minor.so libraries.

Browse Source
This commit is contained in:
Adriano dos Santos Fernandes 2023-02-04 13:55:05 -03:00
parent 543d59e720
commit f0d4e9caad
7 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extern/icu/android/aarch64/config.sh vendored
View File

@ -19,9 +19,9 @@
--with-cross-build=$CROSS_BUILD_DIR \ --with-cross-build=$CROSS_BUILD_DIR \
CFLAGS='-Os' \ CFLAGS='-Os' \
CXXFLAGS='--std=c++17' \ CXXFLAGS='--std=c++17' \
LDFLAGS='-static-libstdc++' \ LDFLAGS='-static-libstdc++ -Wl,-rpath=\$$ORIGIN' \
CC=aarch64-linux-android24-clang \ CC=aarch64-linux-android24-clang \
CXX=aarch64-linux-android24-clang++ \ CXX=aarch64-linux-android24-clang++ \
AR=aarch64-linux-android-ar \ AR=llvm-ar \
RANLIB=aarch64-linux-android-ranlib \ RANLIB=llvm-ranlib \
--with-data-packaging=archive --with-data-packaging=archive

10
extern/icu/android/armv7a/config.sh vendored
View File

@ -19,9 +19,9 @@
--with-cross-build=$CROSS_BUILD_DIR \ --with-cross-build=$CROSS_BUILD_DIR \
CFLAGS='-Os -march=armv7-a -mfloat-abi=softfp -mfpu=neon' \ CFLAGS='-Os -march=armv7-a -mfloat-abi=softfp -mfpu=neon' \
CXXFLAGS='--std=c++17 -march=armv7-a -mfloat-abi=softfp -mfpu=neon' \ CXXFLAGS='--std=c++17 -march=armv7-a -mfloat-abi=softfp -mfpu=neon' \
LDFLAGS='-static-libstdc++ -march=armv7-a -Wl,--fix-cortex-a8' \ LDFLAGS='-static-libstdc++ -march=armv7-a -Wl,--fix-cortex-a8 -Wl,-rpath=\$$ORIGIN' \
CC=arm-linux-androideabi-clang \ CC=armv7a-linux-androideabi24-clang \
CXX=arm-linux-androideabi-clang++ \ CXX=armv7a-linux-androideabi24-clang++ \
AR=arm-linux-androideabi-ar \ AR=llvm-ar \
RANLIB=arm-linux-androideabi-ranlib \ RANLIB=llvm-ranlib \
--with-data-packaging=archive --with-data-packaging=archive

2
extern/icu/android/i686/config.sh vendored
View File

@ -19,7 +19,7 @@
--with-cross-build=$CROSS_BUILD_DIR \ --with-cross-build=$CROSS_BUILD_DIR \
CFLAGS='-Os' \ CFLAGS='-Os' \
CXXFLAGS='--std=c++17' \ CXXFLAGS='--std=c++17' \
LDFLAGS='-static-libstdc++' \ LDFLAGS='-static-libstdc++ -Wl,-rpath=\$$ORIGIN' \
CC=i686-linux-android24-clang \ CC=i686-linux-android24-clang \
CXX=i686-linux-android24-clang++ \ CXX=i686-linux-android24-clang++ \
AR=llvm-ar \ AR=llvm-ar \

8
extern/icu/android/renameLibs.sh vendored Executable file
View File

@ -0,0 +1,8 @@
#!/bin/sh
MAJOR=63
MINOR=1
mv libicuuc.so.$MAJOR.$MINOR libicuuc.$MAJOR.$MINOR.so
mv libicudata.so.$MAJOR.$MINOR libicudata.$MAJOR.$MINOR.so
mv libicui18n.so.$MAJOR.$MINOR libicui18n.$MAJOR.$MINOR.so

6
extern/icu/android/renameLinks.sh vendored
View File

@ -1,6 +0,0 @@
MAJOR=63
MINOR=1
rm -f libicu*so
for i in libicu*.${MINOR}; do mv $i `basename $i .${MINOR}`; done
for i in libicu*.${MAJOR}; do ln -s $i `basename $i .${MAJOR}`; done

2
extern/icu/android/x86_64/config.sh vendored
View File

@ -19,7 +19,7 @@
--with-cross-build=$CROSS_BUILD_DIR \ --with-cross-build=$CROSS_BUILD_DIR \
CFLAGS='-Os' \ CFLAGS='-Os' \
CXXFLAGS='--std=c++17' \ CXXFLAGS='--std=c++17' \
LDFLAGS='-static-libstdc++' \ LDFLAGS='-static-libstdc++ -Wl,-rpath=\$$ORIGIN' \
CC=x86_64-linux-android24-clang \ CC=x86_64-linux-android24-clang \
CXX=x86_64-linux-android24-clang++ \ CXX=x86_64-linux-android24-clang++ \
AR=llvm-ar \ AR=llvm-ar \

BIN
extern/icu/icu_android.tar.xz vendored
View File

Binary file not shown.