Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (09ca9f2318d6fd1ffa1459339eeb5d4463eff7f0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (09ca9f2318d6fd1ffa1459339eeb5d4463eff7f0)
  • Date: Fri, 14 Sep 2018 00:29:21 +0000

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

devel/nasm/HISTORY | 6 ++++++
devel/nasm/PRE_BUILD | 4 ++++
devel/nasm/gcc-8.patch | 20 ++++++++++++++++++++
3 files changed, 30 insertions(+)

New commits:
commit 09ca9f2318d6fd1ffa1459339eeb5d4463eff7f0
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

nasm: Fix compiling against GCC 8.x

See https://bugzilla.nasm.us/show_bug.cgi?id=3392461
PROVIDES +x

diff --git a/devel/nasm/HISTORY b/devel/nasm/HISTORY
index 5c2918b..ef493ad 100644
--- a/devel/nasm/HISTORY
+++ b/devel/nasm/HISTORY
@@ -1,3 +1,9 @@
+2018-09-13 Eric Sandall <sandalle AT sourcemage.org>
+ * PROVIDES: +x
+ * PRE_BUILD: Apply gcc-8.patch
+ * gcc-8.patch: Fix compiling against GCC 8.x
+ See https://bugzilla.nasm.us/show_bug.cgi?id=3392461
+
2018-02-08 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 2.13.03

diff --git a/devel/nasm/PRE_BUILD b/devel/nasm/PRE_BUILD
new file mode 100755
index 0000000..0f02b4f
--- /dev/null
+++ b/devel/nasm/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+message "${MESSAGE_COLOR}Applying GCC 8.x patch...${DEFAULT_COLOR}" &&
+patch -p1 < "${SPELL_DIRECTORY}"/gcc-8.patch
diff --git a/devel/nasm/PROVIDES b/devel/nasm/PROVIDES
old mode 100644
new mode 100755
diff --git a/devel/nasm/gcc-8.patch b/devel/nasm/gcc-8.patch
new file mode 100644
index 0000000..8b5ad19
--- /dev/null
+++ b/devel/nasm/gcc-8.patch
@@ -0,0 +1,20 @@
+# From https://bugzilla.nasm.us/show_bug.cgi?id=3392461
+@@ -, +, @@
+---
+ include/nasmlib.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+--- a/include/nasmlib.h
++++ a/include/nasmlib.h
+@@ -192,8 +192,8 @@ int64_t readstrnum(char *str, int length, bool *warn);
+ * seg_init: Initialise the segment-number allocator.
+ * seg_alloc: allocate a hitherto unused segment number.
+ */
+-void pure_func seg_init(void);
+-int32_t pure_func seg_alloc(void);
++void seg_init(void);
++int32_t seg_alloc(void);
+
+ /*
+ * Add/replace or remove an extension to the end of a filename
+--
+



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (09ca9f2318d6fd1ffa1459339eeb5d4463eff7f0), Eric Sandall, 09/13/2018

Archive powered by MHonArc 2.6.24.

Top of Page