diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-01-04 01:27:12 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-01-04 01:27:12 +0000 |
commit | 3517852e3b8a68d1e997770fc0650c5053bafc6c (patch) | |
tree | 44068672445b1418489aed82de58df3c470289e7 /sys-devel/remake/files | |
parent | 0f15659d48c193027158492acb726297501202c5 (diff) |
gentoo resync : 04.01.2022
Diffstat (limited to 'sys-devel/remake/files')
-rw-r--r-- | sys-devel/remake/files/make-4.2.1-glob-v2.patch | 30 | ||||
-rw-r--r-- | sys-devel/remake/files/remake-4.2.1.1.4-fno-common.patch | 127 |
2 files changed, 0 insertions, 157 deletions
diff --git a/sys-devel/remake/files/make-4.2.1-glob-v2.patch b/sys-devel/remake/files/make-4.2.1-glob-v2.patch deleted file mode 100644 index e55a7790a3f6..000000000000 --- a/sys-devel/remake/files/make-4.2.1-glob-v2.patch +++ /dev/null @@ -1,30 +0,0 @@ -http://git.savannah.gnu.org/cgit/make.git/commit/?id=48c8a116a914a325a0497721f5d8b58d5bba34d4 - ---- make-4.2.1/configure 2016-06-11 01:03:21.000000000 +0200 -+++ make-4.2.1/configure 2016-06-11 01:03:21.000000000 +0200 -@@ -11481,10 +11481,9 @@ - #include <glob.h> - #include <fnmatch.h> - --#define GLOB_INTERFACE_VERSION 1 - #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 - # include <gnu-versions.h> --# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION -+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 - gnu glob - # endif - #endif ---- make-4.2.1/configure.ac 2016-06-06 14:27:31.000000000 +0200 -+++ make-4.2.1/configure.ac 2016-06-06 14:27:31.000000000 +0200 -@@ -399,10 +399,9 @@ - #include <glob.h> - #include <fnmatch.h> - --#define GLOB_INTERFACE_VERSION 1 - #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 - # include <gnu-versions.h> --# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION -+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 - gnu glob - # endif - #endif], diff --git a/sys-devel/remake/files/remake-4.2.1.1.4-fno-common.patch b/sys-devel/remake/files/remake-4.2.1.1.4-fno-common.patch deleted file mode 100644 index 4367bf9332b3..000000000000 --- a/sys-devel/remake/files/remake-4.2.1.1.4-fno-common.patch +++ /dev/null @@ -1,127 +0,0 @@ ---- a/dep.h -+++ b/dep.h -@@ -134,7 +134,7 @@ - struct goaldep *read_all_makefiles (const char **makefiles); - - /*! The chain of makefiles read by read_makefile. */ --struct goaldep *read_makefiles; -+extern struct goaldep *read_makefiles; - - void eval_buffer (char *buffer, const gmk_floc *floc); - enum update_status update_goal_chain (struct goaldep *goals); ---- a/globals.c -+++ b/globals.c -@@ -120,8 +120,6 @@ - of each job stay together. */ - int output_sync = OUTPUT_SYNC_NONE; - --const char *default_shell; -- - char *remote_description = 0; - - /* Remember the original value of the SHELL variable, from the environment. */ ---- a/globals.h -+++ b/globals.h -@@ -85,6 +85,12 @@ - extern bool b_debugger_preread; - - /* Remember the original value of the SHELL variable, from the environment. */ --struct variable shell_var; -+extern struct variable shell_var; -+ -+/**! The default value of SHELL and the shell that is used when issuing -+ commands on targets. -+*/ -+extern const char *default_shell; -+ - - #endif /*GLOBALS_H*/ ---- a/main.c -+++ b/main.c -@@ -40,6 +40,8 @@ - # include <fcntl.h> - #endif - -+struct goaldep *read_makefiles; -+ - extern void initialize_stopchar_map (); - - #if defined HAVE_WAITPID || defined HAVE_WAIT3 ---- a/main.h -+++ b/main.h -@@ -35,10 +35,5 @@ - /* is default_shell unixy? */ - extern int unixy_shell; - --/**! The default value of SHELL and the shell that is used when issuing -- commands on targets. --*/ --extern char *default_shell; -- - /*! Print version information. */ - extern void print_version (void); ---- a/make.h -+++ b/make.h -@@ -333,7 +333,7 @@ - #endif - #ifdef SET_STACK_SIZE - # include <sys/resource.h> --struct rlimit stack_limit; -+extern struct rlimit stack_limit; - #endif - - /* We have to have stdarg.h or varargs.h AND v*printf or doprnt to use ---- a/print.h -+++ b/print.h -@@ -39,7 +39,7 @@ - - /* Think of the below not as an enumeration but as #defines done in a - way that we'll be able to use the value in a gdb. */ --enum debug_print_enums_e { -+extern enum debug_print_enums_e { - MAX_STACK_SHOW = 1000, - } debug_print_enums1; - ---- a/variable.c -+++ b/variable.c -@@ -29,6 +29,7 @@ - #endif - #include "hash.h" - #include "main.h" -+#include "globals.h" - - /* Incremented every time we add or remove a global variable. */ - static unsigned long variable_changenum; ---- a/variable.h -+++ b/variable.h -@@ -115,7 +115,6 @@ - extern char *variable_buffer; - extern struct variable_set_list *current_variable_set_list; - extern struct variable *default_goal_var; --extern struct variable shell_var; - - /* expand.c */ - char *variable_buffer_output (char *ptr, const char *string, unsigned int length); ---- a/debugger/file2line.h -+++ b/debugger/file2line.h -@@ -19,7 +19,7 @@ - Boston, MA 02111-1307, USA. */ - #ifndef REMAKE_FILE2LINE - #define REMAKE_FILE2LINE --struct hash_table file2lines; -+extern struct hash_table file2lines; - - typedef enum { - F2L_TARGET, ---- a/debugger/file2line.c -+++ b/debugger/file2line.c -@@ -26,6 +26,8 @@ - #include "../rule.h" - #include "./file2line.h" - -+struct hash_table file2lines; -+ - unsigned long - file2lines_hash_1 (const void *key) - { - |