ldc: Update from 1.7 to 1.8
This commit is contained in:
Joakim
Fredrik Fornwall
parent
4e1c3548d5
commit
2e1127e646
|
|
@ -1,9 +1,9 @@
|
|||
TERMUX_PKG_HOMEPAGE=https://github.com/ldc-developers/ldc
|
||||
TERMUX_PKG_DESCRIPTION="D programming language compiler, built with LLVM"
|
||||
_PKG_MAJOR_VERSION=1.7
|
||||
_PKG_MAJOR_VERSION=1.8
|
||||
TERMUX_PKG_VERSION=${_PKG_MAJOR_VERSION}.0
|
||||
TERMUX_PKG_SRCURL=https://github.com/ldc-developers/ldc/releases/download/v${TERMUX_PKG_VERSION}/ldc-${TERMUX_PKG_VERSION}-src.tar.gz
|
||||
TERMUX_PKG_SHA256=7cd46140ca3e4ca0d52c352e5b694d4d5336898ed4f02c3e18e0eafd69dd18bd
|
||||
TERMUX_PKG_SHA256=e421a1f4bbf97d173bd277125794862ca5b6a09409586b806cec23b922955c7f
|
||||
TERMUX_PKG_DEPENDS="clang"
|
||||
TERMUX_PKG_HOSTBUILD=true
|
||||
TERMUX_PKG_BLACKLISTED_ARCHES="aarch64,i686,x86_64"
|
||||
|
|
@ -30,33 +30,29 @@ termux_step_post_extract_package () {
|
|||
tar xf $TERMUX_PKG_CACHEDIR/llvm-${LLVM_SRC_VERSION}.src.tar.xz
|
||||
mv llvm-${LLVM_SRC_VERSION}.src llvm
|
||||
|
||||
DMD_COMPILER_VERSION=2.078.0
|
||||
termux_download \
|
||||
http://downloads.dlang.org/releases/2.x/${DMD_COMPILER_VERSION}/dmd.${DMD_COMPILER_VERSION}.linux.tar.xz \
|
||||
$TERMUX_PKG_CACHEDIR/dmd.${DMD_COMPILER_VERSION}.linux.tar.xz \
|
||||
651a6bf34bd23b893b8cb38a5b7783275145c047eef83c526730ba9394123c64
|
||||
https://github.com/ldc-developers/ldc/releases/download/v${TERMUX_PKG_VERSION}/ldc2-${TERMUX_PKG_VERSION}-linux-x86_64.tar.xz \
|
||||
$TERMUX_PKG_CACHEDIR/ldc2-${TERMUX_PKG_VERSION}-linux-x86_64.tar.xz \
|
||||
81486dba1788be70a0e5dbf482d7e023aefb6389e049abebb94ee9686e04fee6
|
||||
|
||||
local DMD_COMPILER_VERSION=2.079.0
|
||||
termux_download \
|
||||
https://github.com/dlang/tools/archive/v${DMD_COMPILER_VERSION}.tar.gz \
|
||||
$TERMUX_PKG_CACHEDIR/tools-v${DMD_COMPILER_VERSION}.tar.gz \
|
||||
5d3de1524bb1a024649a065e2567893c88cc4dba17ae9bd6f576e11bc91533ec
|
||||
84598250c08ce1bdb9836a652c8ae09d8a5c429e60466b64df6c28fc9a24e684
|
||||
|
||||
tar xf $TERMUX_PKG_CACHEDIR/tools-v${DMD_COMPILER_VERSION}.tar.gz
|
||||
mv tools-${DMD_COMPILER_VERSION} rdmd
|
||||
|
||||
local DUB_VERSION=1.7.0
|
||||
local DUB_VERSION=1.8.0
|
||||
termux_download \
|
||||
https://github.com/dlang/dub/archive/v${DUB_VERSION}.tar.gz \
|
||||
$TERMUX_PKG_CACHEDIR/dub-v${DUB_VERSION}.tar.gz \
|
||||
5c4875cf4ced113d35f1da949524a2b366dff93049dffe98da95171bed6cd069
|
||||
acffbdee967a20aba2c08d2a9de6a8b23b8fb5a703eece684781758db2831d50
|
||||
|
||||
tar xf $TERMUX_PKG_CACHEDIR/dub-v${DUB_VERSION}.tar.gz
|
||||
mv dub-${DUB_VERSION} dub
|
||||
|
||||
sed "s#\@TERMUX_C_COMPILER\@#$TERMUX_STANDALONE_TOOLCHAIN/bin/$TERMUX_HOST_PLATFORM-clang#" \
|
||||
$TERMUX_PKG_BUILDER_DIR/ldc-config-stdlib.patch.beforehostbuild.in > \
|
||||
$TERMUX_PKG_BUILDER_DIR/ldc-config-stdlib.patch.beforehostbuild
|
||||
|
||||
sed "s#\@TERMUX_PKG_HOSTBUILD\@#$TERMUX_PKG_HOSTBUILD_DIR#" $TERMUX_PKG_BUILDER_DIR/ldc-linker-flags.patch.in > \
|
||||
$TERMUX_PKG_BUILDER_DIR/ldc-linker-flags.patch
|
||||
|
||||
|
|
@ -71,33 +67,24 @@ termux_step_post_extract_package () {
|
|||
}
|
||||
|
||||
termux_step_host_build () {
|
||||
tar xf $TERMUX_PKG_CACHEDIR/dmd.${DMD_COMPILER_VERSION}.linux.tar.xz
|
||||
tar xf $TERMUX_PKG_CACHEDIR/ldc2-${TERMUX_PKG_VERSION}-linux-x86_64.tar.xz
|
||||
mv ldc2-${TERMUX_PKG_VERSION}-linux-x86_64 ldc-bootstrap
|
||||
|
||||
termux_setup_cmake
|
||||
termux_setup_ninja
|
||||
cmake -GNinja $TERMUX_PKG_SRCDIR/llvm \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DLLVM_TARGETS_TO_BUILD="ARM;X86" \
|
||||
-DLLVM_DEFAULT_TARGET_TRIPLE=armv7-none-linux-android \
|
||||
-DLLVM_BUILD_TOOLS=OFF \
|
||||
-DLLVM_BUILD_UTILS=OFF
|
||||
ninja -j $TERMUX_MAKE_PROCESSES all llvm-config
|
||||
ninja -j $TERMUX_MAKE_PROCESSES llvm-tblgen
|
||||
|
||||
mkdir ldc-bootstrap
|
||||
cd ldc-bootstrap
|
||||
export DMD="$TERMUX_PKG_HOSTBUILD_DIR/dmd2/linux/bin64/dmd"
|
||||
|
||||
cmake -GNinja $TERMUX_PKG_SRCDIR \
|
||||
-DD_FLAGS="-w;-mcpu=cortex-a8" \
|
||||
-DRT_CFLAGS="-march=armv7-a -mfpu=neon -mfloat-abi=softfp -mthumb -Os -I$TERMUX_PREFIX/include" \
|
||||
-DLLVM_CONFIG="$TERMUX_PKG_HOSTBUILD_DIR/bin/llvm-config"
|
||||
ninja -j $TERMUX_MAKE_PROCESSES druntime-ldc phobos2-ldc \
|
||||
druntime-ldc-debug phobos2-ldc-debug ldmd2
|
||||
cd ..
|
||||
CC="$TERMUX_STANDALONE_TOOLCHAIN/bin/$TERMUX_HOST_PLATFORM-clang" \
|
||||
./ldc-bootstrap/bin/ldc-build-runtime --ninja -j $TERMUX_MAKE_PROCESSES \
|
||||
--dFlags="-mtriple=armv7-none-linux-android;-w;-mcpu=cortex-a8" \
|
||||
--cFlags="-march=armv7-a -mfpu=neon -mfloat-abi=softfp -mthumb -Os -I$TERMUX_PREFIX/include" \
|
||||
--targetSystem="Android;Linux;UNIX" --ldcSrcDir="$TERMUX_PKG_SRCDIR"
|
||||
}
|
||||
|
||||
termux_step_pre_configure () {
|
||||
rm $TERMUX_PKG_BUILDER_DIR/ldc-config-stdlib.patch.beforehostbuild
|
||||
rm $TERMUX_PKG_BUILDER_DIR/ldc-linker-flags.patch
|
||||
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DLLVM_DEFAULT_TARGET_TRIPLE=armv7a-linux-androideabi"
|
||||
|
|
@ -123,6 +110,7 @@ termux_step_post_configure () {
|
|||
mv llvm-config llvm/bin
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DLLVM_CONFIG=$TERMUX_PKG_BUILDDIR/llvm/bin/llvm-config"
|
||||
export DMD="$TERMUX_PKG_HOSTBUILD_DIR/ldc-bootstrap/bin/ldmd2"
|
||||
export DFLAGS="-mtriple=armv7-none-linux-android -mcpu=cortex-a8"
|
||||
termux_step_configure_cmake
|
||||
}
|
||||
|
||||
|
|
@ -138,9 +126,9 @@ termux_step_make () {
|
|||
fi
|
||||
|
||||
# Build the rdmd scripting wrapper and the dub package manager
|
||||
D_FLAGS="-w -de -O -mcpu=cortex-a8"
|
||||
D_FLAGS="-w -de -O"
|
||||
$DMD $D_FLAGS -c $TERMUX_PKG_SRCDIR/rdmd/rdmd.d -of=$TERMUX_PKG_BUILDDIR/bin/rdmd.o
|
||||
D_LDFLAGS="-fuse-ld=bfd -L${TERMUX_PKG_HOSTBUILD_DIR}/ldc-bootstrap/lib -lphobos2-ldc -ldruntime-ldc -Wl,--gc-sections -ldl -lm -Wl,--fix-cortex-a8 -fPIE -pie -Wl,-z,nocopyreloc ${LDFLAGS}"
|
||||
D_LDFLAGS="-fuse-ld=bfd -L${TERMUX_PKG_HOSTBUILD_DIR}/ldc-build-runtime.tmp/lib -lphobos2-ldc -ldruntime-ldc -Wl,--gc-sections -ldl -lm -Wl,--fix-cortex-a8 -fPIE -pie -Wl,-z,nocopyreloc ${LDFLAGS}"
|
||||
$CC $TERMUX_PKG_BUILDDIR/bin/rdmd.o $D_LDFLAGS -o $TERMUX_PKG_BUILDDIR/bin/rdmd
|
||||
|
||||
cd $TERMUX_PKG_SRCDIR/dub
|
||||
|
|
@ -151,9 +139,8 @@ termux_step_make () {
|
|||
|
||||
termux_step_make_install () {
|
||||
cp bin/{dub,ldc-build-runtime,ldc2,ldmd2,rdmd} $TERMUX_PREFIX/bin
|
||||
cp $TERMUX_PKG_HOSTBUILD_DIR/ldc-bootstrap/lib/lib{druntime,phobos2}*.a $TERMUX_PREFIX/lib
|
||||
cp $TERMUX_PKG_HOSTBUILD_DIR/ldc-build-runtime.tmp/lib/lib{druntime,phobos2}*.a $TERMUX_PREFIX/lib
|
||||
sed -i "/runtime\/druntime\/src/d" bin/ldc2.conf
|
||||
sed -i "/runtime\/profile-rt\/d/d" bin/ldc2.conf
|
||||
sed -i "/runtime\/jit-rt\/d/d" bin/ldc2.conf
|
||||
sed -i "s|$TERMUX_PKG_SRCDIR/runtime/phobos|%%ldcbinarypath%%/../include/d|" bin/ldc2.conf
|
||||
sed "s|$TERMUX_PKG_BUILDDIR/lib|%%ldcbinarypath%%/../lib|" bin/ldc2.conf > $TERMUX_PREFIX/etc/ldc2.conf
|
||||
|
|
@ -161,7 +148,7 @@ termux_step_make_install () {
|
|||
rm -Rf $TERMUX_PREFIX/include/d
|
||||
mkdir $TERMUX_PREFIX/include/d
|
||||
cp -r $TERMUX_PKG_SRCDIR/runtime/druntime/src/{core,etc,ldc,object.d} $TERMUX_PREFIX/include/d
|
||||
cp $TERMUX_PKG_HOSTBUILD_DIR/ldc-bootstrap/runtime/gccbuiltins_arm.di $TERMUX_PREFIX/include/d/ldc
|
||||
cp $TERMUX_PKG_HOSTBUILD_DIR/ldc-bootstrap/import/ldc/gccbuiltins_arm.di $TERMUX_PREFIX/include/d/ldc
|
||||
cp -r $TERMUX_PKG_SRCDIR/runtime/phobos/etc/c $TERMUX_PREFIX/include/d/etc
|
||||
rm -Rf $TERMUX_PREFIX/include/d/etc/c/zlib
|
||||
find $TERMUX_PKG_SRCDIR/runtime/phobos/std -name "*.orig" -delete
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
|
||||
index 32795da6..091d344b 100644
|
||||
--- a/runtime/CMakeLists.txt
|
||||
+++ b/runtime/CMakeLists.txt
|
||||
@@ -551,6 +551,9 @@ include(profile-rt/DefineBuildProfileRT.cmake)
|
||||
#
|
||||
# Set up build and install targets
|
||||
#
|
||||
+
|
||||
+set(CMAKE_C_COMPILER @TERMUX_C_COMPILER@)
|
||||
+set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER})
|
||||
|
||||
if(MULTILIB AND "${TARGET_SYSTEM}" MATCHES "APPLE")
|
||||
# On OS X, build "fat" libraries containing code for both architectures.
|
||||
|
|
@ -8,7 +8,7 @@ index 336bbdbc..4b9e8c88 100644
|
|||
|
||||
- include(ExtractDMDSystemLinker)
|
||||
+ #include(ExtractDMDSystemLinker)
|
||||
+ set(D_LINKER_ARGS "-fuse-ld=bfd;-L@TERMUX_PKG_HOSTBUILD@/ldc-bootstrap/lib;-lphobos2-ldc;-ldruntime-ldc;-Wl,--gc-sections")
|
||||
+ set(D_LINKER_ARGS "-fuse-ld=bfd;-L@TERMUX_PKG_HOSTBUILD@/ldc-build-runtime.tmp/lib;-lphobos2-ldc;-ldruntime-ldc;-Wl,--gc-sections")
|
||||
message(STATUS "Host D compiler linker program: ${D_LINKER_COMMAND}")
|
||||
message(STATUS "Host D compiler linker flags: ${D_LINKER_ARGS}")
|
||||
list(APPEND LDC_LINKERFLAG_LIST ${D_LINKER_ARGS})
|
||||
|
|
|
|||
Loading…
Reference in New Issue