[gentoo-commits] repo/gentoo:master commit in: dev-lang/tcc/files/

[gentoo-commits] repo/gentoo:master commit in: dev-lang/tcc/files/

[Austin English]

commit:     8c0a42423c236118fbca346c5f9be770913c766b
Author:     Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 18 20:25:15 2017 +0000
Commit:     Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Mon Dec 18 21:06:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c0a4242

dev-lang/tcc: fix patch filenames

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 dev-lang/tcc/files/clang.patch  | 34 +++++++++++++++++-----------------
 dev-lang/tcc/files/linker.patch | 34 +++++++++++++++++-----------------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/dev-lang/tcc/files/clang.patch b/dev-lang/tcc/files/clang.patch
index 8304470e368..01cc72335fd 100644
--- a/dev-lang/tcc/files/clang.patch
+++ b/dev-lang/tcc/files/clang.patch
@@ -1,18 +1,18 @@
-# Fixes the default linker options for portage
-# Upstream commit ba286136bf8e48c71ffd6c2fd9ce97e64a6eeeb1
-
-diff --git a/libtcc.c b/libtcc.c
-index 127806f..dc78643 100644
---- a/libtcc.c
-+++ b/libtcc.c
-@@ -1560,6 +1560,10 @@ static int tcc_set_linker(TCCState *s, const char *option)
-             } else
-                 goto err;
+# Fix compiling tcc with clang. Upstream commit 73ac39c317a20accaf3b25ba833deee0c2e2849f
+# Gentoo bug #502452
+diff --git a/lib/libtcc1.c b/lib/libtcc1.c
+index cf9babf..b46fb5d 100644
+--- a/lib/libtcc1.c
++++ b/lib/libtcc1.c
+@@ -647,6 +647,11 @@ struct __va_list_struct {
+     char *reg_save_area;
+ };
  
-+        } else if (link_option(option, "as-needed", &p)) {
-+            ignoring = 1;
-+        } else if (link_option(option, "O", &p)) {
-+            ignoring = 1;
-         } else if (link_option(option, "rpath=", &p)) {
-             s->rpath = copy_linker_arg(p);
-         } else if (link_option(option, "section-alignment=", &p)) {
++#undef __va_start
++#undef __va_arg
++#undef __va_copy
++#undef __va_end
++
+ void *__va_start(void *fp)
+ {
+     struct __va_list_struct *ap =

diff --git a/dev-lang/tcc/files/linker.patch b/dev-lang/tcc/files/linker.patch
index 01cc72335fd..8304470e368 100644
--- a/dev-lang/tcc/files/linker.patch
+++ b/dev-lang/tcc/files/linker.patch
@@ -1,18 +1,18 @@
-# Fix compiling tcc with clang. Upstream commit 73ac39c317a20accaf3b25ba833deee0c2e2849f
-# Gentoo bug #502452
-diff --git a/lib/libtcc1.c b/lib/libtcc1.c
-index cf9babf..b46fb5d 100644
---- a/lib/libtcc1.c
-+++ b/lib/libtcc1.c
-@@ -647,6 +647,11 @@ struct __va_list_struct {
-     char *reg_save_area;
- };
+# Fixes the default linker options for portage
+# Upstream commit ba286136bf8e48c71ffd6c2fd9ce97e64a6eeeb1
+
+diff --git a/libtcc.c b/libtcc.c
+index 127806f..dc78643 100644
+--- a/libtcc.c
++++ b/libtcc.c
+@@ -1560,6 +1560,10 @@ static int tcc_set_linker(TCCState *s, const char *option)
+             } else
+                 goto err;
  
-+#undef __va_start
-+#undef __va_arg
-+#undef __va_copy
-+#undef __va_end
-+
- void *__va_start(void *fp)
- {
-     struct __va_list_struct *ap =
++        } else if (link_option(option, "as-needed", &p)) {
++            ignoring = 1;
++        } else if (link_option(option, "O", &p)) {
++            ignoring = 1;
+         } else if (link_option(option, "rpath=", &p)) {
+             s->rpath = copy_linker_arg(p);
+         } else if (link_option(option, "section-alignment=", &p)) {