summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <mmk@levelnine.at>2022-07-19 17:29:50 +0200
committerConrad Kostecki <conikost@gentoo.org>2022-07-19 19:08:56 +0200
commit19671c70c04731f4d8fb42b7760fb496cfaf6ade (patch)
tree8ca5305955c79891689de18ca3d02dc873673b0f /sci-mathematics/singular
parentsys-apps/systemd: remove unused patch (diff)
downloadgentoo-19671c70c04731f4d8fb42b7760fb496cfaf6ade.tar.gz
gentoo-19671c70c04731f4d8fb42b7760fb496cfaf6ade.tar.bz2
gentoo-19671c70c04731f4d8fb42b7760fb496cfaf6ade.zip
sci-mathematics/singular: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Portage 3.0.32 / pkgdev 0.2.1 / pkgcheck 0.10.11 Closes: https://github.com/gentoo/gentoo/pull/26478 Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
Diffstat (limited to 'sci-mathematics/singular')
-rw-r--r--sci-mathematics/singular/files/singular-4.2.0-doc_install-v2.patch63
-rw-r--r--sci-mathematics/singular/files/singular-4.2.0-gfan_linking.patch38
-rw-r--r--sci-mathematics/singular/files/singular-4.3.0_p1-gcc12.patch76
3 files changed, 0 insertions, 177 deletions
diff --git a/sci-mathematics/singular/files/singular-4.2.0-doc_install-v2.patch b/sci-mathematics/singular/files/singular-4.2.0-doc_install-v2.patch
deleted file mode 100644
index 5e485b14e0cb..000000000000
--- a/sci-mathematics/singular/files/singular-4.2.0-doc_install-v2.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index fbea51d..e9365ab 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -16,10 +16,11 @@ bin_SCRIPTS = libsingular-config
-
- install-data-local:
- if test -e $(srcdir)/doc/doc.tbz2; then\
-- (cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(datadir)/singular; tar -jx --no-same-owner -f -));\
-- mkdir $(DESTDIR)$(datadir)/info;\
-- mkdir $(DESTDIR)$(datadir)/doc;\
-- mv $(DESTDIR)$(datadir)/singular/singular.hlp $(DESTDIR)$(datadir)/info/.;\
-+ mkdir -p $(DESTDIR)$(docdir);\
-+ mkdir -p $(DESTDIR)$(datadir)/info;\
-+ (cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(docdir); tar -jx --no-same-owner -f -));\
-+ mv $(DESTDIR)$(docdir)/singular.hlp $(DESTDIR)$(datadir)/info/.;\
-+ @INSTALL_DATA@ doc/singular.idx $(DESTDIR)$(datadir)/singular/.;\
- fi
-
- uninstall-local:
-diff --git a/configure.ac b/configure.ac
-index 490a45f..997db6c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -228,6 +228,11 @@ AX_NORMALIZE_PATH([config_datadir],['/'])
- AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir])
- AC_SUBST(DATA_DIR, "$config_datadir")
-
-+AX_RECURSIVE_EVAL([[$]docdir], [config_docdir])
-+AX_NORMALIZE_PATH([config_docdir],['/'])
-+AC_DEFINE_UNQUOTED([DOC_DIR],"$config_docdir",[docdir])
-+AC_SUBST(DOC_DIR, "$config_docdir")
-+
- SING_SHOW_FLAGS([Compiler/linker flags: ])
-
-
-diff --git a/resources/configure.ac b/resources/configure.ac
-index 0dc468f..da68144 100644
---- a/resources/configure.ac
-+++ b/resources/configure.ac
-@@ -72,5 +72,9 @@ AX_RECURSIVE_EVAL([[$]datadir], [config_datadir])
- AX_NORMALIZE_PATH([config_datadir],['/'])
- AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir])
-
-+AX_RECURSIVE_EVAL([[$]htmldir], [config_htmldir])
-+AX_NORMALIZE_PATH([config_htmldir],['/'])
-+AC_DEFINE_UNQUOTED([HTML_DIR],"$config_datadir",[htmldir])
-+
- AC_CONFIG_FILES([singular_resources.pc Makefile])
- AC_OUTPUT
-diff --git a/resources/feResource.cc b/resources/feResource.cc
-index 3d75bc9..7e4fc8c 100644
---- a/resources/feResource.cc
-+++ b/resources/feResource.cc
-@@ -85,7 +85,7 @@ VAR feResourceConfig_s feResourceConfigs[] =
- {"DefaultDir",'d', feResDir, "SINGULAR_DEFAULT_DIR", SINGULAR_DEFAULT_DIR, (char *)""},
- {"InfoFile", 'i', feResFile, "SINGULAR_INFO_FILE", "%D/info/singular.hlp", (char *)""},
- {"IdxFile", 'x', feResFile, "SINGULAR_IDX_FILE", "%D/singular/singular.idx", (char *)""},
-- {"HtmlDir", 'h', feResDir, "SINGULAR_HTML_DIR", "%D/singular/html", (char *)""},
-+ {"HtmlDir", 'h', feResDir, "SINGULAR_HTML_DIR", HTML_DIR, (char *)""},
- {"ManualUrl", 'u', feResUrl, "SINGULAR_URL", "https://www.singular.uni-kl.de/Manual/", (char *)""},
- {"ExDir", 'm', feResDir, "SINGULAR_EXAMPLES_DIR","%r/examples", (char *)""},
- {"Path", 'p', feResPath, NULL, "%b;%P;$PATH", (char *)""},
diff --git a/sci-mathematics/singular/files/singular-4.2.0-gfan_linking.patch b/sci-mathematics/singular/files/singular-4.2.0-gfan_linking.patch
deleted file mode 100644
index 267bf19361ad..000000000000
--- a/sci-mathematics/singular/files/singular-4.2.0-gfan_linking.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 705149b86a80dd8b53fa8c1717872e9b2e9dbbcb Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Sun, 30 May 2021 08:10:10 -0400
-Subject: [PATCH 1/3] gfanlib/Makefile.am: use LIBADD for additional libraries.
-
-The $GMP_LIBS and $CDDGMPLDFLAGS variables were being added to
-libgfan_la_LDFLAGS, which isn't quite correct. Since both contain
-library (-l) flags, they belong in _LIBADD rather than _LDFLAGS:
-
- https://www.gnu.org/software/automake/manual/html_node/Libtool-Flags.html
-
-This commit moves them to a new libgfan_la_LIBADD variable.
----
- gfanlib/Makefile.am | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/gfanlib/Makefile.am b/gfanlib/Makefile.am
-index cec8d8f..96e1893 100644
---- a/gfanlib/Makefile.am
-+++ b/gfanlib/Makefile.am
-@@ -18,9 +18,13 @@ AM_CXXFLAGS = @CXX11_FLAG@
-
- SOURCES = gfanlib_circuittableint.cpp gfanlib_mixedvolume.cpp gfanlib_paralleltraverser.cpp gfanlib_polyhedralfan.cpp gfanlib_polymakefile.cpp gfanlib_symmetriccomplex.cpp gfanlib_symmetry.cpp gfanlib_traversal.cpp gfanlib_zcone.cpp gfanlib_zfan.cpp
- libgfan_la_SOURCES = $(SOURCES)
--libgfan_la_LDFLAGS = $(SINGULAR_LDFLAGS) $(CDDGMPLDFLAGS) $(GMP_LIBS)
-+libgfan_la_LDFLAGS = $(SINGULAR_LDFLAGS)
- libgfan_la_CPPFLAGS= $(GMP_CPPFLAGS) $(CDDGMPCPPFLAGS)
-
-+# Despite the naming convention, $CDDGMPLDFLAGS contains "-lcddgmp"
-+# and the rest of the $GMP_LIBS flags.
-+libgfan_la_LIBADD = $(CDDGMPLDFLAGS) $(GMP_LIBS)
-+
- noinst_HEADERS = config.h gfanlib_mixedvolume.h gfanlib_polymakefile.h gfanlib_symmetry.h gfanlib_vector.h gfanlib_z.h _config.h gfanlib.h gfanlib_paralleltraverser.h gfanlib_q.h gfanlib_traversal.h gfanlib_zcone.h gfanlib_circuittableint.h gfanlib_matrix.h gfanlib_polyhedralfan.h gfanlib_symmetriccomplex.h gfanlib_tropicalhomotopy.h gfanlib_zfan.h
-
- DISTCLEANFILES = config.h
---
-2.31.1
-
diff --git a/sci-mathematics/singular/files/singular-4.3.0_p1-gcc12.patch b/sci-mathematics/singular/files/singular-4.3.0_p1-gcc12.patch
deleted file mode 100644
index 570d0be87a29..000000000000
--- a/sci-mathematics/singular/files/singular-4.3.0_p1-gcc12.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --git a/kernel/oswrapper/vspace.cc b/kernel/oswrapper/vspace.cc
-index fa42bf5e28..aefa661600 100644
---- a/kernel/oswrapper/vspace.cc
-+++ b/kernel/oswrapper/vspace.cc
-@@ -197,7 +197,11 @@ static void print_freelists() {
-
- void vmem_free(vaddr_t vaddr) {
- lock_allocator();
-+ #if defined(__GNUC__) && (__GNUC__>11)
-+ vaddr -= (sizeof(vaddr_t)*2);
-+ #else
- vaddr -= offsetof(Block, data);
-+ #endif
- vmem.ensure_is_mapped(vaddr);
- size_t segno = vmem.segment_no(vaddr);
- VSeg seg = vmem.segment(vaddr);
-@@ -245,7 +249,11 @@ void vmem_free(vaddr_t vaddr) {
-
- vaddr_t vmem_alloc(size_t size) {
- lock_allocator();
-+ #if defined(__GNUC__) && (__GNUC__>11)
-+ size_t alloc_size = size + (sizeof(vaddr_t)*2);
-+ #else
- size_t alloc_size = size + offsetof(Block, data);
-+ #endif
- int level = find_level(alloc_size);
- int flevel = level;
- while (flevel < LOG2_SEGMENT_SIZE && vmem.freelist[flevel] == VADDR_NULL)
-@@ -275,7 +283,11 @@ vaddr_t vmem_alloc(size_t size) {
- assert(vmem.freelist[level] != VADDR_NULL);
- Block *block = vmem.block_ptr(vmem.freelist[level]);
- vaddr_t vaddr = vmem.freelist[level];
-+ #if defined(__GNUC__) && (__GNUC__>11)
-+ vaddr_t result = vaddr + (sizeof(vaddr_t)*2);
-+ #else
- vaddr_t result = vaddr + offsetof(Block, data);
-+ #endif
- vmem.freelist[level] = block->next;
- if (block->next != VADDR_NULL)
- vmem.block_ptr(block->next)->prev = VADDR_NULL;
-@@ -751,7 +763,11 @@ static void print_freelists() {
-
- void vmem_free(vaddr_t vaddr) {
- lock_allocator();
-+ #if defined(__GNUC__) && (__GNUC__>11)
-+ vaddr -= (sizeof(vaddr_t)*2);
-+ #else
- vaddr -= offsetof(Block, data);
-+ #endif
- vmem.ensure_is_mapped(vaddr);
- size_t segno = vmem.segment_no(vaddr);
- VSeg seg = vmem.segment(vaddr);
-@@ -799,7 +815,11 @@ void vmem_free(vaddr_t vaddr) {
-
- vaddr_t vmem_alloc(size_t size) {
- lock_allocator();
-+ #if defined(__GNUC__) && (__GNUC__>11)
-+ size_t alloc_size = size + (sizeof(vaddr_t)*2);
-+ #else
- size_t alloc_size = size + offsetof(Block, data);
-+ #endif
- int level = find_level(alloc_size);
- int flevel = level;
- while (flevel < LOG2_SEGMENT_SIZE && vmem.freelist[flevel] == VADDR_NULL)
-@@ -829,7 +849,11 @@ vaddr_t vmem_alloc(size_t size) {
- assert(vmem.freelist[level] != VADDR_NULL);
- Block *block = vmem.block_ptr(vmem.freelist[level]);
- vaddr_t vaddr = vmem.freelist[level];
-+ #if defined(__GNUC__) && (__GNUC__>11)
-+ vaddr_t result = vaddr + (sizeof(vaddr_t)*2);
-+ #else
- vaddr_t result = vaddr + offsetof(Block, data);
-+ #endif
- vmem.freelist[level] = block->next;
- if (block->next != VADDR_NULL)
- vmem.block_ptr(block->next)->prev = VADDR_NULL;