diff options
| author | Stephan Springer | 2018-09-12 13:37:40 +0200 |
|---|---|---|
| committer | Stephan Springer | 2018-09-12 13:37:40 +0200 |
| commit | c30d7ee294fe908f297f5eb659935654874eba63 (patch) | |
| tree | 1afc82e215257672dec30fe17065c829cb6973cb | |
| parent | c42d21d5025c8a8a0f99814c54124d092ae64d87 (diff) | |
| download | aur-c30d7ee294fe908f297f5eb659935654874eba63.tar.gz | |
fix packaging
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 18 | ||||
| -rw-r--r-- | fix-build.diff | 13 |
3 files changed, 29 insertions, 8 deletions
@@ -1,18 +1,20 @@ pkgbase = freelan-git pkgdesc = Peer-to-peer, secure, easy-to-setup, multi-platform, highly-configurable VPN software pkgver = r3862.1cf517bf - pkgrel = 1 + pkgrel = 2 url = https://github.com/freelan-developers/freelan arch = any license = GPL makedepends = git + makedepends = help2man makedepends = scons depends = boost depends = curl depends = miniupnpc depends = openssl - depends = python source = git+https://github.com/freelan-developers/freelan.git + source = fix-build.diff + sha256sums = SKIP sha256sums = SKIP pkgname = freelan-git @@ -4,15 +4,16 @@ _pkgname=freelan pkgname="$_pkgname"-git pkgver=r3862.1cf517bf -pkgrel=1 +pkgrel=2 pkgdesc="Peer-to-peer, secure, easy-to-setup, multi-platform, highly-configurable VPN software" arch=('any') url="https://github.com/freelan-developers/freelan" license=('GPL') -depends=('boost' 'curl' 'miniupnpc' 'openssl' 'python') -makedepends=('git' 'scons') -source=(git+https://github.com/freelan-developers/"$_pkgname".git) -sha256sums=(SKIP) +depends=('boost' 'curl' 'miniupnpc' 'openssl') +makedepends=('git' 'help2man' 'scons') +source=(git+https://github.com/freelan-developers/"$_pkgname".git + fix-build.diff) +sha256sums=(SKIP SKIP) pkgver() { cd "$_pkgname" @@ -21,9 +22,14 @@ pkgver() { "$(git rev-parse --short HEAD)" } +prepare() { + cd "$srcdir/$_pkgname" + patch -p1 -i "$srcdir"/fix-build.diff +} + build() { cd "$srcdir/$_pkgname" - scons apps --mode=release prefix="$pkgdir" bin_prefix="$pkgdir"/usr + scons -j6 apps --mode=release prefix="$pkgdir" bin_prefix="$pkgdir"/usr # scons samples # build fails currently } diff --git a/fix-build.diff b/fix-build.diff new file mode 100644 index 000000000000..bff7c5323a79 --- /dev/null +++ b/fix-build.diff @@ -0,0 +1,13 @@ +diff --git a/SConstruct b/SConstruct +index 6797a04e..fcb32424 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -218,7 +218,7 @@ if mode in ('all', 'release'): + env = FreelanEnvironment(mode='release', prefix=prefix, bin_prefix=bin_prefix, mongoose=mongoose, upnp=upnp) + libraries, includes, apps, samples, configurations, help = SConscript('SConscript', exports='env', variant_dir=os.path.join('build', env.mode)) + install = env.Install(os.path.join(env.bin_install_prefix, 'bin'), apps) +- install = env.Install(os.path.join(env.bin_install_prefix, 'man', 'man1'), help) ++ install.extend(env.Install(os.path.join(env.bin_install_prefix, 'share/man', 'man1'), help)) + install.extend(env.Install(os.path.join(env.install_prefix, 'etc', 'freelan'), configurations)) + + Alias('install', install) |