diff options
author | 2019-02-23 11:14:22 +0000 | |
---|---|---|
committer | 2019-02-23 11:16:01 +0000 | |
commit | 267893ecb08ac52f35cdc8c7aa21a5f9643e4fca (patch) | |
tree | c43ee68161cef47d87720fc70c7c425e00af98dc /dev-lang/nasm/files/nasm-2.14-default-path-BR-3392529.patch | |
parent | sys-fs/xfsprogs: Removed old. (diff) | |
download | gentoo-267893ecb08ac52f35cdc8c7aa21a5f9643e4fca.tar.gz gentoo-267893ecb08ac52f35cdc8c7aa21a5f9643e4fca.tar.bz2 gentoo-267893ecb08ac52f35cdc8c7aa21a5f9643e4fca.zip |
dev-lang/nasm: drop old
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'dev-lang/nasm/files/nasm-2.14-default-path-BR-3392529.patch')
-rw-r--r-- | dev-lang/nasm/files/nasm-2.14-default-path-BR-3392529.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/dev-lang/nasm/files/nasm-2.14-default-path-BR-3392529.patch b/dev-lang/nasm/files/nasm-2.14-default-path-BR-3392529.patch deleted file mode 100644 index 57cbb741505a..000000000000 --- a/dev-lang/nasm/files/nasm-2.14-default-path-BR-3392529.patch +++ /dev/null @@ -1,41 +0,0 @@ -https://bugzilla.nasm.us/show_bug.cgi?id=3392529 -https://bugs.gentoo.org/670944 - -From 7b6371b9d35705ee3800082ca245f8dd289bb216 Mon Sep 17 00:00:00 2001 -From: "H. Peter Anvin (Intel)" <hpa@zytor.com> -Date: Tue, 20 Nov 2018 10:56:57 -0800 -Subject: [PATCH] BR 3392529: if the default output name is the same as input - -> nasm.out - -If no output filename is specified, then a default filename is used -based on the input filename. If that ends up the *same* as the input -filename, change the output filename to "nasm.out". - -Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com> ---- - asm/nasm.c | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - ---- a/asm/nasm.c -+++ b/asm/nasm.c -@@ -514,9 +514,14 @@ int main(int argc, char **argv) - * is a preprocess mode, we're perfectly - * fine to output into stdout. - */ -- if (!outname) { -- if (!(operating_mode & OP_PREPROCESS)) -- outname = filename_set_extension(inname, ofmt->extension); -+ if (!outname && !(operating_mode & OP_PREPROCESS)) { -+ outname = filename_set_extension(inname, ofmt->extension); -+ if (!strcmp(outname, inname)) { -+ outname = "nasm.out"; -+ nasm_error(ERR_WARNING, -+ "default output file same as input, using `%s' for output\n", -+ inname, outname); -+ } - } - - depend_ptr = (depend_file || (operating_mode & OP_DEPEND)) --- -2.19.2 - |