summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2018-05-03 22:15:30 +0100
committerSergei Trofimovich <slyfox@gentoo.org>2018-05-03 22:15:39 +0100
commit5b594e538e38230b85a5f0164d1d8b90d137f81b (patch)
tree1fc2271f6d416649394ac915892d8de74c27044f /dev-lang/nasm
parentnet-libs/gnutls-3.5.18: arm64 stable (bug #653578) (diff)
downloadgentoo-5b594e538e38230b85a5f0164d1d8b90d137f81b.tar.gz
gentoo-5b594e538e38230b85a5f0164d1d8b90d137f81b.tar.bz2
gentoo-5b594e538e38230b85a5f0164d1d8b90d137f81b.zip
dev-lang/nasm: fix against gcc-8, bug #654716
While at it bump up to 2.13.03. Reported-by: Mike Lothian Closes: https://bugs.gentoo.org/654716 Package-Manager: Portage-2.3.33, Repoman-2.3.9
Diffstat (limited to 'dev-lang/nasm')
-rw-r--r--dev-lang/nasm/Manifest1
-rw-r--r--dev-lang/nasm/files/nasm-2.13.01-gcc-8.patch25
-rw-r--r--dev-lang/nasm/nasm-2.13.01.ebuild5
-rw-r--r--dev-lang/nasm/nasm-2.13.03.ebuild47
4 files changed, 77 insertions, 1 deletions
diff --git a/dev-lang/nasm/Manifest b/dev-lang/nasm/Manifest
index d5a351bdd73..1003a065565 100644
--- a/dev-lang/nasm/Manifest
+++ b/dev-lang/nasm/Manifest
@@ -1,3 +1,4 @@
DIST nasm-2.11.08.tar.xz 764872 BLAKE2B 2120a95065152b85d938811a1aa7c79eee9d3b9094f8bd2ed40eee7027de8b128a12552573bebcad6098e01b490ee21cffef3e04faf43263086b7e5ba81e4f6a SHA512 f7caf42d0fe1b850de13180a1f363e34a6d44a02696312dd8f12f4116ad1c1f3d01e6606c3a79fb881e76fc70d20894d85b333c84a75d60265ff9551f7b8cde4
DIST nasm-2.12.01.tar.xz 780112 BLAKE2B 2464c40016072b82db1f3895e22cca27ad6052c22d7671e1bf36508335a140f728f36876205ca6ae01396f396ff03dc51cb5fd0f628cc7936ed461ff1f90b1d8 SHA512 c016b2b26f2ef00fe8de673dc7b2effa55ddd23d1f15145380c2767a2cd4a5c60c77732faebcd5868b325f780c0bf76a5e0c49eb6189609b21e2493d2af9347c
DIST nasm-2.13.01.tar.xz 800244 BLAKE2B 23a42d9e6c66577cee0e3b6cdff8da7b7b49286011f2d9e2319bd229ca0a1ab5b89a27d71a591777430e577175c935ba2a34b7ba0ca6086853f84fa5f0f648ab SHA512 6561a2efb3ffea77a1a8cd364edf1ecedb2c14e1902469d7c59d743f25ca612529113d1099818abbe0a9f2592f12604f1810855bbdf8dc9de3648094a83529ae
+DIST nasm-2.13.03.tar.xz 806636 BLAKE2B 36187dac080dac17efbc1a2319d989bcb0f883fee80668656a6a87bdd83ee4115ffa2f8519f6d267815590f4809aa293aac500f3a5505a391154cb460cbe94ad SHA512 24e6c72b80a878453baf3b525c1bad607431ff672a927f73e742379fa833b3f5d3fa4479addfcec6d96f354aa90a45905ff9c76ab5217c3bcb7091107b32e2b5
diff --git a/dev-lang/nasm/files/nasm-2.13.01-gcc-8.patch b/dev-lang/nasm/files/nasm-2.13.01-gcc-8.patch
new file mode 100644
index 00000000000..3b703ec6e46
--- /dev/null
+++ b/dev-lang/nasm/files/nasm-2.13.01-gcc-8.patch
@@ -0,0 +1,25 @@
+From 5eb1838b4d3752fd863d19442943983a2a5ee87c Mon Sep 17 00:00:00 2001
+From: Cyrill Gorcunov <gorcunov@gmail.com>
+Date: Sat, 10 Feb 2018 00:33:41 +0300
+Subject: [PATCH] nasmlib: Drop unused seg_init
+
+The helper has been eliminated in 2c4a4d5810d0a59b033a07876a2648ef5d4c2859
+
+https://bugzilla.nasm.us/show_bug.cgi?id=3392461
+
+Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
+---
+ include/nasmlib.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/include/nasmlib.h b/include/nasmlib.h
+index 79e866b5..fee1b5ea 100644
+--- a/include/nasmlib.h
++++ b/include/nasmlib.h
+@@ -191 +190,0 @@ int64_t readstrnum(char *str, int length, bool *warn);
+- * seg_init: Initialise the segment-number allocator.
+@@ -194 +192,0 @@ int64_t readstrnum(char *str, int length, bool *warn);
+-void pure_func seg_init(void);
+--
+2.17.0
+
diff --git a/dev-lang/nasm/nasm-2.13.01.ebuild b/dev-lang/nasm/nasm-2.13.01.ebuild
index d1adedf032d..4d6f1059598 100644
--- a/dev-lang/nasm/nasm-2.13.01.ebuild
+++ b/dev-lang/nasm/nasm-2.13.01.ebuild
@@ -26,7 +26,10 @@ DEPEND="
"
S=${WORKDIR}/${P/_}
-PATCHES=( "${FILESDIR}"/${PN}-2.13.01-fix-docdir.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.13.01-fix-docdir.patch
+ "${FILESDIR}"/${PN}-2.13.01-gcc-8.patch
+)
src_configure() {
strip-flags
diff --git a/dev-lang/nasm/nasm-2.13.03.ebuild b/dev-lang/nasm/nasm-2.13.03.ebuild
new file mode 100644
index 00000000000..efff31a3e06
--- /dev/null
+++ b/dev-lang/nasm/nasm-2.13.03.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="groovy little assembler"
+HOMEPAGE="http://www.nasm.us/"
+SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/${PV/_}/${P/_}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc"
+
+DEPEND="
+ dev-lang/perl
+ doc? (
+ app-text/ghostscript-gpl
+ dev-perl/Font-TTF
+ dev-perl/Sort-Versions
+ media-fonts/clearsans
+ virtual/perl-File-Spec
+ )
+"
+
+S=${WORKDIR}/${P/_}
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.13.01-fix-docdir.patch
+ "${FILESDIR}"/${PN}-2.13.01-gcc-8.patch
+)
+
+src_configure() {
+ strip-flags
+ default
+}
+
+src_compile() {
+ default
+ use doc && emake doc
+}
+
+src_install() {
+ default
+ emake DESTDIR="${D}" install_rdf $(usex doc install_doc '')
+}