skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Cross compile build fixes.

Browse Source
This commit is contained in:
Maarten Billemont 2019-09-26 10:50:22 -04:00
parent 61611e108c
commit 08a06639d0
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/bin/build_lib
View File

@ -169,7 +169,10 @@ _target_prepare() {
# --enable-pic --disable-pie to ensure the resulting library can be linked again. # --enable-pic --disable-pie to ensure the resulting library can be linked again.
target_configure() { _target_configure "$@"; } target_configure() { _target_configure "$@"; }
_target_configure() { _target_configure() {
local prefix=$1 platform=$2 arch=$3 host=$arch-$platform; shift 3 local prefix=$1 platform=$2 arch=$3; shift 3
local host=$arch build=
[[ -x build-aux/config.guess ]] && build=$(build-aux/config.guess)
case "$platform" in case "$platform" in
'windows') 'windows')
@ -180,15 +183,15 @@ _target_configure() {
set -- --with-sysroot="$SDKROOT/sysroot" "$@" set -- --with-sysroot="$SDKROOT/sysroot" "$@"
;; ;;
'ios') 'macos'|'ios')
[[ $arch = *arm* ]] && host=arm || host=$arch [[ $arch = *arm* ]] && host=arm
host+=-apple host+=-apple
set -- --disable-shared "$@" set -- --disable-shared "$@"
;; ;;
esac esac
./configure --build="$(./build-aux/config.guess)" ${host:+--host="$host"} --enable-pic --disable-pie --prefix="$prefix/$arch" "$@" ./configure ${build:+--build="$build"} ${host:+--host="$host"} --enable-pic --disable-pie --prefix="$prefix/$arch" "$@"
} }
# target_build <prefix> <platform> <arch> # target_build <prefix> <platform> <arch>
@ -305,7 +308,7 @@ _build() {
'ios') archs=( 'i386' 'x86_64' 'armv7' 'armv7s' 'arm64' ) ;; 'ios') archs=( 'i386' 'x86_64' 'armv7' 'armv7s' 'arm64' ) ;;
'android') archs=( 'arm' 'arm64' 'x86' 'x86_64' ) ;; 'android') archs=( 'arm' 'arm64' 'x86' 'x86_64' ) ;;
'windows') archs=( 'Win32' 'x64' ) ;; 'windows') archs=( 'Win32' 'x64' ) ;;
*) archs=( 'x86' 'x86_64' ) ;; *) archs=( 'i686' 'x86_64' ) ;;
esac esac
fi fi
@ -376,11 +379,11 @@ _build() {
;; ;;
*) *)
case "$arch" in case "$arch" in
x86) i686)
export CFLAGS="-m32" export CFLAGS="-m32 $CFLAGS" CXXFLAGS="-m32 $CXXFLAGS" LDFLAGS="-m32 $LDFLAGS"
;; ;;
x86_64) x86_64)
export CFLAGS="-m64" export CFLAGS="-m64 $CFLAGS" CXXFLAGS="-m64 $CXXFLAGS" LDFLAGS="-m64 $LDFLAGS"
;; ;;
esac esac
;; ;;

5
platform-independent/c/core/Dockerfile
View File

@ -3,6 +3,7 @@ FROM debian:stable-slim
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863199 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863199
RUN mkdir -p /usr/share/man/man1 RUN mkdir -p /usr/share/man/man1
RUN apt-get update && apt-get install -y default-jdk-headless git-core bash libtool automake autoconf make g++ RUN apt-get update && apt-get install -y default-jdk-headless git-core bash libtool automake autoconf make g++-multilib
RUN git clone --depth=3 $(: --shallow-submodules) --recurse-submodules --branch rewrite https://gitlab.com/MasterPassword/MasterPassword.git /mpw RUN git clone --depth=3 $(: --shallow-submodules) --recurse-submodules --branch rewrite https://gitlab.com/MasterPassword/MasterPassword.git /mpw
RUN cd /mpw && git log -1 && ./gradlew -i clean build RUN cd /mpw && ./gradlew -i clean
#RUN cd /mpw && git pull && git log -1 && ./gradlew -i check