* [AUH] nasm: upgrading to 2.16.02 FAILED
@ 2024-04-16 6:13 auh
0 siblings, 0 replies; only message in thread
From: auh @ 2024-04-16 6:13 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 6580 bytes --]
Hello,
this email is a notification from the Auto Upgrade Helper
that the automatic attempt to upgrade the recipe *nasm* to *2.16.02* has Failed(do_compile).
Detailed error information:
do_compile failed
Next steps:
- apply the patch: git am 0001-nasm-upgrade-2.16.01-2.16.02.patch
- check the changes to upstream patches and summarize them in the commit message,
- compile an image that contains the package
- perform some basic sanity tests
- amend the patch and sign it off: git commit -s --reset-author --amend
- send it to the appropriate mailing list
Alternatively, if you believe the recipe should not be upgraded at this time,
you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that
automatic upgrades would no longer be attempted.
Please review the attached files for further information and build/update failures.
Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler
Regards,
The Upgrade Helper
-- >8 --
From afa077eeb510c7f34122871056cadc34957c130d Mon Sep 17 00:00:00 2001
From: Upgrade Helper <auh@yoctoproject.org>
Date: Mon, 15 Apr 2024 18:43:56 +0000
Subject: [PATCH] nasm: upgrade 2.16.01 -> 2.16.02
---
.../nasm/nasm/0001-stdlib-Add-strlcat.patch | 17 ++++++++---------
.../nasm/0002-Add-debug-prefix-map-option.patch | 9 ++++-----
.../nasm/{nasm_2.16.01.bb => nasm_2.16.02.bb} | 2 +-
3 files changed, 13 insertions(+), 15 deletions(-)
rename meta/recipes-devtools/nasm/{nasm_2.16.01.bb => nasm_2.16.02.bb} (88%)
diff --git a/meta/recipes-devtools/nasm/nasm/0001-stdlib-Add-strlcat.patch b/meta/recipes-devtools/nasm/nasm/0001-stdlib-Add-strlcat.patch
index 1b8e947c56..58da282dee 100644
--- a/meta/recipes-devtools/nasm/nasm/0001-stdlib-Add-strlcat.patch
+++ b/meta/recipes-devtools/nasm/nasm/0001-stdlib-Add-strlcat.patch
@@ -1,4 +1,4 @@
-From 680220e772dfa381829983fa73b915416f676894 Mon Sep 17 00:00:00 2001
+From 5849006f70cfa78f4eb0b3f292681c54670ae781 Mon Sep 17 00:00:00 2001
From: Joshua Watt <JPEWhacker@gmail.com>
Date: Tue, 19 Nov 2019 12:47:30 -0600
Subject: [PATCH] stdlib: Add strlcat
@@ -7,7 +7,6 @@ Adds strlcat which can be used to safely concatenate strings
Upstream-Status: Submitted [https://bugzilla.nasm.us/show_bug.cgi?id=3392635]
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
-
---
Makefile.in | 2 +-
configure.ac | 2 ++
@@ -17,10 +16,10 @@ Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
create mode 100644 stdlib/strlcat.c
diff --git a/Makefile.in b/Makefile.in
-index b85ebee..045fabe 100644
+index 68dd8f1..54abfbd 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -104,7 +104,7 @@ PROGOBJ = $(NASM) $(NDISASM)
+@@ -111,7 +111,7 @@ PROGOBJ = $(NASM) $(NDISASM)
PROGS = nasm$(X) ndisasm$(X)
LIBOBJ_NW = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \
@@ -30,10 +29,10 @@ index b85ebee..045fabe 100644
nasmlib/ver.$(O) \
nasmlib/alloc.$(O) nasmlib/asprintf.$(O) nasmlib/errfile.$(O) \
diff --git a/configure.ac b/configure.ac
-index 42cd198..e206338 100644
+index e30125b..8a800f1 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -236,6 +236,7 @@ PA_FUNC_SNPRINTF
+@@ -214,6 +214,7 @@ PA_FUNC_SNPRINTF
PA_FUNC_VSNPRINTF
AC_CHECK_FUNCS([strlcpy])
AC_CHECK_FUNCS([strrchrnul])
@@ -41,7 +40,7 @@ index 42cd198..e206338 100644
dnl These types are POSIX-specific, and Windows does it differently...
AC_CHECK_TYPES([struct _stati64])
-@@ -255,6 +256,7 @@ AC_CHECK_DECLS(strsep)
+@@ -233,6 +234,7 @@ AC_CHECK_DECLS(strsep)
AC_CHECK_DECLS(strlcpy)
AC_CHECK_DECLS(strnlen)
AC_CHECK_DECLS(strrchrnul)
@@ -50,10 +49,10 @@ index 42cd198..e206338 100644
dnl Check for missing types
AC_TYPE_UINTPTR_T
diff --git a/include/compiler.h b/include/compiler.h
-index 407c160..b64da6a 100644
+index b95b1a2..eb5b984 100644
--- a/include/compiler.h
+++ b/include/compiler.h
-@@ -169,6 +169,10 @@ size_t strlcpy(char *, const char *, size_t);
+@@ -171,6 +171,10 @@ size_t strlcpy(char *, const char *, size_t);
char *strrchrnul(const char *, int);
#endif
diff --git a/meta/recipes-devtools/nasm/nasm/0002-Add-debug-prefix-map-option.patch b/meta/recipes-devtools/nasm/nasm/0002-Add-debug-prefix-map-option.patch
index 84fcca0fe1..eecb2ff5b9 100644
--- a/meta/recipes-devtools/nasm/nasm/0002-Add-debug-prefix-map-option.patch
+++ b/meta/recipes-devtools/nasm/nasm/0002-Add-debug-prefix-map-option.patch
@@ -1,4 +1,4 @@
-From e28c8883050d34d18ee2d66dfeece51e13adb6d5 Mon Sep 17 00:00:00 2001
+From 9c971e6986e0792a0aacd3fb94b9c8b9ee9f6b77 Mon Sep 17 00:00:00 2001
From: Joshua Watt <JPEWhacker@gmail.com>
Date: Tue, 19 Nov 2019 13:12:17 -0600
Subject: [PATCH] Add --debug-prefix-map option
@@ -9,7 +9,6 @@ be built in a reproducible manner regardless of the build directory.
Upstream-Status: Submitted [https://bugzilla.nasm.us/show_bug.cgi?id=3392635]
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
-
---
asm/nasm.c | 24 ++++++++++++++++++++++++
include/nasmlib.h | 9 +++++++++
@@ -27,7 +26,7 @@ Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
create mode 100644 test/elfdebugprefix.asm
diff --git a/asm/nasm.c b/asm/nasm.c
-index 76c70f6..08ff119 100644
+index 97d926f..e013c75 100644
--- a/asm/nasm.c
+++ b/asm/nasm.c
@@ -939,6 +939,7 @@ enum text_options {
@@ -83,10 +82,10 @@ index 76c70f6..08ff119 100644
fprintf(out, " %-20s %s\n",
diff --git a/include/nasmlib.h b/include/nasmlib.h
-index 87a7fc6..a3e5144 100644
+index fdfb9a9..d0d1194 100644
--- a/include/nasmlib.h
+++ b/include/nasmlib.h
-@@ -250,10 +250,19 @@ int64_t readstrnum(char *str, int length, bool *warn);
+@@ -281,10 +281,19 @@ int numstr(char *buf, size_t buflen, uint64_t n,
*/
int32_t seg_alloc(void);
diff --git a/meta/recipes-devtools/nasm/nasm_2.16.01.bb b/meta/recipes-devtools/nasm/nasm_2.16.02.bb
similarity index 88%
rename from meta/recipes-devtools/nasm/nasm_2.16.01.bb
rename to meta/recipes-devtools/nasm/nasm_2.16.02.bb
index 219cc49360..8aade10f7b 100644
--- a/meta/recipes-devtools/nasm/nasm_2.16.01.bb
+++ b/meta/recipes-devtools/nasm/nasm_2.16.02.bb
@@ -10,7 +10,7 @@ SRC_URI = "http://www.nasm.us/pub/nasm/releasebuilds/${PV}/nasm-${PV}.tar.bz2 \
file://0002-Add-debug-prefix-map-option.patch \
"
-SRC_URI[sha256sum] = "35b6ad2ee048d41c4779f073f3efca7762a822b7d2d4ef4e8df24cf65747bb2e"
+SRC_URI[sha256sum] = "188d7ad38f90cb05c53daaa288eaa1eb40a8ad32eccb65e8b64ffe74f44d6f91"
EXTRA_AUTORECONF:append = " -I autoconf/m4"
--
2.42.0
[-- Attachment #2: bitbake-output-qemux86-64.txt --]
[-- Type: text/plain, Size: 11667 bytes --]
NOTE: Reconnecting to bitbake server...
Loading cache...done.
Loaded 1880 entries from dependency cache.
Parsing recipes...done.
Parsing of 922 .bb files complete (921 cached, 1 parsed). 1878 targets, 35 skipped, 0 masked, 0 errors.
Removing 1 recipes from the core2-64 sysroot...done.
Removing 1 recipes from the qemux86_64 sysroot...done.
NOTE: Resolving any missing task queue dependencies
Build Configuration:
BB_VERSION = "2.7.3"
BUILD_SYS = "x86_64-linux"
NATIVELSBSTRING = "universal"
TARGET_SYS = "x86_64-poky-linux"
MACHINE = "qemux86-64"
DISTRO = "poky"
DISTRO_VERSION = "4.3+snapshot-dd1fed36e018a31c3ee341f20797a5f32d84da4c"
TUNE_FEATURES = "m64 core2"
TARGET_FPU = ""
meta
meta-poky
meta-yocto-bsp
workspace = "tmp-auh-upgrades:dd1fed36e018a31c3ee341f20797a5f32d84da4c"
Initialising tasks...NOTE: The /proc/pressure files can't be read. Continuing build without monitoring pressure
Sstate summary: Wanted 114 Local 103 Mirrors 0 Missed 11 Current 185 (90% match, 96% complete)
done.
NOTE: Executing Tasks
NOTE: Running setscene task 194 of 299 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/libtool/libtool-cross_2.4.7.bb:do_create_spdx_setscene)
NOTE: Running setscene task 203 of 299 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/libtool/libtool-cross_2.4.7.bb:do_populate_sysroot_setscene)
NOTE: Running setscene task 205 of 299 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/nasm/nasm_2.16.02.bb:do_recipe_qa_setscene)
NOTE: Running setscene task 237 of 299 (virtual:native:/home/pokybuild/yocto-worker/auh/build/meta/recipes-extended/groff/groff_1.23.0.bb:do_create_spdx_setscene)
NOTE: Running setscene task 238 of 299 (virtual:native:/home/pokybuild/yocto-worker/auh/build/meta/recipes-extended/groff/groff_1.23.0.bb:do_populate_sysroot_setscene)
NOTE: recipe libtool-cross-2.4.7-r0: task do_create_spdx_setscene: Started
NOTE: recipe libtool-cross-2.4.7-r0: task do_populate_sysroot_setscene: Started
NOTE: recipe nasm-2.16.02-r0: task do_recipe_qa_setscene: Started
NOTE: recipe groff-native-1.23.0-r0: task do_create_spdx_setscene: Started
NOTE: recipe groff-native-1.23.0-r0: task do_populate_sysroot_setscene: Started
NOTE: recipe libtool-cross-2.4.7-r0: task do_create_spdx_setscene: Succeeded
NOTE: Running setscene task 265 of 299 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/gcc/gcc-runtime_13.2.bb:do_create_spdx_setscene)
NOTE: recipe nasm-2.16.02-r0: task do_recipe_qa_setscene: Succeeded
NOTE: Running task 365 of 909 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/nasm/nasm_2.16.02.bb:do_fetch)
NOTE: recipe groff-native-1.23.0-r0: task do_create_spdx_setscene: Succeeded
NOTE: recipe libtool-cross-2.4.7-r0: task do_populate_sysroot_setscene: Succeeded
NOTE: Running setscene task 267 of 299 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/libtool/libtool-cross_2.4.7.bb:do_recipe_qa_setscene)
NOTE: recipe nasm-2.16.02-r0: task do_fetch: Started
NOTE: recipe gcc-runtime-13.2.0-r0: task do_create_spdx_setscene: Started
NOTE: recipe libtool-cross-2.4.7-r0: task do_recipe_qa_setscene: Started
NOTE: recipe nasm-2.16.02-r0: task do_fetch: Succeeded
NOTE: Running task 366 of 909 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/nasm/nasm_2.16.02.bb:do_unpack)
NOTE: recipe gcc-runtime-13.2.0-r0: task do_create_spdx_setscene: Succeeded
NOTE: Running setscene task 271 of 299 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-core/glibc/glibc_2.39.bb:do_create_spdx_setscene)
NOTE: recipe libtool-cross-2.4.7-r0: task do_recipe_qa_setscene: Succeeded
NOTE: recipe nasm-2.16.02-r0: task do_unpack: Started
NOTE: recipe groff-native-1.23.0-r0: task do_populate_sysroot_setscene: Succeeded
NOTE: Running setscene task 275 of 299 (virtual:native:/home/pokybuild/yocto-worker/auh/build/meta/recipes-extended/groff/groff_1.23.0.bb:do_recipe_qa_setscene)
NOTE: recipe glibc-2.39+git-r0: task do_create_spdx_setscene: Started
NOTE: recipe groff-native-1.23.0-r0: task do_recipe_qa_setscene: Started
NOTE: recipe glibc-2.39+git-r0: task do_create_spdx_setscene: Succeeded
NOTE: Running setscene task 280 of 299 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/gcc/gcc-cross_13.2.bb:do_create_spdx_setscene)
NOTE: Running setscene task 282 of 299 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/gcc/gcc-cross_13.2.bb:do_populate_sysroot_setscene)
NOTE: recipe groff-native-1.23.0-r0: task do_recipe_qa_setscene: Succeeded
NOTE: recipe gcc-cross-x86_64-13.2.0-r0: task do_create_spdx_setscene: Started
NOTE: recipe gcc-cross-x86_64-13.2.0-r0: task do_populate_sysroot_setscene: Started
NOTE: recipe nasm-2.16.02-r0: task do_unpack: Succeeded
NOTE: recipe gcc-cross-x86_64-13.2.0-r0: task do_create_spdx_setscene: Succeeded
NOTE: Running task 780 of 909 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/nasm/nasm_2.16.02.bb:do_patch)
NOTE: recipe nasm-2.16.02-r0: task do_patch: Started
NOTE: recipe nasm-2.16.02-r0: task do_patch: Succeeded
NOTE: Running task 815 of 909 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/nasm/nasm_2.16.02.bb:do_deploy_source_date_epoch)
NOTE: Running task 816 of 909 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/nasm/nasm_2.16.02.bb:do_populate_lic)
NOTE: recipe nasm-2.16.02-r0: task do_populate_lic: Started
NOTE: recipe nasm-2.16.02-r0: task do_deploy_source_date_epoch: Started
NOTE: recipe nasm-2.16.02-r0: task do_populate_lic: Succeeded
NOTE: Task /home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/nasm/nasm_2.16.02.bb:do_populate_lic unihash changed to e457c9258c27c3cb581a012c12317a98930d16c87aff76997e766885cd5d1fac
NOTE: recipe nasm-2.16.02-r0: task do_deploy_source_date_epoch: Succeeded
NOTE: Task /home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/nasm/nasm_2.16.02.bb:do_deploy_source_date_epoch unihash changed to 927e33c3a86335ad81d78940f7b4aa4ccbcc977197b13c3b2ee53a7125d894cd
NOTE: recipe gcc-cross-x86_64-13.2.0-r0: task do_populate_sysroot_setscene: Succeeded
NOTE: Running setscene task 294 of 299 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/binutils/binutils-cross_2.42.bb:do_populate_sysroot_setscene)
NOTE: Running setscene task 296 of 299 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/gcc/gcc-cross_13.2.bb:do_recipe_qa_setscene)
NOTE: recipe gcc-cross-x86_64-13.2.0-r0: task do_recipe_qa_setscene: Started
NOTE: recipe binutils-cross-x86_64-2.42-r0: task do_populate_sysroot_setscene: Started
NOTE: recipe gcc-cross-x86_64-13.2.0-r0: task do_recipe_qa_setscene: Succeeded
NOTE: recipe binutils-cross-x86_64-2.42-r0: task do_populate_sysroot_setscene: Succeeded
NOTE: Running setscene task 299 of 299 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/binutils/binutils-cross_2.42.bb:do_recipe_qa_setscene)
NOTE: recipe binutils-cross-x86_64-2.42-r0: task do_recipe_qa_setscene: Started
NOTE: recipe binutils-cross-x86_64-2.42-r0: task do_recipe_qa_setscene: Succeeded
NOTE: Setscene tasks completed
NOTE: Running task 885 of 909 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/nasm/nasm_2.16.02.bb:do_prepare_recipe_sysroot)
NOTE: Running task 896 of 909 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/nasm/nasm_2.16.02.bb:do_collect_spdx_deps)
NOTE: recipe nasm-2.16.02-r0: task do_prepare_recipe_sysroot: Started
NOTE: recipe nasm-2.16.02-r0: task do_collect_spdx_deps: Started
NOTE: recipe nasm-2.16.02-r0: task do_prepare_recipe_sysroot: Succeeded
NOTE: Running task 897 of 909 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/nasm/nasm_2.16.02.bb:do_configure)
NOTE: recipe nasm-2.16.02-r0: task do_collect_spdx_deps: Succeeded
NOTE: recipe nasm-2.16.02-r0: task do_configure: Started
NOTE: recipe nasm-2.16.02-r0: task do_configure: Succeeded
NOTE: Running task 898 of 909 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/nasm/nasm_2.16.02.bb:do_compile)
NOTE: recipe nasm-2.16.02-r0: task do_compile: Started
Log data follows:
| DEBUG: Executing python function autotools_aclocals
| DEBUG: SITE files ['endian-little', 'common-linux', 'common-glibc', 'bit-64', 'x86_64-linux', 'common']
| DEBUG: Python function autotools_aclocals finished
| DEBUG: Executing shell function do_compile
| NOTE: make -j 16 -l 75
| /home/pokybuild/yocto-worker/auh/build/build/tmp/hosttools/mkdir -p stdlib nasmlib output asm disasm x86 common macros win test doc nsis
| make nasm ndisasm
| make[1]: Entering directory '/home/pokybuild/yocto-worker/auh/build/build/tmp/work/core2-64-poky-linux/nasm/2.16.02/nasm-2.16.02'
| perl -I./perllib -I. ./tools/unconfig.pl \
| '.' config/config.h.in config/unconfig.h
| Can't open perl script "./tools/unconfig.pl": No such file or directory
| make[1]: *** [Makefile:217: config/unconfig.h] Error 2
| make[1]: Leaving directory '/home/pokybuild/yocto-worker/auh/build/build/tmp/work/core2-64-poky-linux/nasm/2.16.02/nasm-2.16.02'
| make: *** [Makefile:174: all] Error 2
| ERROR: oe_runmake failed
| WARNING: /home/pokybuild/yocto-worker/auh/build/build/tmp/work/core2-64-poky-linux/nasm/2.16.02/temp/run.do_compile.1017687:182 exit 1 from 'exit 1'
| WARNING: Backtrace (BB generated script):
| #1: bbfatal_log, /home/pokybuild/yocto-worker/auh/build/build/tmp/work/core2-64-poky-linux/nasm/2.16.02/temp/run.do_compile.1017687, line 182
| #2: die, /home/pokybuild/yocto-worker/auh/build/build/tmp/work/core2-64-poky-linux/nasm/2.16.02/temp/run.do_compile.1017687, line 166
| #3: oe_runmake, /home/pokybuild/yocto-worker/auh/build/build/tmp/work/core2-64-poky-linux/nasm/2.16.02/temp/run.do_compile.1017687, line 161
| #4: autotools_do_compile, /home/pokybuild/yocto-worker/auh/build/build/tmp/work/core2-64-poky-linux/nasm/2.16.02/temp/run.do_compile.1017687, line 156
| #5: do_compile, /home/pokybuild/yocto-worker/auh/build/build/tmp/work/core2-64-poky-linux/nasm/2.16.02/temp/run.do_compile.1017687, line 151
| #6: main, /home/pokybuild/yocto-worker/auh/build/build/tmp/work/core2-64-poky-linux/nasm/2.16.02/temp/run.do_compile.1017687, line 195
NOTE: recipe nasm-2.16.02-r0: task do_compile: Failed
NOTE: Tasks Summary: Attempted 898 tasks of which 889 didn't need to be rerun and 1 failed.
NOTE: Writing buildhistory
NOTE: Writing buildhistory took: 2 seconds
NOTE: The errors for this build are stored in /home/pokybuild/yocto-worker/auh/build/build/tmp/log/error-report/error_report_20240415184327.txt
You can send the errors to a reports server by running:
send-error-report /home/pokybuild/yocto-worker/auh/build/build/tmp/log/error-report/error_report_20240415184327.txt [-s server]
NOTE: The contents of these logs will be posted in public if you use the above command with the default server. Please ensure you remove any identifying or proprietary information when prompted before sending.
Summary: 1 task failed:
/home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/nasm/nasm_2.16.02.bb:do_compile
Summary: There were 2 ERROR messages, returning a non-zero exit code.
ERROR: nasm-2.16.02-r0 do_compile: oe_runmake failed
ERROR: nasm-2.16.02-r0 do_compile: ExecutionError('/home/pokybuild/yocto-worker/auh/build/build/tmp/work/core2-64-poky-linux/nasm/2.16.02/temp/run.do_compile.1017687', 1, None, None)
ERROR: Logfile of failure stored in: /home/pokybuild/yocto-worker/auh/build/build/tmp/work/core2-64-poky-linux/nasm/2.16.02/temp/log.do_compile.1017687
ERROR: Task (/home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/nasm/nasm_2.16.02.bb:do_compile) failed with exit code '1'
[-- Attachment #3: 0001-nasm-upgrade-2.16.01-2.16.02.patch --]
[-- Type: application/octet-stream, Size: 5552 bytes --]
From afa077eeb510c7f34122871056cadc34957c130d Mon Sep 17 00:00:00 2001
From: Upgrade Helper <auh@yoctoproject.org>
Date: Mon, 15 Apr 2024 18:43:56 +0000
Subject: [PATCH] nasm: upgrade 2.16.01 -> 2.16.02
---
.../nasm/nasm/0001-stdlib-Add-strlcat.patch | 17 ++++++++---------
.../nasm/0002-Add-debug-prefix-map-option.patch | 9 ++++-----
.../nasm/{nasm_2.16.01.bb => nasm_2.16.02.bb} | 2 +-
3 files changed, 13 insertions(+), 15 deletions(-)
rename meta/recipes-devtools/nasm/{nasm_2.16.01.bb => nasm_2.16.02.bb} (88%)
diff --git a/meta/recipes-devtools/nasm/nasm/0001-stdlib-Add-strlcat.patch b/meta/recipes-devtools/nasm/nasm/0001-stdlib-Add-strlcat.patch
index 1b8e947c56..58da282dee 100644
--- a/meta/recipes-devtools/nasm/nasm/0001-stdlib-Add-strlcat.patch
+++ b/meta/recipes-devtools/nasm/nasm/0001-stdlib-Add-strlcat.patch
@@ -1,4 +1,4 @@
-From 680220e772dfa381829983fa73b915416f676894 Mon Sep 17 00:00:00 2001
+From 5849006f70cfa78f4eb0b3f292681c54670ae781 Mon Sep 17 00:00:00 2001
From: Joshua Watt <JPEWhacker@gmail.com>
Date: Tue, 19 Nov 2019 12:47:30 -0600
Subject: [PATCH] stdlib: Add strlcat
@@ -7,7 +7,6 @@ Adds strlcat which can be used to safely concatenate strings
Upstream-Status: Submitted [https://bugzilla.nasm.us/show_bug.cgi?id=3392635]
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
-
---
Makefile.in | 2 +-
configure.ac | 2 ++
@@ -17,10 +16,10 @@ Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
create mode 100644 stdlib/strlcat.c
diff --git a/Makefile.in b/Makefile.in
-index b85ebee..045fabe 100644
+index 68dd8f1..54abfbd 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -104,7 +104,7 @@ PROGOBJ = $(NASM) $(NDISASM)
+@@ -111,7 +111,7 @@ PROGOBJ = $(NASM) $(NDISASM)
PROGS = nasm$(X) ndisasm$(X)
LIBOBJ_NW = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \
@@ -30,10 +29,10 @@ index b85ebee..045fabe 100644
nasmlib/ver.$(O) \
nasmlib/alloc.$(O) nasmlib/asprintf.$(O) nasmlib/errfile.$(O) \
diff --git a/configure.ac b/configure.ac
-index 42cd198..e206338 100644
+index e30125b..8a800f1 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -236,6 +236,7 @@ PA_FUNC_SNPRINTF
+@@ -214,6 +214,7 @@ PA_FUNC_SNPRINTF
PA_FUNC_VSNPRINTF
AC_CHECK_FUNCS([strlcpy])
AC_CHECK_FUNCS([strrchrnul])
@@ -41,7 +40,7 @@ index 42cd198..e206338 100644
dnl These types are POSIX-specific, and Windows does it differently...
AC_CHECK_TYPES([struct _stati64])
-@@ -255,6 +256,7 @@ AC_CHECK_DECLS(strsep)
+@@ -233,6 +234,7 @@ AC_CHECK_DECLS(strsep)
AC_CHECK_DECLS(strlcpy)
AC_CHECK_DECLS(strnlen)
AC_CHECK_DECLS(strrchrnul)
@@ -50,10 +49,10 @@ index 42cd198..e206338 100644
dnl Check for missing types
AC_TYPE_UINTPTR_T
diff --git a/include/compiler.h b/include/compiler.h
-index 407c160..b64da6a 100644
+index b95b1a2..eb5b984 100644
--- a/include/compiler.h
+++ b/include/compiler.h
-@@ -169,6 +169,10 @@ size_t strlcpy(char *, const char *, size_t);
+@@ -171,6 +171,10 @@ size_t strlcpy(char *, const char *, size_t);
char *strrchrnul(const char *, int);
#endif
diff --git a/meta/recipes-devtools/nasm/nasm/0002-Add-debug-prefix-map-option.patch b/meta/recipes-devtools/nasm/nasm/0002-Add-debug-prefix-map-option.patch
index 84fcca0fe1..eecb2ff5b9 100644
--- a/meta/recipes-devtools/nasm/nasm/0002-Add-debug-prefix-map-option.patch
+++ b/meta/recipes-devtools/nasm/nasm/0002-Add-debug-prefix-map-option.patch
@@ -1,4 +1,4 @@
-From e28c8883050d34d18ee2d66dfeece51e13adb6d5 Mon Sep 17 00:00:00 2001
+From 9c971e6986e0792a0aacd3fb94b9c8b9ee9f6b77 Mon Sep 17 00:00:00 2001
From: Joshua Watt <JPEWhacker@gmail.com>
Date: Tue, 19 Nov 2019 13:12:17 -0600
Subject: [PATCH] Add --debug-prefix-map option
@@ -9,7 +9,6 @@ be built in a reproducible manner regardless of the build directory.
Upstream-Status: Submitted [https://bugzilla.nasm.us/show_bug.cgi?id=3392635]
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
-
---
asm/nasm.c | 24 ++++++++++++++++++++++++
include/nasmlib.h | 9 +++++++++
@@ -27,7 +26,7 @@ Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
create mode 100644 test/elfdebugprefix.asm
diff --git a/asm/nasm.c b/asm/nasm.c
-index 76c70f6..08ff119 100644
+index 97d926f..e013c75 100644
--- a/asm/nasm.c
+++ b/asm/nasm.c
@@ -939,6 +939,7 @@ enum text_options {
@@ -83,10 +82,10 @@ index 76c70f6..08ff119 100644
fprintf(out, " %-20s %s\n",
diff --git a/include/nasmlib.h b/include/nasmlib.h
-index 87a7fc6..a3e5144 100644
+index fdfb9a9..d0d1194 100644
--- a/include/nasmlib.h
+++ b/include/nasmlib.h
-@@ -250,10 +250,19 @@ int64_t readstrnum(char *str, int length, bool *warn);
+@@ -281,10 +281,19 @@ int numstr(char *buf, size_t buflen, uint64_t n,
*/
int32_t seg_alloc(void);
diff --git a/meta/recipes-devtools/nasm/nasm_2.16.01.bb b/meta/recipes-devtools/nasm/nasm_2.16.02.bb
similarity index 88%
rename from meta/recipes-devtools/nasm/nasm_2.16.01.bb
rename to meta/recipes-devtools/nasm/nasm_2.16.02.bb
index 219cc49360..8aade10f7b 100644
--- a/meta/recipes-devtools/nasm/nasm_2.16.01.bb
+++ b/meta/recipes-devtools/nasm/nasm_2.16.02.bb
@@ -10,7 +10,7 @@ SRC_URI = "http://www.nasm.us/pub/nasm/releasebuilds/${PV}/nasm-${PV}.tar.bz2 \
file://0002-Add-debug-prefix-map-option.patch \
"
-SRC_URI[sha256sum] = "35b6ad2ee048d41c4779f073f3efca7762a822b7d2d4ef4e8df24cf65747bb2e"
+SRC_URI[sha256sum] = "188d7ad38f90cb05c53daaa288eaa1eb40a8ad32eccb65e8b64ffe74f44d6f91"
EXTRA_AUTORECONF:append = " -I autoconf/m4"
--
2.42.0
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2024-04-16 6:14 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-16 6:13 [AUH] nasm: upgrading to 2.16.02 FAILED auh
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).