diff options
| author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 20:05:37 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 04:26:31 +0300 |
| commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
| tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /poky/meta/recipes-devtools/nasm | |
| parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
| download | openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz | |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-devtools/nasm')
| -rw-r--r-- | poky/meta/recipes-devtools/nasm/nasm/0001-asmlib-Drop-pure-function-attribute-from-seg_init.patch | 27 | ||||
| -rw-r--r-- | poky/meta/recipes-devtools/nasm/nasm_2.13.03.bb | 30 |
2 files changed, 57 insertions, 0 deletions
diff --git a/poky/meta/recipes-devtools/nasm/nasm/0001-asmlib-Drop-pure-function-attribute-from-seg_init.patch b/poky/meta/recipes-devtools/nasm/nasm/0001-asmlib-Drop-pure-function-attribute-from-seg_init.patch new file mode 100644 index 000000000..12ae3a94d --- /dev/null +++ b/poky/meta/recipes-devtools/nasm/nasm/0001-asmlib-Drop-pure-function-attribute-from-seg_init.patch @@ -0,0 +1,27 @@ +From 77c3a77210d8ca8b94e999c711156e984a8dc737 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 31 Mar 2018 11:05:33 -0700 +Subject: [PATCH] asmlib: Drop pure function attribute from seg_init + +seg_init returns void, so it is impure function + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Submitted + + include/nasmlib.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/nasmlib.h b/include/nasmlib.h +index 79e866b..b80b7e2 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); ++void seg_init(void); + int32_t pure_func seg_alloc(void); + + /* diff --git a/poky/meta/recipes-devtools/nasm/nasm_2.13.03.bb b/poky/meta/recipes-devtools/nasm/nasm_2.13.03.bb new file mode 100644 index 000000000..236d7e5e3 --- /dev/null +++ b/poky/meta/recipes-devtools/nasm/nasm_2.13.03.bb @@ -0,0 +1,30 @@ +SUMMARY = "General-purpose x86 assembler" +SECTION = "devel" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=90904486f8fbf1861cf42752e1a39efe" + +SRC_URI = "http://www.nasm.us/pub/nasm/releasebuilds/${PV}/nasm-${PV}.tar.bz2 \ + file://0001-asmlib-Drop-pure-function-attribute-from-seg_init.patch \ + " + +SRC_URI[md5sum] = "0c581d482f39d5111879ca9601938f74" +SRC_URI[sha256sum] = "63ec86477ad3f0f6292325fd89e1d93aea2e2fd490070863f17d48f7cd387011" + +inherit autotools-brokensep + +do_configure_prepend () { + if [ -f ${S}/aclocal.m4 ] && [ ! -f ${S}/acinclude.m4 ]; then + mv ${S}/aclocal.m4 ${S}/acinclude.m4 + fi +} + +do_install() { + install -d ${D}${bindir} + install -d ${D}${mandir}/man1 + + oe_runmake 'INSTALLROOT=${D}' install +} + +BBCLASSEXTEND = "native" + +DEPENDS = "groff-native" |