diff options
| -rw-r--r-- | math/djbsort/Makefile | 3 | ||||
| -rw-r--r-- | math/djbsort/distinfo | 4 | ||||
| -rw-r--r-- | math/djbsort/patches/patch-build | 20 |
3 files changed, 22 insertions, 5 deletions
diff --git a/math/djbsort/Makefile b/math/djbsort/Makefile index 9f33cfc3799..43343374701 100644 --- a/math/djbsort/Makefile +++ b/math/djbsort/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2018/07/31 06:34:11 schmonz Exp $ +# $NetBSD: Makefile,v 1.5 2018/08/09 09:14:16 schmonz Exp $ DISTNAME= djbsort-20180729 +PKGREVISION= 1 CATEGORIES= math MASTER_SITES= ${HOMEPAGE} diff --git a/math/djbsort/distinfo b/math/djbsort/distinfo index d3d2459fd49..b6983d40490 100644 --- a/math/djbsort/distinfo +++ b/math/djbsort/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.3 2018/07/31 06:34:11 schmonz Exp $ +$NetBSD: distinfo,v 1.4 2018/08/09 09:14:16 schmonz Exp $ SHA1 (djbsort-20180729.tar.gz) = 7b64b9c5b3c6428cb6bc16638876f57ffff3c58b RMD160 (djbsort-20180729.tar.gz) = 65455661524b5d2cdd21c1c329a9065cfc9b3b0d SHA512 (djbsort-20180729.tar.gz) = b46c36514ce0c2c1716421d4da216d2e7ddb80e8e9a1b97b274ab0b3fe7271ea946a65485e81d4dc76c080658b41ef1e2fa64a225594532f1be98dc29535b2a6 Size (djbsort-20180729.tar.gz) = 29347 bytes -SHA1 (patch-build) = 0f1ae219495cc63fc301aa1f9ae1c1655da3aaa3 +SHA1 (patch-build) = eab611f7868f00a92781eb5a1eed6451607fb30b SHA1 (patch-test) = b5ba29b15d7baa896bf9e47a1522e88e73df4c9e SHA1 (patch-upgrade) = 2bec25c36e1ed28c67e4967ac929780d28bb2e68 diff --git a/math/djbsort/patches/patch-build b/math/djbsort/patches/patch-build index 1070901b32e..da603fb07d8 100644 --- a/math/djbsort/patches/patch-build +++ b/math/djbsort/patches/patch-build @@ -1,8 +1,9 @@ -$NetBSD: patch-build,v 1.1 2018/07/31 05:38:56 schmonz Exp $ +$NetBSD: patch-build,v 1.2 2018/08/09 09:14:16 schmonz Exp $ Don't bake build host into binary packages. +Don't build for multiple architectures. ---- build.orig 2018-07-17 14:55:25.000000000 +0000 +--- build.orig 2018-07-29 18:33:39.000000000 +0000 +++ build @@ -35,6 +35,7 @@ version = readfile('version').strip() shorthostname = platform.node().split('.')[0].lower() @@ -12,3 +13,18 @@ Don't bake build host into binary packages. startdir = os.getcwd() +@@ -98,11 +99,11 @@ def guessarchitectures(c): + if p.returncode: + lognow('dumpmachine exited %s' % (p.returncode)) + out = out.decode() +- if out.startswith('x86_64'): return ['x86','amd64'] ++ if out.startswith('x86_64'): return ['amd64'] + if out.startswith('i686'): return ['x86'] + if out.startswith('i386'): return ['x86'] +- if out.startswith('aarch64'): return ['arm','armeabi','aarch64'] +- if out.startswith('arm'): return ['arm','armeabi'] ++ if out.startswith('aarch64'): return ['aarch64'] ++ if out.startswith('arm'): return ['armeabi'] + return + except Exception as e: + lognow('dumpmachine failed %s' % e) |