diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-11-27 13:17:14 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-11-27 13:17:14 +0000 |
commit | b44896ea03d59328305f2dc8fb8987b21983cfb2 (patch) | |
tree | 79d011b3f463370ad56a3076c5fe0f6945fcbc3c /dev-util/kbuild/files | |
parent | a6f269cfc68657e7ab057411d29bf695822c011b (diff) |
gentoo auto-resync : 27:11:2022 - 13:17:13
Diffstat (limited to 'dev-util/kbuild/files')
-rw-r--r-- | dev-util/kbuild/files/kbuild-0.1.9998.3499-fix-CC.patch | 23 | ||||
-rw-r--r-- | dev-util/kbuild/files/kbuild-0.1.9998.3499-int-conversion.patch | 26 |
2 files changed, 49 insertions, 0 deletions
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3499-fix-CC.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3499-fix-CC.patch new file mode 100644 index 000000000000..7d7f1f7232eb --- /dev/null +++ b/dev-util/kbuild/files/kbuild-0.1.9998.3499-fix-CC.patch @@ -0,0 +1,23 @@ +A few files are compiled with gcc regardless of setting CC + +This file seems to do some guesswork, override it with CC if set + +Bug: https://bugs.gentoo.org/734302 + +--- a/kBuild/tools/GCC3.kmk ++++ b/kBuild/tools/GCC3.kmk +@@ -84,6 +84,14 @@ + TOOL_GCC3_CXX += -fmessage-length=0 + endif + ++ifneq ($(CC),) ++ TOOL_GCC3_CC = $(CC) ++ TOOL_GCC3_LD = $(CC) ++endif ++ifneq ($(AR),) ++ TOOL_GCC3_AR = $(AR) ++endif ++ + # General Properties used by kBuild + TOOL_GCC3_COBJSUFF ?= .o + TOOL_GCC3_CFLAGS ?= diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3499-int-conversion.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3499-int-conversion.patch new file mode 100644 index 000000000000..6afdeeb6e7a6 --- /dev/null +++ b/dev-util/kbuild/files/kbuild-0.1.9998.3499-int-conversion.patch @@ -0,0 +1,26 @@ +Fix int to pointer conversion for clang + +Note - this parameter was not actually used inside eval_buffer because of a define. + +Bug: https://bugs.gentoo.org/875449 + +--- a/src/kmk/loadapi.c ++++ b/src/kmk/loadapi.c +@@ -20,6 +20,8 @@ + #include "variable.h" + #include "dep.h" + ++#include <string.h> ++ + /* Allocate a buffer in our context, so we can free it. */ + char * + gmk_alloc (unsigned int len) +@@ -59,7 +61,7 @@ + install_variable_buffer (&pbuf, &plen); + + s = xstrdup (buffer); +- eval_buffer (s, flp IF_WITH_VALUE_LENGTH_PARAM (strlen (s) /** @todo suboptimal */)); ++ eval_buffer (s, flp IF_WITH_VALUE_LENGTH_PARAM (strchr (s, 0) /** @todo suboptimal */)); + free (s); + + restore_variable_buffer (pbuf, plen); |