| 1 |
commit: 58cdacee8b9359ce9a5f75a6666c6e27c9c0689d |
| 2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
| 3 |
AuthorDate: Sat Jan 15 21:24:52 2022 +0000 |
| 4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 31 13:54:44 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58cdacee |
| 7 |
|
| 8 |
sci-libs/scotch: remove unused patch(es) |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 11 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/23815 |
| 13 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> |
| 14 |
|
| 15 |
sci-libs/scotch/files/scotch-6.0.4-as-needed.patch | 128 --------------------- |
| 16 |
.../scotch/files/scotch-6.0.4-flex-2.6.3-fix.patch | 33 ------ |
| 17 |
2 files changed, 161 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sci-libs/scotch/files/scotch-6.0.4-as-needed.patch b/sci-libs/scotch/files/scotch-6.0.4-as-needed.patch |
| 20 |
deleted file mode 100644 |
| 21 |
index 449449bec073..000000000000 |
| 22 |
--- a/sci-libs/scotch/files/scotch-6.0.4-as-needed.patch |
| 23 |
+++ /dev/null |
| 24 |
@@ -1,128 +0,0 @@ |
| 25 |
-diff -Nur scotch_6.0.4/src/check/Makefile scotch_6.0.4_patched/src/check/Makefile |
| 26 |
---- scotch_6.0.4/src/check/Makefile 2015-03-01 03:18:02.000000000 -0700 |
| 27 |
-+++ scotch_6.0.4_patched/src/check/Makefile 2015-07-17 15:15:58.447398954 -0600 |
| 28 |
-@@ -53,7 +53,7 @@ |
| 29 |
- $(CC) $(CFLAGS) $(CLIBFLAGS) -I$(SCOTCHINCLUDEDIR) -c $(<) -o $(@) |
| 30 |
- |
| 31 |
- %$(EXE) : %.c |
| 32 |
-- $(CC) $(CFLAGS) -I$(SCOTCHINCLUDEDIR) -L$(SCOTCHLIBDIR) $(<) -o $(@) $(SCOTCHLIBS) $(LDFLAGS) |
| 33 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -I$(SCOTCHINCLUDEDIR) -L$(SCOTCHLIBDIR) $(<) $(SCOTCHLIBS) $(LIBS) -o $(@) |
| 34 |
- |
| 35 |
- ## |
| 36 |
- ## Project rules. |
| 37 |
-diff -Nur scotch_6.0.4/src/esmumps/Makefile scotch_6.0.4_patched/src/esmumps/Makefile |
| 38 |
---- scotch_6.0.4/src/esmumps/Makefile 2015-03-13 17:32:06.000000000 -0600 |
| 39 |
-+++ scotch_6.0.4_patched/src/esmumps/Makefile 2015-07-17 15:17:47.389600699 -0600 |
| 40 |
-@@ -44,7 +44,7 @@ |
| 41 |
- $(CC) $(CFLAGS) $(CLIBFLAGS) -I$(includedir) -c $(<) -o $(@) |
| 42 |
- |
| 43 |
- %$(EXE) : %.c |
| 44 |
-- $(CC) $(CFLAGS) -I$(includedir) $(<) -o $(@) -L$(libdir) $(LDFLAGS) -L. -l$(ESMUMPSLIB) -l$(SCOTCHLIB) -lscotch -l$(SCOTCHLIB)errexit -lm |
| 45 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) $(<) -L$(libdir) -L. -l$(ESMUMPSLIB) -l$(SCOTCHLIB) -lscotch -l$(SCOTCHLIB)errexit $(LIBS) -o $(@) |
| 46 |
- |
| 47 |
- ## |
| 48 |
- ## Project rules. |
| 49 |
-@@ -57,7 +57,7 @@ |
| 50 |
- libesmumps$(LIB) \ |
| 51 |
- main_esmumps$(EXE) |
| 52 |
- |
| 53 |
--ptscotch : clean |
| 54 |
-+ptscotch : clean common.h |
| 55 |
- $(MAKE) CFLAGS="$(CFLAGS) -DSCOTCH_PTSCOTCH" CC="$(CCP)" SCOTCHLIB=ptscotch ESMUMPSLIB=ptesmumps \ |
| 56 |
- libesmumps$(LIB) \ |
| 57 |
- main_esmumps$(EXE) |
| 58 |
-@@ -160,6 +160,6 @@ |
| 59 |
- order.h \ |
| 60 |
- symbol.h \ |
| 61 |
- esmumps.h \ |
| 62 |
-- lib$(ESMUMPSLIB)$(LIB) \ |
| 63 |
-+ libesmumps$(LIB) \ |
| 64 |
- $(libdir)/lib$(SCOTCHLIB)$(LIB) \ |
| 65 |
- $(libdir)/lib$(SCOTCHLIB)errexit$(LIB) |
| 66 |
-diff -Nur scotch_6.0.4/src/libscotch/Makefile scotch_6.0.4_patched/src/libscotch/Makefile |
| 67 |
---- scotch_6.0.4/src/libscotch/Makefile 2014-09-23 13:28:28.000000000 -0600 |
| 68 |
-+++ scotch_6.0.4_patched/src/libscotch/Makefile 2015-07-17 15:19:17.320116484 -0600 |
| 69 |
-@@ -43,7 +43,7 @@ |
| 70 |
- $(CC) $(CFLAGS) $(CLIBFLAGS) -c $(<) -o $(@) |
| 71 |
- |
| 72 |
- %$(EXE) : %.c |
| 73 |
-- $(CC) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS) |
| 74 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) $(LIBS) -o $(@) |
| 75 |
- |
| 76 |
- ## |
| 77 |
- ## Project rules. |
| 78 |
-@@ -2937,14 +2937,14 @@ |
| 79 |
- mapping.h \ |
| 80 |
- order.h \ |
| 81 |
- parser.h |
| 82 |
-- $(CCD) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS) |
| 83 |
-+ $(CCD) $(CFLAGS) $(LDFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) $(LIBS) -o $(@) |
| 84 |
- |
| 85 |
- ptdummysizes$(EXE) : dummysizes.c \ |
| 86 |
- module.h \ |
| 87 |
- common.h \ |
| 88 |
- dgraph.h \ |
| 89 |
- dorder.h |
| 90 |
-- $(CCD) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS) |
| 91 |
-+ $(CCD) $(CFLAGS) $(LDFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) $(LIBS) -o $(@) |
| 92 |
- |
| 93 |
- scotch.h : dummysizes$(EXE) \ |
| 94 |
- library.h |
| 95 |
-diff -Nur scotch_6.0.4/src/libscotchmetis/Makefile scotch_6.0.4_patched/src/libscotchmetis/Makefile |
| 96 |
---- scotch_6.0.4/src/libscotchmetis/Makefile 2011-09-06 10:46:48.000000000 -0600 |
| 97 |
-+++ scotch_6.0.4_patched/src/libscotchmetis/Makefile 2015-07-17 15:19:42.648698497 -0600 |
| 98 |
-@@ -44,7 +44,7 @@ |
| 99 |
- $(CC) $(CFLAGS) $(CLIBFLAGS) -I$(includedir) -I../libscotch -c $(<) -o $(@) |
| 100 |
- |
| 101 |
- %$(EXE) : %.c |
| 102 |
-- $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) $(LDFLAGS) |
| 103 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) -o $(@) |
| 104 |
- |
| 105 |
- ## |
| 106 |
- ## Project rules. |
| 107 |
-diff -Nur scotch_6.0.4/src/scotch/Makefile scotch_6.0.4_patched/src/scotch/Makefile |
| 108 |
---- scotch_6.0.4/src/scotch/Makefile 2015-02-24 15:39:44.000000000 -0700 |
| 109 |
-+++ scotch_6.0.4_patched/src/scotch/Makefile 2015-07-17 15:22:25.275015105 -0600 |
| 110 |
-@@ -41,13 +41,13 @@ |
| 111 |
- include ../Makefile.inc |
| 112 |
- |
| 113 |
- %$(EXE) : %$(OBJ) |
| 114 |
-- $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) -l$(SCOTCHLIB) -lscotch -l$(SCOTCHLIB)errexit $(LDFLAGS) |
| 115 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) -l$(SCOTCHLIB) -lscotch -l$(SCOTCHLIB)errexit $(LIBS) -o $(@) |
| 116 |
- |
| 117 |
- %$(OBJ) : %.c |
| 118 |
- $(CC) $(CFLAGS) -I$(includedir) -I../libscotch -c $(<) -o $(@) |
| 119 |
- |
| 120 |
- %$(EXE) : %.c |
| 121 |
-- $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) -l$(SCOTCHLIB) -lscotch -l$(SCOTCHLIB)errexit $(LDFLAGS) |
| 122 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) -l$(SCOTCHLIB) -lscotch -l$(SCOTCHLIB)errexit $(LIBS) -o $(@) |
| 123 |
- |
| 124 |
- ## |
| 125 |
- ## Project rules. |
| 126 |
-@@ -209,7 +209,7 @@ |
| 127 |
- $(libdir)/libptscotch$(LIB) \ |
| 128 |
- $(libdir)/libptscotcherrexit$(LIB) \ |
| 129 |
- dgmap.h |
| 130 |
-- $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -o $(@) -L$(libdir) -lptscotch -lscotch -lptscotcherrexit $(LDFLAGS) |
| 131 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -L$(libdir) -lptscotch -lscotch -lptscotcherrexit $(LIBS) -o $(@) |
| 132 |
- |
| 133 |
- dgscat$(EXE) : dgscat.c \ |
| 134 |
- ../libscotch/module.h \ |
| 135 |
-@@ -321,7 +321,7 @@ |
| 136 |
- gout_o.c \ |
| 137 |
- $(includedir)/scotch.h \ |
| 138 |
- $(libdir)/libscotch$(LIB) |
| 139 |
-- $(CC) $(CFLAGS) -I../libscotch -I$(includedir) gout_c.c gout_o.c -o $(@) -L$(libdir) -lscotch -lscotcherrexit $(LDFLAGS) |
| 140 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -I../libscotch -I$(includedir) gout_c.c gout_o.c -L$(libdir) -lscotch -lscotcherrexit $(LIBS) -o $(@) |
| 141 |
- |
| 142 |
- gpart$(EXE) : gmap.c \ |
| 143 |
- ../libscotch/module.h \ |
| 144 |
-@@ -330,7 +330,7 @@ |
| 145 |
- $(libdir)/libscotch$(LIB) \ |
| 146 |
- $(libdir)/libscotcherrexit$(LIB) \ |
| 147 |
- gmap.h |
| 148 |
-- $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -o $(@) -L$(libdir) -lscotch -lscotcherrexit $(LDFLAGS) |
| 149 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -L$(libdir) -lscotch -lscotcherrexit $(LIBS) -o $(@) |
| 150 |
- |
| 151 |
- gscat$(EXE) : gscat.c \ |
| 152 |
- ../libscotch/module.h \ |
| 153 |
|
| 154 |
diff --git a/sci-libs/scotch/files/scotch-6.0.4-flex-2.6.3-fix.patch b/sci-libs/scotch/files/scotch-6.0.4-flex-2.6.3-fix.patch |
| 155 |
deleted file mode 100644 |
| 156 |
index c1301f57076a..000000000000 |
| 157 |
--- a/sci-libs/scotch/files/scotch-6.0.4-flex-2.6.3-fix.patch |
| 158 |
+++ /dev/null |
| 159 |
@@ -1,33 +0,0 @@ |
| 160 |
---- scotch_6.0.4/src/libscotch/parser_ll.l.old 2017-01-02 08:42:41.216249106 -0800 |
| 161 |
-+++ scotch-6.0.4-r1/work/scotch_6.0.4/src/libscotch/parser_ll.l 2017-01-02 09:50:14.572579444 -0800 |
| 162 |
-@@ -84,20 +84,29 @@ |
| 163 |
- #endif /* X_OSDOS */ |
| 164 |
- |
| 165 |
- #ifdef FLEX_SCANNER |
| 166 |
- #define YY_ALWAYS_INTERACTIVE 1 /* Set the parser as interactive and read one char at a time */ |
| 167 |
- #define YY_INPUT(buf,result,max_size) { int c = stratParserInput (); result = (c == 0) ? YY_NULL : ((buf)[0] = c, 1); } |
| 168 |
-+ |
| 169 |
-+# if YY_FLEX_MAJOR_VERSION > 2 || \ |
| 170 |
-+ YY_FLEX_MAJOR_VERSION == 2 && YY_FLEX_MINOR_VERSION > 6 || \ |
| 171 |
-+ YY_FLEX_MAJOR_VERSION == 2 && YY_FLEX_MINOR_VERSION == 6 && YY_FLEX_SUBMINOR_VERSION >= 3 |
| 172 |
-+ int yywrap() { return 1; } |
| 173 |
-+# else |
| 174 |
-+# define yywrap() (1) /* Always return end-of-file on end-of-string */ |
| 175 |
-+# endif |
| 176 |
-+ |
| 177 |
- #else /* FLEX_SCANNER */ |
| 178 |
- #undef getc /* Redirect I/O functions */ |
| 179 |
- #define getc yygetc |
| 180 |
- #undef yygetc |
| 181 |
- #define yygetc(stream) stratParserInput () |
| 182 |
-+#define yywrap() (1) /* Always return end-of-file on end-of-string */ |
| 183 |
- #endif /* FLEX_SCANNER */ |
| 184 |
- |
| 185 |
- #define YY_NO_UNPUT /* No prototype for yyunput as not defined */ |
| 186 |
- #define YY_SKIP_YYWRAP /* No prototype for yywrap as defined as macro */ |
| 187 |
--#define yywrap() (1) /* Always return end-of-file on end-of-string */ |
| 188 |
- |
| 189 |
- /* |
| 190 |
- ** The static variables. |
| 191 |
- */ |
| 192 |
- |
Archives