| 1 |
commit: 5b594e538e38230b85a5f0164d1d8b90d137f81b |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 3 21:15:30 2018 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 3 21:15:39 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b594e53 |
| 7 |
|
| 8 |
dev-lang/nasm: fix against gcc-8, bug #654716 |
| 9 |
|
| 10 |
While at it bump up to 2.13.03. |
| 11 |
|
| 12 |
Reported-by: Mike Lothian |
| 13 |
Closes: https://bugs.gentoo.org/654716 |
| 14 |
Package-Manager: Portage-2.3.33, Repoman-2.3.9 |
| 15 |
|
| 16 |
dev-lang/nasm/Manifest | 1 + |
| 17 |
dev-lang/nasm/files/nasm-2.13.01-gcc-8.patch | 25 ++++++++++++++++++++++ |
| 18 |
dev-lang/nasm/nasm-2.13.01.ebuild | 5 ++++- |
| 19 |
.../{nasm-2.13.01.ebuild => nasm-2.13.03.ebuild} | 7 ++++-- |
| 20 |
4 files changed, 35 insertions(+), 3 deletions(-) |
| 21 |
|
| 22 |
diff --git a/dev-lang/nasm/Manifest b/dev-lang/nasm/Manifest |
| 23 |
index d5a351bdd73..1003a065565 100644 |
| 24 |
--- a/dev-lang/nasm/Manifest |
| 25 |
+++ b/dev-lang/nasm/Manifest |
| 26 |
@@ -1,3 +1,4 @@ |
| 27 |
DIST nasm-2.11.08.tar.xz 764872 BLAKE2B 2120a95065152b85d938811a1aa7c79eee9d3b9094f8bd2ed40eee7027de8b128a12552573bebcad6098e01b490ee21cffef3e04faf43263086b7e5ba81e4f6a SHA512 f7caf42d0fe1b850de13180a1f363e34a6d44a02696312dd8f12f4116ad1c1f3d01e6606c3a79fb881e76fc70d20894d85b333c84a75d60265ff9551f7b8cde4 |
| 28 |
DIST nasm-2.12.01.tar.xz 780112 BLAKE2B 2464c40016072b82db1f3895e22cca27ad6052c22d7671e1bf36508335a140f728f36876205ca6ae01396f396ff03dc51cb5fd0f628cc7936ed461ff1f90b1d8 SHA512 c016b2b26f2ef00fe8de673dc7b2effa55ddd23d1f15145380c2767a2cd4a5c60c77732faebcd5868b325f780c0bf76a5e0c49eb6189609b21e2493d2af9347c |
| 29 |
DIST nasm-2.13.01.tar.xz 800244 BLAKE2B 23a42d9e6c66577cee0e3b6cdff8da7b7b49286011f2d9e2319bd229ca0a1ab5b89a27d71a591777430e577175c935ba2a34b7ba0ca6086853f84fa5f0f648ab SHA512 6561a2efb3ffea77a1a8cd364edf1ecedb2c14e1902469d7c59d743f25ca612529113d1099818abbe0a9f2592f12604f1810855bbdf8dc9de3648094a83529ae |
| 30 |
+DIST nasm-2.13.03.tar.xz 806636 BLAKE2B 36187dac080dac17efbc1a2319d989bcb0f883fee80668656a6a87bdd83ee4115ffa2f8519f6d267815590f4809aa293aac500f3a5505a391154cb460cbe94ad SHA512 24e6c72b80a878453baf3b525c1bad607431ff672a927f73e742379fa833b3f5d3fa4479addfcec6d96f354aa90a45905ff9c76ab5217c3bcb7091107b32e2b5 |
| 31 |
|
| 32 |
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 |
| 33 |
new file mode 100644 |
| 34 |
index 00000000000..3b703ec6e46 |
| 35 |
--- /dev/null |
| 36 |
+++ b/dev-lang/nasm/files/nasm-2.13.01-gcc-8.patch |
| 37 |
@@ -0,0 +1,25 @@ |
| 38 |
+From 5eb1838b4d3752fd863d19442943983a2a5ee87c Mon Sep 17 00:00:00 2001 |
| 39 |
+From: Cyrill Gorcunov <gorcunov@×××××.com> |
| 40 |
+Date: Sat, 10 Feb 2018 00:33:41 +0300 |
| 41 |
+Subject: [PATCH] nasmlib: Drop unused seg_init |
| 42 |
+ |
| 43 |
+The helper has been eliminated in 2c4a4d5810d0a59b033a07876a2648ef5d4c2859 |
| 44 |
+ |
| 45 |
+https://bugzilla.nasm.us/show_bug.cgi?id=3392461 |
| 46 |
+ |
| 47 |
+Signed-off-by: Cyrill Gorcunov <gorcunov@×××××.com> |
| 48 |
+--- |
| 49 |
+ include/nasmlib.h | 2 -- |
| 50 |
+ 1 file changed, 2 deletions(-) |
| 51 |
+ |
| 52 |
+diff --git a/include/nasmlib.h b/include/nasmlib.h |
| 53 |
+index 79e866b5..fee1b5ea 100644 |
| 54 |
+--- a/include/nasmlib.h |
| 55 |
++++ b/include/nasmlib.h |
| 56 |
+@@ -191 +190,0 @@ int64_t readstrnum(char *str, int length, bool *warn); |
| 57 |
+- * seg_init: Initialise the segment-number allocator. |
| 58 |
+@@ -194 +192,0 @@ int64_t readstrnum(char *str, int length, bool *warn); |
| 59 |
+-void pure_func seg_init(void); |
| 60 |
+-- |
| 61 |
+2.17.0 |
| 62 |
+ |
| 63 |
|
| 64 |
diff --git a/dev-lang/nasm/nasm-2.13.01.ebuild b/dev-lang/nasm/nasm-2.13.01.ebuild |
| 65 |
index d1adedf032d..4d6f1059598 100644 |
| 66 |
--- a/dev-lang/nasm/nasm-2.13.01.ebuild |
| 67 |
+++ b/dev-lang/nasm/nasm-2.13.01.ebuild |
| 68 |
@@ -26,7 +26,10 @@ DEPEND=" |
| 69 |
" |
| 70 |
|
| 71 |
S=${WORKDIR}/${P/_} |
| 72 |
-PATCHES=( "${FILESDIR}"/${PN}-2.13.01-fix-docdir.patch ) |
| 73 |
+PATCHES=( |
| 74 |
+ "${FILESDIR}"/${PN}-2.13.01-fix-docdir.patch |
| 75 |
+ "${FILESDIR}"/${PN}-2.13.01-gcc-8.patch |
| 76 |
+) |
| 77 |
|
| 78 |
src_configure() { |
| 79 |
strip-flags |
| 80 |
|
| 81 |
diff --git a/dev-lang/nasm/nasm-2.13.01.ebuild b/dev-lang/nasm/nasm-2.13.03.ebuild |
| 82 |
similarity index 78% |
| 83 |
copy from dev-lang/nasm/nasm-2.13.01.ebuild |
| 84 |
copy to dev-lang/nasm/nasm-2.13.03.ebuild |
| 85 |
index d1adedf032d..efff31a3e06 100644 |
| 86 |
--- a/dev-lang/nasm/nasm-2.13.01.ebuild |
| 87 |
+++ b/dev-lang/nasm/nasm-2.13.03.ebuild |
| 88 |
@@ -11,7 +11,7 @@ SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/${PV/_}/${P/_}.tar.xz" |
| 89 |
|
| 90 |
LICENSE="BSD-2" |
| 91 |
SLOT="0" |
| 92 |
-KEYWORDS="amd64 x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos" |
| 93 |
+KEYWORDS="~amd64 ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos" |
| 94 |
IUSE="doc" |
| 95 |
|
| 96 |
DEPEND=" |
| 97 |
@@ -26,7 +26,10 @@ DEPEND=" |
| 98 |
" |
| 99 |
|
| 100 |
S=${WORKDIR}/${P/_} |
| 101 |
-PATCHES=( "${FILESDIR}"/${PN}-2.13.01-fix-docdir.patch ) |
| 102 |
+PATCHES=( |
| 103 |
+ "${FILESDIR}"/${PN}-2.13.01-fix-docdir.patch |
| 104 |
+ "${FILESDIR}"/${PN}-2.13.01-gcc-8.patch |
| 105 |
+) |
| 106 |
|
| 107 |
src_configure() { |
| 108 |
strip-flags |
Archives