build: bump nasm version to 2.14.02

Type: make
Change-Id: I9b598ce17c058709553a45524e18a64de642a8db
Signed-off-by: Damjan Marion <damarion@cisco.com>

diff --git a/build/external/packages/nasm.mk b/build/external/packages/nasm.mk
index b782b53..2a5ce01 100644 (file)
--- a/build/external/packages/nasm.mk
+++ b/build/external/packages/nasm.mk
@@ -11,9 +11,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-nasm_version            := 2.13.03
+nasm_version            := 2.14.02
 nasm_tarball            := nasm-$(nasm_version).tar.xz
-nasm_tarball_md5sum     := d5ca2ad7121ccbae69dd606b1038532c
+nasm_tarball_md5sum     := 6390bd67b07ff1df9fe628b6929c0353
 nasm_tarball_strip_dirs := 1
 nasm_url                := https://ftp.osuosl.org/pub/blfs/conglomeration/nasm/$(nasm_tarball)
 nasm_cflags             := -Wno-implicit-fallthrough -std=c11

diff --git a/build/external/patches/nasm_2.13.03/0001-Fix-gcc-8-compilation.patch b/build/external/patches/nasm_2.13.03/0001-Fix-gcc-8-compilation.patch
deleted file mode 100644 (file)
index 73b59a5..0000000
--- a/build/external/patches/nasm_2.13.03/0001-Fix-gcc-8-compilation.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From aa9324ae33870cd3b9d90251e380a6d704651a60 Mon Sep 17 00:00:00 2001
-From: Damjan Marion <damarion@cisco.com>
-Date: Mon, 17 Sep 2018 09:25:35 +0200
-Subject: [PATCH] Fix gcc-8 compilation
-
-Signed-off-by: Damjan Marion <damarion@cisco.com>
----
- include/nasmlib.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/nasmlib.h b/include/nasmlib.h
-index 79e866b..5f07d77 100644
---- a/include/nasmlib.h
-+++ b/include/nasmlib.h
-@@ -191,7 +191,7 @@ 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_init(void);
- int32_t pure_func seg_alloc(void);
- 
- /*
--- 
-2.17.1
-