X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/fecf9680ef753dc6bbdcd99eb4f45026e4b5b7a4..ce7752b7abdd25b9ea4d8754d5db9420ec79c5fd:/build-package.sh diff --git a/build-package.sh b/build-package.sh index 9176b4f3..6a75a60e 100755 --- a/build-package.sh +++ b/build-package.sh @@ -461,6 +461,10 @@ termux_step_massage () { echo TERMUX_SUBPKG_INCLUDE=\"include share/man/man3 lib/pkgconfig share/aclocal $TERMUX_PKG_INCLUDE_IN_DEVPACKAGE\" > $_DEVEL_SUBPACKAGE_FILE echo TERMUX_SUBPKG_DESCRIPTION=\"Development files for ${TERMUX_PKG_NAME}\" >> $_DEVEL_SUBPACKAGE_FILE echo TERMUX_SUBPKG_DEPENDS=\"$TERMUX_PKG_NAME\" >> $_DEVEL_SUBPACKAGE_FILE + if [ x$TERMUX_PKG_CONFLICTS != x ]; then + # Assume that dev packages conflicts as well. + echo "TERMUX_SUBPKG_CONFLICTS=${TERMUX_PKG_CONFLICTS}-dev" >> $_DEVEL_SUBPACKAGE_FILE + fi fi # Now build all sub packages rm -Rf $TERMUX_TOPDIR/$TERMUX_PKG_NAME/subpackages @@ -472,6 +476,7 @@ termux_step_massage () { echo "$SUB_PKG_NAME => $subpackage" SUB_PKG_DIR=$TERMUX_TOPDIR/$TERMUX_PKG_NAME/subpackages/$SUB_PKG_NAME TERMUX_SUBPKG_DEPENDS="" + TERMUX_SUBPKG_CONFLICTS="" SUB_PKG_MASSAGE_DIR=$SUB_PKG_DIR/massage/$TERMUX_PREFIX SUB_PKG_PACKAGE_DIR=$SUB_PKG_DIR/package mkdir -p $SUB_PKG_MASSAGE_DIR $SUB_PKG_PACKAGE_DIR @@ -506,6 +511,7 @@ Description: $TERMUX_SUBPKG_DESCRIPTION Homepage: $TERMUX_PKG_HOMEPAGE HERE test ! -z "$TERMUX_SUBPKG_DEPENDS" && echo "Depends: $TERMUX_SUBPKG_DEPENDS" >> control + test ! -z "$TERMUX_SUBPKG_CONFLICTS" && echo "Conflicts: $TERMUX_SUBPKG_CONFLICTS" >> control $TERMUX_TAR -czf $SUB_PKG_PACKAGE_DIR/control.tar.gz . # Create the actual .deb file: @@ -536,6 +542,23 @@ termux_step_create_debscripts () { return } +termux_setup_golang () { + local TERMUX_GO_VERSION=go1.6beta1 + local TERMUX_GO_PLATFORM=linux-amd64 + test `uname` = "Darwin" && TERMUX_GO_PLATFORM=darwin-amd64 + + export TERMUX_BUILDGO_FOLDER=$TERMUX_COMMON_CACHEDIR/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM} + export GOROOT=$TERMUX_BUILDGO_FOLDER + export PATH=$GOROOT/bin:$PATH + + if [ -d $TERMUX_BUILDGO_FOLDER ]; then return; fi + + local TERMUX_BUILDGO_TAR=$TERMUX_COMMON_CACHEDIR/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM}.tar.gz + rm -Rf $TERMUX_COMMON_CACHEDIR/go $TERMUX_BUILDGO_FOLDER + curl -o $TERMUX_BUILDGO_TAR https://storage.googleapis.com/golang/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM}.tar.gz + ( cd $TERMUX_COMMON_CACHEDIR; tar xf $TERMUX_BUILDGO_TAR; mv go $TERMUX_BUILDGO_FOLDER; rm $TERMUX_BUILDGO_TAR ) +} + source $TERMUX_PKG_BUILDER_SCRIPT # Compute full version: