diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /sys-block/open-iscsi/files | |
parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) |
gentoo resync : 25.08.2020
Diffstat (limited to 'sys-block/open-iscsi/files')
-rw-r--r-- | sys-block/open-iscsi/files/open-iscsi-2.0.876-Makefiles.patch | 61 | ||||
-rw-r--r-- | sys-block/open-iscsi/files/open-iscsi-2.0.878-gcc10-fno-common.patch | 107 |
2 files changed, 0 insertions, 168 deletions
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.876-Makefiles.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.876-Makefiles.patch deleted file mode 100644 index 2cfa43622853..000000000000 --- a/sys-block/open-iscsi/files/open-iscsi-2.0.876-Makefiles.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- a/usr/Makefile -+++ b/usr/Makefile -@@ -69,9 +69,9 @@ iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ - iscsistart.o statics.o - $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lrt $(ISCSI_LIB) - clean: -- rm -f *.o $(PROGRAMS) .depend $(LIBSYS) -+ $(RM) *.o $(PROGRAMS) .depend $(LIBSYS) - - depend: -- gcc $(CFLAGS) -M `ls *.c` > .depend -+ $(CC) $(CFLAGS) -M `ls *.c` > .depend - - -include .depend ---- a/utils/Makefile -+++ b/utils/Makefile -@@ -10,9 +10,9 @@ iscsi-iname: md5.o iscsi-iname.o - $(CC) $(CFLAGS) $(LDFLAGS) $^ $(DBM_LIB) -o $@ - - clean: -- rm -f *.o $(PROGRAMS) .depend -+ $(RM) *.o $(PROGRAMS) .depend - - depend: -- gcc $(CFLAGS) -M `ls *.c` > .depend -+ $(CC) $(CFLAGS) -M `ls *.c` > .depend - - -include .depend ---- a/utils/fwparam_ibft/Makefile -+++ b/utils/fwparam_ibft/Makefile -@@ -41,11 +41,11 @@ LDFLAGS += -L$(TOPDIR)/libopeniscsiusr -liscsiusr - all: $(OBJS) - - clean: -- rm -f *.o $(CLEANFILES) .depend -+ $(RM) *.o $(CLEANFILES) .depend - - $(OBJS): prom_parse.tab.h prom_parse.h fwparam_ibft.h - - depend: -- gcc $(CFLAGS) -M `ls *.c` > .depend -+ $(CC) $(CFLAGS) -M `ls *.c` > .depend - - -include .depend ---- a/utils/sysdeps/Makefile -+++ b/utils/sysdeps/Makefile -@@ -8,9 +8,9 @@ SYSDEPS_OBJS=sysdeps.o - all: $(SYSDEPS_OBJS) - - clean: -- rm -f *.o .depend -+ $(RM) *.o .depend - - depend: -- gcc $(CFLAGS) -M `ls *.c` > .depend -+ $(CC) $(CFLAGS) -M `ls *.c` > .depend - - -include .depend --- -2.16.2 - diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.878-gcc10-fno-common.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.878-gcc10-fno-common.patch deleted file mode 100644 index b61476555fb4..000000000000 --- a/sys-block/open-iscsi/files/open-iscsi-2.0.878-gcc10-fno-common.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 499a006a7d6bb154f9e1ab430e4c9e231ba6096a Mon Sep 17 00:00:00 2001 -From: Lee Duncan <lduncan@suse.com> -Date: Tue, 28 Jan 2020 16:36:56 -0800 -Subject: [PATCH] Updates to support gcc -fno-common option. - -This meant cleaning up the definition of some -global variables, so that they were only defined -in one place and refered to as external elsewhere. ---- - include/iscsi_err.h | 6 ++++-- - iscsiuio/configure.ac | 2 +- - iscsiuio/src/uip/uip.h | 4 ++-- - usr/iscsi_err.c | 2 ++ - usr/log.c | 1 + - usr/log.h | 2 +- - 6 files changed, 11 insertions(+), 6 deletions(-) - -diff --git a/include/iscsi_err.h b/include/iscsi_err.h -index ed000dd0..04a8723e 100644 ---- a/include/iscsi_err.h -+++ b/include/iscsi_err.h -@@ -4,7 +4,7 @@ - #ifndef _ISCSI_ERR_ - #define _ISCSI_ERR_ - --enum { -+enum iscsi_error_list { - ISCSI_SUCCESS = 0, - /* Generic error */ - ISCSI_ERR = 1, -@@ -73,7 +73,9 @@ enum { - - /* Always last. Indicates end of error code space */ - ISCSI_MAX_ERR_VAL, --} iscsi_err; -+}; -+ -+extern enum iscsi_error_list iscsi_err; - - extern void iscsi_err_print_msg(int err); - extern char *iscsi_err_to_str(int err); -diff --git a/iscsiuio/configure.ac b/iscsiuio/configure.ac -index b41df0ec..8099f09c 100644 ---- a/iscsiuio/configure.ac -+++ b/iscsiuio/configure.ac -@@ -78,7 +78,7 @@ AC_CONFIG_COMMANDS([default],[[ - else - echo 'char *build_date = "'`date`'";' > src/unix/build_date.c - fi -- echo 'char *build_date;'> src/unix/build_date.h -+ echo 'extern char *build_date;'> src/unix/build_date.h - ]],[[]]) - - AC_PREFIX_DEFAULT() -diff --git a/iscsiuio/src/uip/uip.h b/iscsiuio/src/uip/uip.h -index 1180ab50..9d9428a2 100644 ---- a/iscsiuio/src/uip/uip.h -+++ b/iscsiuio/src/uip/uip.h -@@ -70,8 +70,8 @@ struct uip_stack; - typedef u16_t uip_ip4addr_t[2]; - typedef u16_t uip_ip6addr_t[8]; - --const uip_ip6addr_t all_zeroes_addr6; --const uip_ip4addr_t all_zeroes_addr4; -+extern const uip_ip6addr_t all_zeroes_addr6; -+extern const uip_ip4addr_t all_zeroes_addr4; - - #define ETH_BUF(buf) ((struct uip_eth_hdr *)buf) - #define VLAN_ETH_BUF(buf) ((struct uip_vlan_eth_hdr *)buf) -diff --git a/usr/iscsi_err.c b/usr/iscsi_err.c -index 23c61fc3..4a057d57 100644 ---- a/usr/iscsi_err.c -+++ b/usr/iscsi_err.c -@@ -21,6 +21,8 @@ - #include "iscsi_err.h" - #include "log.h" - -+enum iscsi_error_list iscsi_err; -+ - static char *iscsi_err_msgs[] = { - /* 0 */ "", - /* 1 */ "unknown error", -diff --git a/usr/log.c b/usr/log.c -index f29b54b3..6e16e7ce 100644 ---- a/usr/log.c -+++ b/usr/log.c -@@ -33,6 +33,7 @@ - - char *log_name; - int log_level = 0; -+struct logarea *la = NULL; - - static int log_stop_daemon = 0; - static void (*log_func)(int prio, void *priv, const char *fmt, va_list ap); -diff --git a/usr/log.h b/usr/log.h -index 486a08ea..c548791e 100644 ---- a/usr/log.h -+++ b/usr/log.h -@@ -64,7 +64,7 @@ struct logarea { - union semun semarg; - }; - --struct logarea *la; -+extern struct logarea *la; - - extern int log_init(char *program_name, int size, - void (*func)(int prio, void *priv, const char *fmt, va_list ap), |