~mdw / termux-packages / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ldc: Update from 1.7 to 1.8
[termux-packages] / packages / ldc / build.sh
diff --git a/packages/ldc/build.sh b/packages/ldc/build.sh
index 0346f84..b249901 100644 (file)
--- a/packages/ldc/build.sh
+++ b/packages/ldc/build.sh
@@ -1,10 +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.3
+_PKG_MAJOR_VERSION=1.8
 TERMUX_PKG_VERSION=${_PKG_MAJOR_VERSION}.0
-TERMUX_PKG_REVISION=1
 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=efe31a639bcb44e1f5b752da21713376d9410a01279fecc8aab8572065a3050b
+TERMUX_PKG_SHA256=e421a1f4bbf97d173bd277125794862ca5b6a09409586b806cec23b922955c7f
 TERMUX_PKG_DEPENDS="clang"
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_BLACKLISTED_ARCHES="aarch64,i686,x86_64"
@@ -14,82 +13,79 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DLLVM_ENABLE_PIC=ON
 -DLLVM_BUILD_TOOLS=OFF
 -DLLVM_BUILD_UTILS=OFF
--DLLVM_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/llvm-tblgen"
+-DLLVM_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/llvm-tblgen
+-DPYTHON_EXECUTABLE=`which python`
+"
 TERMUX_PKG_KEEP_STATIC_LIBRARIES=true
 TERMUX_PKG_NO_DEVELSPLIT=yes
 TERMUX_PKG_MAINTAINER="Joakim @joakim-noah"
 
 termux_step_post_extract_package () {
-       local LLVM_SRC_VERSION=4.0.1
+       local LLVM_SRC_VERSION=5.0.1
        termux_download \
                https://github.com/ldc-developers/llvm/releases/download/ldc-v${LLVM_SRC_VERSION}/llvm-${LLVM_SRC_VERSION}.src.tar.xz \
                $TERMUX_PKG_CACHEDIR/llvm-${LLVM_SRC_VERSION}.src.tar.xz \
-               53dee2054a4da0a292fc55830119ae167812cc0eed5cc670223adc5a8731f71b
+               aa54870d2d4ab0066f8e26fe6880ec037565b0350d67bef55d0ac2018bfb1a45
 
        tar xf $TERMUX_PKG_CACHEDIR/llvm-${LLVM_SRC_VERSION}.src.tar.xz
        mv llvm-${LLVM_SRC_VERSION}.src llvm
 
-       DMD_COMPILER_VERSION=2.076.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 \
-               3e3fc9fbdc61681edea837e9d095a341dda6c325ab4dbc437017239d576ba433
+               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 \
-               5f58dc6492e1abb539291a5fbf2bfb06eed818bd158912f090b55cd712c2a34a
+               84598250c08ce1bdb9836a652c8ae09d8a5c429e60466b64df6c28fc9a24e684
 
        tar xf $TERMUX_PKG_CACHEDIR/tools-v${DMD_COMPILER_VERSION}.tar.gz
        mv tools-${DMD_COMPILER_VERSION} rdmd
 
-       local DUB_VERSION=1.5.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 \
-               3509f959cc5b34e44adaae586b62ded387ac10031f6c1aaf1cfbb4aae5af37dd
+               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 -i "s#\@TERMUX_C_FLAGS\@#-march=armv7-a -mfpu=neon -mfloat-abi=softfp -mthumb -Os -I$TERMUX_PREFIX/include#" \
-               $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
-       sed "s#\@TERMUX_PKG_BUILD\@#$TERMUX_PKG_BUILDDIR#" $TERMUX_PKG_BUILDER_DIR/ldc-llvm-config.patch.in > \
-               $TERMUX_PKG_BUILDER_DIR/ldc-llvm-config.patch
-       sed -i "s#\@TERMUX_PKG_SRC\@#$TERMUX_PKG_SRCDIR#" $TERMUX_PKG_BUILDER_DIR/ldc-llvm-config.patch
+
+       sed $TERMUX_PKG_BUILDER_DIR/llvm-config.in \
+               -e "s|@LLVM_VERSION@|$LLVM_SRC_VERSION|g" \
+               -e "s|@LLVM_BUILD_DIR@|$TERMUX_PKG_BUILDDIR/llvm|g" \
+               -e "s|@TERMUX_PKG_SRCDIR@|$TERMUX_PKG_SRCDIR|g" \
+               -e "s|@LLVM_TARGETS@|ARM AArch64 X86|g" \
+               -e "s|@LLVM_DEFAULT_TARGET_TRIPLE@|armv7-none-linux-android|g" \
+               -e "s|@TERMUX_ARCH@|$TERMUX_ARCH|g" > $TERMUX_PKG_BUILDDIR/llvm-config
+       chmod 755 $TERMUX_PKG_BUILDDIR/llvm-config
 }
 
 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
-       cmake -G "Unix Makefiles" $TERMUX_PKG_SRCDIR/llvm \
-               -DCMAKE_BUILD_TYPE=Release \
-               -DLLVM_TARGETS_TO_BUILD=ARM \
-               -DLLVM_DEFAULT_TARGET_TRIPLE=armv7-none-linux-android \
+       termux_setup_ninja
+       cmake -GNinja $TERMUX_PKG_SRCDIR/llvm \
                -DLLVM_BUILD_TOOLS=OFF \
                -DLLVM_BUILD_UTILS=OFF
-       make -j $TERMUX_MAKE_PROCESSES all llvm-config
-
-       mkdir ldc-bootstrap
-       cd ldc-bootstrap
-       export DMD="$TERMUX_PKG_HOSTBUILD_DIR/dmd2/linux/bin64/dmd"
-       cmake -G "Unix Makefiles" $TERMUX_PKG_SRCDIR \
-               -DLLVM_CONFIG="$TERMUX_PKG_HOSTBUILD_DIR/bin/llvm-config"
-       make -j $TERMUX_MAKE_PROCESSES druntime-ldc phobos2-ldc \
-               druntime-ldc-debug phobos2-ldc-debug ldmd2
-       cd ..
+       ninja -j $TERMUX_MAKE_PROCESSES llvm-tblgen
+
+       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
-       rm $TERMUX_PKG_BUILDER_DIR/ldc-llvm-config.patch
 
        TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DLLVM_DEFAULT_TARGET_TRIPLE=armv7a-linux-androideabi"
        TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DLLVM_TARGET_ARCH=ARM -DLLVM_TARGETS_TO_BUILD=AArch64;ARM;X86"
@@ -111,13 +107,11 @@ termux_step_post_configure () {
        TERMUX_PKG_BUILDDIR=$OLD_TERMUX_PKG_BUILDDIR
        cd "$TERMUX_PKG_BUILDDIR"
 
-       TERMUX_PKG_EXTRA_CONFIGURE_ARGS=""
+       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
-
-       cp $TERMUX_PKG_HOSTBUILD_DIR/ldc-bootstrap/ddmd/id.d $TERMUX_PKG_BUILDDIR/ddmd
-       cp $TERMUX_PKG_HOSTBUILD_DIR/ldc-bootstrap/ddmd/id.h $TERMUX_PKG_BUILDDIR/ddmd
 }
 
 termux_step_make () {
@@ -128,13 +122,13 @@ termux_step_make () {
 
        cd ..
        if ls ./*akefile &> /dev/null; then
-               make -j $TERMUX_MAKE_PROCESSES ldc2 ldmd2
+               make -j $TERMUX_MAKE_PROCESSES ldc2 ldmd2 ldc-build-runtime
        fi
 
        # Build the rdmd scripting wrapper and the dub package manager
-       D_FLAGS="-w -de -O -inline -release"
+       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
@@ -144,17 +138,17 @@ termux_step_make () {
 }
 
 termux_step_make_install () {
-       cp bin/{dub,ldc2,ldmd2,rdmd} $TERMUX_PREFIX/bin
-       cp $TERMUX_PKG_HOSTBUILD_DIR/ldc-bootstrap/lib/lib{druntime,phobos2}*.a $TERMUX_PREFIX/lib
+       cp bin/{dub,ldc-build-runtime,ldc2,ldmd2,rdmd} $TERMUX_PREFIX/bin
+       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
 
        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
Unnamed repository; edit this file 'description' to name the repository.