diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2019-04-25 13:02:13 -0300 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-04-26 07:06:35 +0000 |
| commit | 85964a38d7eb30c32e559ad7df8a142f6274abd8 (patch) | |
| tree | 608f064301e6d5b13c789a9a27a9aba2dd6f5354 /main/fish | |
| parent | 3024f6676073efb156bd7904c9f93d74a44cbdcc (diff) | |
| download | aports-85964a38d7eb30c32e559ad7df8a142f6274abd8.tar.bz2 aports-85964a38d7eb30c32e559ad7df8a142f6274abd8.tar.xz | |
main/fish: set SYSCONFDIR explicitly to /etc
Diffstat (limited to 'main/fish')
| -rw-r--r-- | main/fish/APKBUILD | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/main/fish/APKBUILD b/main/fish/APKBUILD index 7b1d440287..556274e5c3 100644 --- a/main/fish/APKBUILD +++ b/main/fish/APKBUILD @@ -2,14 +2,14 @@ # Maintainer: Leo <thinkabit.ukim@gmail.com> pkgname=fish pkgver=3.0.2 -pkgrel=0 +pkgrel=1 pkgdesc="Modern interactive commandline shell" url="http://www.fishshell.com" arch="all" license="GPL-2.0-only" depends="bc" depends_dev="$pkgname-tools" -makedepends="cmake doxygen ncurses-dev ncurses pcre2-dev" +makedepends="doxygen ncurses-dev ncurses pcre2-dev" checkdepends="expect bash" install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools::noarch" @@ -18,18 +18,14 @@ builddir="$srcdir/$pkgname-$pkgver" build() { cd "$builddir" - if [ "$CBUILD" != "$CHOST" ]; then - CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" - fi - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_SHARED_LIBS=True \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ - -DCMAKE_C_FLAGS="$CFLAGS" \ - -DINTERNAL_WCWIDTH=OFF \ - ${CMAKE_CROSSOPTS} - make + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --without-included-pcre2 \ + --disable-internal-wcwidth + make V=1 } check() { @@ -55,9 +51,6 @@ package() { make install DESTDIR="$pkgdir" rm -fr "$pkgdir"/usr/share/$pkgname/groff - - # Only comments - rm -rf "$pkgdir"/usr/etc/fish/config.fish } dev() { |