summaryrefslogtreecommitdiff
path: root/sci-libs/scotch
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-02-02 01:39:05 +0000
committerV3n3RiX <venerix@koprulu.sector>2022-02-02 01:39:05 +0000
commitfcc5224904648a8e6eb528d7603154160a20022f (patch)
tree3bfce096b38a9cea8eed13fc70c1526c456e9abd /sci-libs/scotch
parent2fd57282f0262ca084e05b0f2c63fbada395d02b (diff)
gentoo resync : 02.02.2022
Diffstat (limited to 'sci-libs/scotch')
-rw-r--r--sci-libs/scotch/Manifest2
-rw-r--r--sci-libs/scotch/files/scotch-6.0.4-as-needed.patch128
-rw-r--r--sci-libs/scotch/files/scotch-6.0.4-flex-2.6.3-fix.patch33
3 files changed, 0 insertions, 163 deletions
diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest
index 8e66359d08ff..e991a15790f1 100644
--- a/sci-libs/scotch/Manifest
+++ b/sci-libs/scotch/Manifest
@@ -1,5 +1,3 @@
-AUX scotch-6.0.4-as-needed.patch 6168 BLAKE2B 5b008f9035379d91cd8ffde6d64a22b021fd5070a106592abefac78a0522282fbd0dd7f8b439b0452c0d15c57891c9d4eb4415120ea95788fe74e149e6069fc3 SHA512 cd58425866a1726f776318e3792e72d7250686f033ceeda57f0f007fdb4c5e1c2bc3c9346630e39f16023f2a3d70cd106b357c21e5406a1c44b49a316655d8dd
-AUX scotch-6.0.4-flex-2.6.3-fix.patch 1623 BLAKE2B 9d86299eb543147ce7e736779b05c3b8113c12b54fbaf46a2b99a6cef2b670fc1b448d059858f954f37acf72c7c268acf1793de89f193d02f8b61d3f5d4ca1e5 SHA512 1a2a5a363e1dd59e1cced76928da15132cd1c8af57d6d0ad0eec04e02d029c6ae275e202e8c87bc65ff0188f41e379865829b5b61e4f1e44a885d48c4462b09e
DIST scotch-v6.1.0.tar.gz 6292006 BLAKE2B 5b76b01c0fa752468a36830a15c190cd78efc851c3b6831eb2d16b7cf34a71d55463b266ffdee4c6addd4e66ca7caf75e63825051e600ee8a32494e5033cabbd SHA512 e6d217a23e39635f8749811a3fc64c8da14d0396a71b4042a4f8f3ce32ff1f0b4ed033ebae90f3785443dae9b35ded68ea512ed1e3e7f9ea9a471a499ae26b89
DIST scotch-v6.1.1.tar.gz 6363384 BLAKE2B 337c81608fd245dde5b19bb6c79924e0ee80181ce3c935ae37e6248be2511a2f4d70bdda5b9217e5e1ed79fc00269de15755c3b6829579aa190ca6da9c3c2dac SHA512 daa62463f25416764250fe0452ae84bc6a2e485ee62a387418b4686c2ab93a2ca2d5a12cba922857c99a1c9ec67fc82951b0f9563ab97f5f3a6b86bb9da22b0c
DIST scotch-v6.1.2.tar.gz 6395320 BLAKE2B 07aa4f56c097cf364d7d63613f3c5d5d3f2a8419ce27da95a4a20d5ea48fcf2f036acaa62ab1f591b5d1dc672151562bc0721a66f203c60d5ee26a501cf90352 SHA512 dcf63c65bf8155590a70483f80ad21b4a303debf50d47a3c154983935dc056f3df93a61c3d88304f3d1a4517ab3a355e176d72b3835382cd65c1556fbbd21702
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
deleted file mode 100644
index 449449bec073..000000000000
--- a/sci-libs/scotch/files/scotch-6.0.4-as-needed.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-diff -Nur scotch_6.0.4/src/check/Makefile scotch_6.0.4_patched/src/check/Makefile
---- scotch_6.0.4/src/check/Makefile 2015-03-01 03:18:02.000000000 -0700
-+++ scotch_6.0.4_patched/src/check/Makefile 2015-07-17 15:15:58.447398954 -0600
-@@ -53,7 +53,7 @@
- $(CC) $(CFLAGS) $(CLIBFLAGS) -I$(SCOTCHINCLUDEDIR) -c $(<) -o $(@)
-
- %$(EXE) : %.c
-- $(CC) $(CFLAGS) -I$(SCOTCHINCLUDEDIR) -L$(SCOTCHLIBDIR) $(<) -o $(@) $(SCOTCHLIBS) $(LDFLAGS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -I$(SCOTCHINCLUDEDIR) -L$(SCOTCHLIBDIR) $(<) $(SCOTCHLIBS) $(LIBS) -o $(@)
-
- ##
- ## Project rules.
-diff -Nur scotch_6.0.4/src/esmumps/Makefile scotch_6.0.4_patched/src/esmumps/Makefile
---- scotch_6.0.4/src/esmumps/Makefile 2015-03-13 17:32:06.000000000 -0600
-+++ scotch_6.0.4_patched/src/esmumps/Makefile 2015-07-17 15:17:47.389600699 -0600
-@@ -44,7 +44,7 @@
- $(CC) $(CFLAGS) $(CLIBFLAGS) -I$(includedir) -c $(<) -o $(@)
-
- %$(EXE) : %.c
-- $(CC) $(CFLAGS) -I$(includedir) $(<) -o $(@) -L$(libdir) $(LDFLAGS) -L. -l$(ESMUMPSLIB) -l$(SCOTCHLIB) -lscotch -l$(SCOTCHLIB)errexit -lm
-+ $(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) $(<) -L$(libdir) -L. -l$(ESMUMPSLIB) -l$(SCOTCHLIB) -lscotch -l$(SCOTCHLIB)errexit $(LIBS) -o $(@)
-
- ##
- ## Project rules.
-@@ -57,7 +57,7 @@
- libesmumps$(LIB) \
- main_esmumps$(EXE)
-
--ptscotch : clean
-+ptscotch : clean common.h
- $(MAKE) CFLAGS="$(CFLAGS) -DSCOTCH_PTSCOTCH" CC="$(CCP)" SCOTCHLIB=ptscotch ESMUMPSLIB=ptesmumps \
- libesmumps$(LIB) \
- main_esmumps$(EXE)
-@@ -160,6 +160,6 @@
- order.h \
- symbol.h \
- esmumps.h \
-- lib$(ESMUMPSLIB)$(LIB) \
-+ libesmumps$(LIB) \
- $(libdir)/lib$(SCOTCHLIB)$(LIB) \
- $(libdir)/lib$(SCOTCHLIB)errexit$(LIB)
-diff -Nur scotch_6.0.4/src/libscotch/Makefile scotch_6.0.4_patched/src/libscotch/Makefile
---- scotch_6.0.4/src/libscotch/Makefile 2014-09-23 13:28:28.000000000 -0600
-+++ scotch_6.0.4_patched/src/libscotch/Makefile 2015-07-17 15:19:17.320116484 -0600
-@@ -43,7 +43,7 @@
- $(CC) $(CFLAGS) $(CLIBFLAGS) -c $(<) -o $(@)
-
- %$(EXE) : %.c
-- $(CC) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) $(LIBS) -o $(@)
-
- ##
- ## Project rules.
-@@ -2937,14 +2937,14 @@
- mapping.h \
- order.h \
- parser.h
-- $(CCD) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS)
-+ $(CCD) $(CFLAGS) $(LDFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) $(LIBS) -o $(@)
-
- ptdummysizes$(EXE) : dummysizes.c \
- module.h \
- common.h \
- dgraph.h \
- dorder.h
-- $(CCD) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS)
-+ $(CCD) $(CFLAGS) $(LDFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) $(LIBS) -o $(@)
-
- scotch.h : dummysizes$(EXE) \
- library.h
-diff -Nur scotch_6.0.4/src/libscotchmetis/Makefile scotch_6.0.4_patched/src/libscotchmetis/Makefile
---- scotch_6.0.4/src/libscotchmetis/Makefile 2011-09-06 10:46:48.000000000 -0600
-+++ scotch_6.0.4_patched/src/libscotchmetis/Makefile 2015-07-17 15:19:42.648698497 -0600
-@@ -44,7 +44,7 @@
- $(CC) $(CFLAGS) $(CLIBFLAGS) -I$(includedir) -I../libscotch -c $(<) -o $(@)
-
- %$(EXE) : %.c
-- $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) $(LDFLAGS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) -o $(@)
-
- ##
- ## Project rules.
-diff -Nur scotch_6.0.4/src/scotch/Makefile scotch_6.0.4_patched/src/scotch/Makefile
---- scotch_6.0.4/src/scotch/Makefile 2015-02-24 15:39:44.000000000 -0700
-+++ scotch_6.0.4_patched/src/scotch/Makefile 2015-07-17 15:22:25.275015105 -0600
-@@ -41,13 +41,13 @@
- include ../Makefile.inc
-
- %$(EXE) : %$(OBJ)
-- $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) -l$(SCOTCHLIB) -lscotch -l$(SCOTCHLIB)errexit $(LDFLAGS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) -l$(SCOTCHLIB) -lscotch -l$(SCOTCHLIB)errexit $(LIBS) -o $(@)
-
- %$(OBJ) : %.c
- $(CC) $(CFLAGS) -I$(includedir) -I../libscotch -c $(<) -o $(@)
-
- %$(EXE) : %.c
-- $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) -l$(SCOTCHLIB) -lscotch -l$(SCOTCHLIB)errexit $(LDFLAGS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) -l$(SCOTCHLIB) -lscotch -l$(SCOTCHLIB)errexit $(LIBS) -o $(@)
-
- ##
- ## Project rules.
-@@ -209,7 +209,7 @@
- $(libdir)/libptscotch$(LIB) \
- $(libdir)/libptscotcherrexit$(LIB) \
- dgmap.h
-- $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -o $(@) -L$(libdir) -lptscotch -lscotch -lptscotcherrexit $(LDFLAGS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -L$(libdir) -lptscotch -lscotch -lptscotcherrexit $(LIBS) -o $(@)
-
- dgscat$(EXE) : dgscat.c \
- ../libscotch/module.h \
-@@ -321,7 +321,7 @@
- gout_o.c \
- $(includedir)/scotch.h \
- $(libdir)/libscotch$(LIB)
-- $(CC) $(CFLAGS) -I../libscotch -I$(includedir) gout_c.c gout_o.c -o $(@) -L$(libdir) -lscotch -lscotcherrexit $(LDFLAGS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -I../libscotch -I$(includedir) gout_c.c gout_o.c -L$(libdir) -lscotch -lscotcherrexit $(LIBS) -o $(@)
-
- gpart$(EXE) : gmap.c \
- ../libscotch/module.h \
-@@ -330,7 +330,7 @@
- $(libdir)/libscotch$(LIB) \
- $(libdir)/libscotcherrexit$(LIB) \
- gmap.h
-- $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -o $(@) -L$(libdir) -lscotch -lscotcherrexit $(LDFLAGS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -L$(libdir) -lscotch -lscotcherrexit $(LIBS) -o $(@)
-
- gscat$(EXE) : gscat.c \
- ../libscotch/module.h \
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
deleted file mode 100644
index c1301f57076a..000000000000
--- a/sci-libs/scotch/files/scotch-6.0.4-flex-2.6.3-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- scotch_6.0.4/src/libscotch/parser_ll.l.old 2017-01-02 08:42:41.216249106 -0800
-+++ scotch-6.0.4-r1/work/scotch_6.0.4/src/libscotch/parser_ll.l 2017-01-02 09:50:14.572579444 -0800
-@@ -84,20 +84,29 @@
- #endif /* X_OSDOS */
-
- #ifdef FLEX_SCANNER
- #define YY_ALWAYS_INTERACTIVE 1 /* Set the parser as interactive and read one char at a time */
- #define YY_INPUT(buf,result,max_size) { int c = stratParserInput (); result = (c == 0) ? YY_NULL : ((buf)[0] = c, 1); }
-+
-+# if YY_FLEX_MAJOR_VERSION > 2 || \
-+ YY_FLEX_MAJOR_VERSION == 2 && YY_FLEX_MINOR_VERSION > 6 || \
-+ YY_FLEX_MAJOR_VERSION == 2 && YY_FLEX_MINOR_VERSION == 6 && YY_FLEX_SUBMINOR_VERSION >= 3
-+ int yywrap() { return 1; }
-+# else
-+# define yywrap() (1) /* Always return end-of-file on end-of-string */
-+# endif
-+
- #else /* FLEX_SCANNER */
- #undef getc /* Redirect I/O functions */
- #define getc yygetc
- #undef yygetc
- #define yygetc(stream) stratParserInput ()
-+#define yywrap() (1) /* Always return end-of-file on end-of-string */
- #endif /* FLEX_SCANNER */
-
- #define YY_NO_UNPUT /* No prototype for yyunput as not defined */
- #define YY_SKIP_YYWRAP /* No prototype for yywrap as defined as macro */
--#define yywrap() (1) /* Always return end-of-file on end-of-string */
-
- /*
- ** The static variables.
- */
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-06 16:00:56 +0000