From cd8be6da94d537bda6c9fac005c15e18ea076af9 Mon Sep 17 00:00:00 2001 From: Alexpux Date: Sat, 25 Oct 2014 12:04:32 +0400 Subject: [PATCH] make-git: Fix building. Change version creation. --- make-git/PKGBUILD | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/make-git/PKGBUILD b/make-git/PKGBUILD index 47745e28..29301790 100644 --- a/make-git/PKGBUILD +++ b/make-git/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Ray Donnelly pkgname=make-git -_ver_base=4.0 -pkgver=4.0.2298.8411528 +#_ver_base=4.1 +pkgver=4.1.8.g292da6f pkgrel=1 pkgdesc="GNU make utility to maintain groups of programs" arch=('i686' 'x86_64') @@ -15,26 +15,29 @@ depends=('msys2-runtime' 'sh' 'guile') #options=('debug' '!strip') makedepends=('gettext' 'gettext-devel' 'git' 'wget') install=$pkgname.install -source=("$pkgname"::'git://git.savannah.gnu.org/make.git' - 'make-autoconf.patch') -md5sums=('SKIP' - 'ccba99fbedbadfff09bb3fe220e9cab8') +source=("$pkgname"::'git://git.savannah.gnu.org/make.git') +md5sums=('SKIP') pkgver() { cd "$srcdir/$pkgname" - printf "%s.%s.%s" "$_ver_base" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + git describe --tags | sed -e 's|-|.|g' -e 's|v||g' + #printf "%s.%s.%s" "$_ver_base" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } prepare() { cd ${srcdir}/${pkgname} - patch -p1 -i ${srcdir}/make-autoconf.patch + #patch -p1 -i ${srcdir}/make-autoconf.patch autoreconf -fi } build() { cd ${srcdir}/${pkgname} - ./configure --build=${CHOST} --prefix=/usr \ - ac_cv_dos_paths=yes --without-libintl-prefix --without-libiconv-prefix + ./configure \ + --prefix=/usr \ + --build=${CHOST} \ + --without-libintl-prefix \ + --without-libiconv-prefix \ + ac_cv_dos_paths=yes make -j1 scm-update do-po-update all }