sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pacman: fix nesting and depends

Browse Source
This commit is contained in:
Francisco Demartino 2015-12-24 00:17:04 -03:00
parent f6f8b3d361
commit dbbbf6e388
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/pacman/build.sh
View File

@ -6,7 +6,7 @@ TERMUX_PKG_HOMEPAGE=https://www.archlinux.org/pacman/
TERMUX_PKG_DESCRIPTION="A library-based package manager with dependency support" TERMUX_PKG_DESCRIPTION="A library-based package manager with dependency support"
TERMUX_PKG_VERSION=$pkgver TERMUX_PKG_VERSION=$pkgver
TERMUX_PKG_DEPENDS="bash glibc libarchive curl gpgme asciidoc python2 fakechroot libandroid-glob libandroid-support" TERMUX_PKG_DEPENDS="bash, glibc, libarchive, curl, gpgme, asciidoc, python2, fakechroot, libandroid-glob, libandroid-support"
TERMUX_PKG_SRCURL="https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz" TERMUX_PKG_SRCURL="https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz"
TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_BUILD_IN_SRC=yes
@ -28,8 +28,8 @@ termux_step_make () {
#package() { #package() {
termux_step_make_install () { termux_step_make_install () {
make DESTDIR="$TERMUX_PREFIX" install make install
make DESTDIR="$TERMUX_PREFIX" -C contrib install make -C contrib install
# install Arch specific stuff # install Arch specific stuff
install -dm755 "$TERMUX_PREFIX/etc" install -dm755 "$TERMUX_PREFIX/etc"
@ -56,8 +56,7 @@ termux_step_make_install () {
-e "s|@CARCHFLAGS[@]|$myflags|g" -e "s|@CARCHFLAGS[@]|$myflags|g"
# FIXME bash_completion # FIXME bash_completion
# # put bash_completion in the right location
# put bash_completion in the right location
# install -dm755 "$TERMUX_PREFIX/share/bash-completion/completions" # install -dm755 "$TERMUX_PREFIX/share/bash-completion/completions"
# mv "$TERMUX_PREFIX/etc/bash_completion.d/pacman" "$TERMUX_PREFIX/share/bash-completion/completions" # mv "$TERMUX_PREFIX/etc/bash_completion.d/pacman" "$TERMUX_PREFIX/share/bash-completion/completions"
# rmdir "$TERMUX_PREFIX/etc/bash_completion.d" # rmdir "$TERMUX_PREFIX/etc/bash_completion.d"