fix formatting for some packages

%ci:no-build
This commit is contained in:
Leonid Pliushch 2020-05-09 14:09:43 +03:00
parent 66d3b1c682
commit 6c886523ef
7 changed files with 54 additions and 57 deletions

View File

@ -8,9 +8,9 @@ TERMUX_PKG_DEPENDS="libandroid-support, libandroid-glob, libiconv, ncurses"
TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_BUILD_IN_SRC=true
termux_step_make() { termux_step_make() {
make \ make \
-j$TERMUX_MAKE_PROCESSES V=1 \ -j$TERMUX_MAKE_PROCESSES V=1 \
LDLIBS='-landroid-support -landroid-glob -liconv -lcurses' LDLIBS='-landroid-support -landroid-glob -liconv -lcurses'
} }
termux_step_make_install() { termux_step_make_install() {

View File

@ -9,7 +9,8 @@ TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_MAKE_PROCESSES=1 TERMUX_MAKE_PROCESSES=1
termux_step_post_extract_package() { termux_step_post_extract_package() {
filename=$(basename "$TERMUX_PKG_SRCURL") local file filename
local file="$TERMUX_PKG_CACHEDIR/$filename" filename=$(basename "$TERMUX_PKG_SRCURL")
tar xf "$file" -C "$TERMUX_PKG_SRCDIR" file="$TERMUX_PKG_CACHEDIR/$filename"
tar xf "$file" -C "$TERMUX_PKG_SRCDIR"
} }

View File

@ -7,31 +7,30 @@ TERMUX_PKG_SRCURL=https://github.com/ipfs/go-ipfs/releases/download/v${TERMUX_PK
TERMUX_PKG_SHA256=f0f9f3d7708cfbde95bbcae0543fc873a5a46824be17e94ad95f39a182fae356 TERMUX_PKG_SHA256=f0f9f3d7708cfbde95bbcae0543fc873a5a46824be17e94ad95f39a182fae356
termux_step_make() { termux_step_make() {
termux_setup_golang termux_setup_golang
export GOPATH=${TERMUX_PKG_BUILDDIR} export GOPATH=${TERMUX_PKG_BUILDDIR}
export GOARCH=${TERMUX_ARCH} export GOARCH=${TERMUX_ARCH}
if [ "${TERMUX_ARCH}" = "aarch64" ]; then if [ "${TERMUX_ARCH}" = "aarch64" ]; then
GOARCH="arm64" GOARCH="arm64"
elif [ "${TERMUX_ARCH}" = "i686" ]; then elif [ "${TERMUX_ARCH}" = "i686" ]; then
GOARCH="386" GOARCH="386"
elif [ "${TERMUX_ARCH}" = "x86_64" ]; then elif [ "${TERMUX_ARCH}" = "x86_64" ]; then
GOARCH="amd64" GOARCH="amd64"
fi fi
mkdir -p "${GOPATH}/src/github.com/ipfs" mkdir -p "${GOPATH}/src/github.com/ipfs"
cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/ipfs/go-ipfs" cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/ipfs/go-ipfs"
cd "${GOPATH}/src/github.com/ipfs/go-ipfs" cd "${GOPATH}/src/github.com/ipfs/go-ipfs"
make build make build
# Fix folders without write permissions preventing which fails repeating builds: # Fix folders without write permissions preventing which fails repeating builds:
cd $TERMUX_PKG_BUILDDIR cd $TERMUX_PKG_BUILDDIR
find . -type d -exec chmod u+w {} \; find . -type d -exec chmod u+w {} \;
} }
termux_step_make_install() { termux_step_make_install() {
mkdir -p "${TERMUX_PREFIX}/bin" install -Dm700 -t "$TERMUX_PREFIX"/bin "${TERMUX_PKG_BUILDDIR}/src/github.com/ipfs/go-ipfs/cmd/ipfs/ipfs"
cp -f "${TERMUX_PKG_BUILDDIR}/src/github.com/ipfs/go-ipfs/cmd/ipfs/ipfs" "${TERMUX_PREFIX}/bin/"
} }

View File

@ -7,18 +7,18 @@ TERMUX_PKG_SRCURL=https://github.com/ericchiang/pup/archive/v${TERMUX_PKG_VERSIO
TERMUX_PKG_SHA256=0d546ab78588e07e1601007772d83795495aa329b19bd1c3cde589ddb1c538b0 TERMUX_PKG_SHA256=0d546ab78588e07e1601007772d83795495aa329b19bd1c3cde589ddb1c538b0
termux_step_make() { termux_step_make() {
termux_setup_golang termux_setup_golang
cd "$TERMUX_PKG_SRCDIR" cd "$TERMUX_PKG_SRCDIR"
export GOPATH="${TERMUX_PKG_BUILDDIR}" export GOPATH="${TERMUX_PKG_BUILDDIR}"
mkdir -p "${GOPATH}/src/github.com/ericchiang/" mkdir -p "${GOPATH}/src/github.com/ericchiang/"
cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/ericchiang/pup" cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/ericchiang/pup"
cd "${GOPATH}/src/github.com/ericchiang/pup" cd "${GOPATH}/src/github.com/ericchiang/pup"
go get -d -v go get -d -v
go build go build
} }
termux_step_make_install() { termux_step_make_install() {
install -Dm700 "$GOPATH"/src/github.com/ericchiang/pup/pup "$TERMUX_PREFIX"/bin/ install -Dm700 -t "$TERMUX_PREFIX"/bin "$GOPATH"/src/github.com/ericchiang/pup/pup
} }

View File

@ -7,20 +7,18 @@ TERMUX_PKG_SRCURL=https://github.com/msoap/shell2http/archive/${TERMUX_PKG_VERSI
TERMUX_PKG_SHA256=6094762a3e54efddcbc361d80ef281624d2647f17f6b0c787cab713626d861e3 TERMUX_PKG_SHA256=6094762a3e54efddcbc361d80ef281624d2647f17f6b0c787cab713626d861e3
termux_step_make() { termux_step_make() {
termux_setup_golang termux_setup_golang
cd "$TERMUX_PKG_SRCDIR" cd "$TERMUX_PKG_SRCDIR"
export GOPATH="${TERMUX_PKG_BUILDDIR}" export GOPATH="${TERMUX_PKG_BUILDDIR}"
mkdir -p "${GOPATH}/src/github.com/msoap/" mkdir -p "${GOPATH}/src/github.com/msoap/"
cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/msoap/shell2http" cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/msoap/shell2http"
cd "${GOPATH}/src/github.com/msoap/shell2http" cd "${GOPATH}/src/github.com/msoap/shell2http"
go get -d -v go get -d -v
go build go build
} }
termux_step_make_install() { termux_step_make_install() {
install -Dm700 \ install -Dm700 -t "$TERMUX_PREFIX"/bin "$GOPATH"/src/github.com/msoap/shell2http/shell2http
"$GOPATH"/src/github.com/msoap/shell2http/shell2http \
"$TERMUX_PREFIX"/bin/
} }

View File

@ -53,7 +53,7 @@ termux_step_post_extract_package() {
$TERMUX_PKG_CACHEDIR/$library-$TERMUX_PKG_VERSION.tar.gz \ $TERMUX_PKG_CACHEDIR/$library-$TERMUX_PKG_VERSION.tar.gz \
${library_checksums[$library]} ${library_checksums[$library]}
tar xf $TERMUX_PKG_CACHEDIR/$library-$TERMUX_PKG_VERSION.tar.gz tar xf $TERMUX_PKG_CACHEDIR/$library-$TERMUX_PKG_VERSION.tar.gz
mv $library-swift-${TERMUX_PKG_VERSION}-$SWIFT_RELEASE $library mv $library-swift-${TERMUX_PKG_VERSION}-$SWIFT_RELEASE $library
done done
mv swift-cmark cmark mv swift-cmark cmark

View File

@ -7,20 +7,19 @@ TERMUX_PKG_SRCURL=https://github.com/kkdai/youtube/archive/v${TERMUX_PKG_VERSION
TERMUX_PKG_SHA256=20946b843b9584dd044ec4d8b412365511338c568a37a6170acabea2bb3e2661 TERMUX_PKG_SHA256=20946b843b9584dd044ec4d8b412365511338c568a37a6170acabea2bb3e2661
termux_step_make() { termux_step_make() {
termux_setup_golang termux_setup_golang
cd "$TERMUX_PKG_SRCDIR" cd "$TERMUX_PKG_SRCDIR"
export GOPATH="${TERMUX_PKG_BUILDDIR}" export GOPATH="${TERMUX_PKG_BUILDDIR}"
mkdir -p "${GOPATH}/src/github.com/kkdai/" mkdir -p "${GOPATH}/src/github.com/kkdai/"
cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/kkdai/youtube" cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/kkdai/youtube"
cd "${GOPATH}/src/github.com/kkdai/youtube/" cd "${GOPATH}/src/github.com/kkdai/youtube/"
go get -d -v go get -d -v
cd youtubedr cd youtubedr
go build . go build .
} }
termux_step_make_install() { termux_step_make_install() {
install -Dm700 -t "$TERMUX_PREFIX"/bin \ install -Dm700 -t "$TERMUX_PREFIX"/bin "$GOPATH"/src/github.com/kkdai/youtube/youtubedr/youtubedr
"$GOPATH"/src/github.com/kkdai/youtube/youtubedr/youtubedr
} }