X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/c9e68e0d9c4eaf92df743bc2144166ccdc3efdf0..51c63a8791b89a02b32948770c4511a049f06c46:/build-package.sh

diff --git a/build-package.sh b/build-package.sh
index f0f11903..b0156348 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -64,7 +64,6 @@ termux_setup_golang() {
 
 	local TERMUX_GO_VERSION=go1.8rc1
 	local TERMUX_GO_PLATFORM=linux-amd64
-	test "$(uname)" = "Darwin" && TERMUX_GO_PLATFORM=darwin-amd64
 
 	local TERMUX_BUILDGO_FOLDER=$TERMUX_COMMON_CACHEDIR/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM}
 	export GOROOT=$TERMUX_BUILDGO_FOLDER
@@ -211,8 +210,6 @@ termux_step_setup_variables() {
 
 	export TERMUX_TAR="tar"
 	export TERMUX_TOUCH="touch"
-	test "$(uname)" = "Darwin" && TERMUX_TAR=gtar
-	test "$(uname)" = "Darwin" && TERMUX_TOUCH=gtouch
 	export prefix=${TERMUX_PREFIX}
 	export PREFIX=${TERMUX_PREFIX}
 	export PKG_CONFIG_LIBDIR=$TERMUX_PREFIX/lib/pkgconfig
@@ -821,7 +818,7 @@ termux_step_massage() {
 	if [ -d include ] && [ -z "${TERMUX_PKG_NO_DEVELSPLIT}" ]; then
 		# Add virtual -dev sub package if there are include files:
 		local _DEVEL_SUBPACKAGE_FILE=$TERMUX_PKG_TMPDIR/${TERMUX_PKG_NAME}-dev.subpackage.sh
-		echo TERMUX_SUBPKG_INCLUDE=\"include share/man/man3 lib/pkgconfig share/aclocal $TERMUX_PKG_INCLUDE_IN_DEVPACKAGE\" > "$_DEVEL_SUBPACKAGE_FILE"
+		echo TERMUX_SUBPKG_INCLUDE=\"include share/man/man3 lib/pkgconfig share/aclocal lib/cmake $TERMUX_PKG_INCLUDE_IN_DEVPACKAGE\" > "$_DEVEL_SUBPACKAGE_FILE"
 		echo "TERMUX_SUBPKG_DESCRIPTION=\"Development files for ${TERMUX_PKG_NAME}\"" >> "$_DEVEL_SUBPACKAGE_FILE"
 		if [ -n "$TERMUX_PKG_DEVPACKAGE_DEPENDS" ]; then
 			echo "TERMUX_SUBPKG_DEPENDS=\"$TERMUX_PKG_NAME,$TERMUX_PKG_DEVPACKAGE_DEPENDS\"" >> $_DEVEL_SUBPACKAGE_FILE