diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-05-10 09:19:58 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-05-10 09:19:58 +0000 |
| commit | 0717904e94aaa8bbdc4513781463e38f5f5ded7c (patch) | |
| tree | 60e230be215ecdbbf02c16797abc836c87ece7a3 /main/git/APKBUILD | |
| parent | d11109c53833fc56337b9229cf313a7b6adb5bd4 (diff) | |
| download | aports-0717904e94aaa8bbdc4513781463e38f5f5ded7c.tar.bz2 aports-0717904e94aaa8bbdc4513781463e38f5f5ded7c.tar.xz | |
main/git: fix segfault when cherry-pick
Diffstat (limited to 'main/git/APKBUILD')
| -rw-r--r-- | main/git/APKBUILD | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/main/git/APKBUILD b/main/git/APKBUILD index 728fd7b19a..5d5153c2a2 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=git pkgver=1.7.1 -pkgrel=0 +pkgrel=1 pkgdesc="GIT - the stupid content tracker" url="http://git.or.cz/" license="GPL2" @@ -10,6 +10,7 @@ subpackages="$pkgname-doc $pkgname-perl" makedepends="zlib-dev openssl-dev curl-dev expat-dev perl-dev python-dev" source="http://kernel.org/pub/software/scm/git/git-$pkgver.tar.bz2 bb-tar.patch + git-do-not-dump-core-when-iconv-fails.patch " _makeopts="NO_ICONV=YesPlease @@ -17,14 +18,16 @@ _makeopts="NO_ICONV=YesPlease NO_TCLTK=YesPlease NO_SVN_TESTS=YesPlease" -build () { - cd $srcdir/$pkgname-$pkgver - patch -p1 -i ../bb-tar.patch || return 1 +build() { + cd "$srcdir"/$pkgname-$pkgver + patch -p1 -i "$srcdir"/bb-tar.patch || return 1 + patch -p1 -i "$srcdir"/git-do-not-dump-core-when-iconv-fails.patch \ + || return 1 make prefix=/usr DESTDIR="$pkgdir" $_makeopts || return 1 } package() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir"/$pkgname-$pkgver make prefix=/usr DESTDIR="$pkgdir" $_makeopts install } @@ -43,4 +46,5 @@ perl() { md5sums="3da231dbe82ad103373cb530ae7475d5 git-1.7.1.tar.bz2 -e63a201556c4f089de790805c09a2e5b bb-tar.patch" +e63a201556c4f089de790805c09a2e5b bb-tar.patch +7c660517316261b383a094ef03aad0aa git-do-not-dump-core-when-iconv-fails.patch" |