diff options
Diffstat (limited to 'sci-mathematics/singular')
4 files changed, 0 insertions, 180 deletions
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest index 1eb0224822de..c5fb01f0a629 100644 --- a/sci-mathematics/singular/Manifest +++ b/sci-mathematics/singular/Manifest @@ -1,11 +1,8 @@ AUX 60singular-gentoo.el 298 BLAKE2B 5b42e2083037e2ff2ace5597ddebfb079920e09ed91d1a359e058fc654c6778456174d6cee9242f7fcaf81bf1464f47f43604b9e4eb298f051c6a4daba4630ca SHA512 4c17a25d91c085e12f26441fcde858e61bf191bd7d9dcf63ff5b5a1dce1d63e3f7c4f78ce8afa4f2359ad4ba6eb51f3e224ae6c502b18f5f7a76738534337431 AUX singular-4.0.3-gfan_linking.patch 705 BLAKE2B 9ec4dafad75885132d4f6bea65f945a5f6f383e39f3d375a70e12a86db983cc3d64e14b148db07c9577a46d2a8f534f43988d264fdb43dc61b247843af5f438d SHA512 4c2ab45f449f9c3d79165e1c9a0634fb08a9cd34dbc898e0e172409f6914ccd6e1c4e1719ccf0b36e591b4840e8cba08576ac1b57fadd08f8344b45e1af40d89 AUX singular-4.1.3-doc_install.patch 2834 BLAKE2B d8e35169534ed9087fc1faf6029a111819d2198d5fa61134ba083920604f93a346e6f274da02361b0c03ba05fea2c4f1b23fe2af8a46d8e6705cf4ccd025751a SHA512 36d3b6f2d90479ae508c7771d4fd7724ada5f5102ece78c4d5bc113c23848973706f19a9e1467de322ecee29712dc1d915f41b491bef23529a43380ff69d84ef -AUX singular-4.2.0-doc_install-v2.patch 2918 BLAKE2B 9b844a51165425e696db1270dcbdf6343356c313e797cee04bf8c0bad3c0c659302a88866877b729d50ba2e5717b4a1ec209f8ff57c1f71509e551ccc780f4bf SHA512 fc3aaf5b330057b1283a877d1ee5c97e6088a2eadfeaa2d85667ca3f8c661f400d52f7e29eb27da94c6be7b9809f8aea88dc2e33affc4b3a29d334b3e5798e78 -AUX singular-4.2.0-gfan_linking.patch 1849 BLAKE2B 11a4ed33cab5265a3b5650270511ff38cd36422fea07ad0ae5f229761e31229d8ed61fa278d47b1326abc0919c85522d80f8085d3f2019463ae50fa48589c837 SHA512 bc1635cc592c5b624c87bfffbafb8d1c1cc094e2e629027c89255552ec15918bbdc3275605f8612cc418d4efc58efa46465d286cd9118cdf06a079ba40ff52ae AUX singular-4.2.0-no-static.patch 2644 BLAKE2B 466705130179efe13cd4bdccb09e0bc2a5a0efaf36536009054235f6a44af932c359cee366eef860235739c480fea84e9ca48947597d2c3aaf2e26bdb3fada88 SHA512 53dd7045d717f62817b0fd03963a8cf2ba4e88387b89e854a1cc6a2817bf975fd7e16852e948b64182d049b8c184459d4e071bbb5f8c6ca5998c4c1b964deef5 AUX singular-4.2.1-htmldoc.patch 2086 BLAKE2B 28ab2e8ef9ad2ff1343d3efd33917503c00fb74428f35b1ab0fb1475368d3760d3c915668d4fb008ccc618e2aa1c13a35f66d3a62f8c3abe93b5275f1648c8e7 SHA512 5c28c31bc51a937ddff4e52da3ed93f20516b64ac6abfc05031d09e708e557268e757c55e625abfd77c19600f64a7f284903de619c113a57194367e23148ff82 -AUX singular-4.3.0_p1-gcc12.patch 2670 BLAKE2B a7dcbe6a6b93baa53ffddf5f25fbf2cea54be1fa453854ddec7b177a132ab38ec5b8cb93078c2183e43896f342231866095dbf2e453fa1952e4215abfdf82baa SHA512 7d3f80e6e2a4980872f5bbc2a41c7925f6fac7dd6184df372375bb959c098203d5551f8c5e0bcaae2bb8ff498515135c8ca2859f43b86eeb5b950e64a6d8d2fd DIST singular-4.2.0p1.tar.gz 14155171 BLAKE2B 444553f87d7ca8d6a62e4519c9857a6892757e92285df7c3b686913a9b51c9ae8d802c41382b0b2b6e37dc2dc496d4a10f262c98407470219cdce131e8baf127 SHA512 2ecd8940c9e8d70a93dbdb4df6da313c00151e5cb959f8eed5856e8df99089b5a03e514fbcdc70903c77df8b59fa7ef9f3b134f1de510b795fa6ea0341089bd8 DIST singular-4.2.1p3.tar.gz 15042102 BLAKE2B 9958c1c432f8a3516387cfe7b258d2e22e8e9fdf3874de53a803b34e353088a3ce246a90b78db43f186717985b503d2355f524ee80784e63b186d53217fdeead SHA512 1e6533fcf966499e9ad145b640e7e5878eb9738bd65535aaa517c5e98dedb09bc99bf832359e9b6dca2fff615237f855bd861820e592a885341aa82e7a9a9168 DIST singular-4.3.1p1.tar.gz 15090370 BLAKE2B d4e40378b3892b98b1f78c3928c8a40484336ea25ea4dcd4b3a1e5f651281d2cdb06d92c9cc64427ce76e91c5bf4eaa1c3b643df174a24c188823ae808817ad9 SHA512 d27d8e042ea085e49aed6a0697056c36e78e62ea0b9d17751cdf4c556cf4f6efce3b34b411c77aef97c6d90675bea11c97651eb7009634cb8a9b630ec820a06e 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; |