diff options
| author | Andrew Crerar | 2018-02-18 00:01:49 -0500 |
|---|---|---|
| committer | Andrew Crerar | 2018-02-18 00:01:49 -0500 |
| commit | dd23dc25e2ccd046e8aae8c19e29cbb4fed46284 (patch) | |
| tree | 4fb08a661b94d52ce4f2f46fb15adc3b9dee9bbf | |
| parent | 9ccff361550e4946a6e84607c2d0b7130a8f9790 (diff) | |
| download | aur-dd23dc25e2ccd046e8aae8c19e29cbb4fed46284.tar.gz | |
Fixing perl libdir issues
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | PKGBUILD | 19 |
3 files changed, 13 insertions, 12 deletions
@@ -1,6 +1,6 @@ pkgbase = git-git pkgdesc = A fast distributed version control system - pkgver = 2.15.0.r317.g14c63a9dc0 + pkgver = 2.16.2.r246.ga4ee44448f pkgrel = 1 url = http://git-scm.com/ install = git-git.install diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..d63ff08daac8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +git/ +pkg/ +src/ +*.tar @@ -3,7 +3,7 @@ _name=git pkgname=$_name-git -pkgver=2.15.0.r317.g14c63a9dc0 +pkgver=2.16.2.r246.ga4ee44448f pkgrel=1 pkgdesc='A fast distributed version control system' arch=('i686' 'x86_64') @@ -46,7 +46,9 @@ pkgver() { build() { export PYTHON_PATH='/usr/bin/python2' cd "$srcdir/$_name" - make prefix=/usr gitexecdir=/usr/lib/git-core \ + make prefix=/usr \ + gitexecdir=/usr/lib/git-core \ + perllibdir=/usr/share/perl5/vendor_perl \ CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ USE_LIBPCRE2=1 \ NO_CROSS_DIRECTORY_HARDLINKS=1 \ @@ -87,7 +89,9 @@ check() { package() { export PYTHON_PATH='/usr/bin/python2' cd "$srcdir/$_name" - make prefix=/usr gitexecdir=/usr/lib/git-core \ + make prefix=/usr \ + gitexecdir=/usr/lib/git-core \ + perllibdir=/usr/share/perl5/vendor_perl \ CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ USE_LIBPCRE2=1 \ NO_CROSS_DIRECTORY_HARDLINKS=1 \ @@ -119,7 +123,7 @@ package() { make -C contrib/subtree prefix=/usr gitexecdir=/usr/lib/git-core DESTDIR="$pkgdir" install install-doc # mediawiki installation - make -C contrib/mw-to-git prefix=/usr gitexecdir=/usr/lib/git-core DESTDIR="$pkgdir" install + make -C contrib/mw-to-git prefix=/usr gitexecdir=/usr/lib/git-core DESTDIR="$pkgdir" INSTLIBDIR=/usr/share/perl5/vendor_perl install # the rest of the contrib stuff find contrib/ -name '.gitignore' -delete @@ -133,13 +137,6 @@ package() { sed -i 's|#![ ]*/usr/bin/python$|#!/usr/bin/python2|' \ "$pkgdir"/usr/share/git/svn-fe/svnrdump_sim.py - # perl modules from contrib/ install to site dir... move to vendor - mv "$pkgdir"/usr/share/perl5/site_perl/Git/* "$pkgdir"/usr/share/perl5/vendor_perl/Git/ - rm -rf "$pkgdir"/usr/share/perl5/site_perl - - # remove perllocal.pod, .packlist, and empty directories. - rm -rf "$pkgdir"/usr/lib/perl5 - # git-daemon via systemd socket activation install -D -m 644 "$srcdir"/git-daemon@.service "$pkgdir"/usr/lib/systemd/system/git-daemon@.service install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket |