From 80765b090d10ae3f68b00e3befe5859f7212e536 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 15 Jul 2023 04:39:16 +0100 Subject: gentoo auto-resync : 15:07:2023 - 04:39:16 --- sci-libs/libsc/Manifest | 8 +- .../files/libsc-2.3-autoconf_lua_version.patch | 64 +++++++++++++ .../libsc/files/libsc-2.3.6-override_soname.patch | 13 +++ sci-libs/libsc/libsc-2.3.6.ebuild | 100 +++++++++++++++++++++ sci-libs/libsc/libsc-2.8.3.ebuild | 65 -------------- sci-libs/libsc/metadata.xml | 3 + 6 files changed, 185 insertions(+), 68 deletions(-) create mode 100644 sci-libs/libsc/files/libsc-2.3-autoconf_lua_version.patch create mode 100644 sci-libs/libsc/files/libsc-2.3.6-override_soname.patch create mode 100644 sci-libs/libsc/libsc-2.3.6.ebuild delete mode 100644 sci-libs/libsc/libsc-2.8.3.ebuild (limited to 'sci-libs/libsc') diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest index fdc90602a0f2..413189ff0bb4 100644 --- a/sci-libs/libsc/Manifest +++ b/sci-libs/libsc/Manifest @@ -1,3 +1,5 @@ +AUX libsc-2.3-autoconf_lua_version.patch 1790 BLAKE2B 7968b643acddc54f81b06028392ee328143f280178ed4a52e4a7eabc85906f043b9edd82cf7c0ef7c4956cee59602bb231e0051da162538419de3b9b88c7a57d SHA512 6c3c183b5255296ac0340845b94d39e6aa1f4675a6fc44ea139635e73aca7a4d8eb02d14a7e9599723ca9d0702c911c3d20102a95c3d4ff1ed941b565a5f9cf7 +AUX libsc-2.3.6-override_soname.patch 538 BLAKE2B df4cdc816d0b1ba3c023bf28e97ec60437d3fe51a962a1f4ce25269f86fba86c084733907b135b165431902b993cf506f05e5b66923851616025dd2e49da0bce SHA512 3d58d2a7144a9e2d0c60d1753e4a3db83cc1a7beab154bb4bcc1c7958a012ca2dfb9730b217ce54d61056d26e4aa35fbc49975969869b044b3a9fc0d4890fdd6 AUX libsc-2.8.3-fix_build_system.patch 1192 BLAKE2B aab3161036987ad1027266c03730141142ab0e86c292dd827cc7010a6cb7a3ba43153bec8bc8319bca80cc5ec97efc9fd10b2f47d126e235fe7d948bf78a6acc SHA512 84264530c72d71f2b77c16037e389f4423e3acda8bba4443ec3d0a4e0d46a1eb6ae3ef85973a56ea990d19987799e1dfc682dee0a039f598f9ef122a262f01f6 AUX libsc-2.8.3-set_version.patch 1514 BLAKE2B 59e06b4f4d33a641e66ff862ca212b4106dd98214b411a95340c8069ec0cef6c70ac467fa01b94e61a16cd0222cfa5e50c56f6ed088958bfbaeaea2272c1c477 SHA512 20723ffda489e249ed2af124f4ca13b6f477dfc09d7bdc07e8c36f55fd0d168807543b6573b3e1d86fd1200b6982d7a755d7b9b04c39097f39f38aeba5b67e2d AUX libsc-2.8.5-do_not_compile_zlib-ng.patch 1866 BLAKE2B 1c9bfc20a1e62fd1cdd51393db6b2419f0e3f04dfc05e1af64a3cb42bc5bbf032b35e2bcc435cbe9800e53f2011906d22a26287ab7a6a4c85f44a2bddf839903 SHA512 c2041844d47308fa0d17b74f20fd9408bca2fe458674cdf7f4180700b0c9407451c48d5bb7a8bd3ff90f8958d9fc8a1007cc6164d1eb4f9d016fd4102a862250 @@ -5,8 +7,8 @@ AUX libsc-2.8.5-fix_build_system.patch 696 BLAKE2B fee1ddbd18c2e7155d22e86280247 AUX libsc-2.8.5-fix_cmake_path.patch 918 BLAKE2B 0c9a2a228e204f7255ca74418d44903357186898fac65e45fdf49e4f25d3985e0f7e51a11d80f4f3baaca2d9b8a1524e09a3cc75f66ec0837151b04c34ec6ab2 SHA512 c40db6baa1e440fb6ce37e24471a25dcd0ae020481991924ef57c4e980734359107bcb1d858d29f15d8c8d4da8d67b353e309276ec1103332697c92cb3401aea AUX libsc-2.8.5-set_version.patch 1794 BLAKE2B 6cdf62143d846cb40868916c2d11a290a5179f3ff2782ff60b381a2aa00ee12995762ab8b7847468776cadc062296b79b45c2c5ddb3bf49655511700186d2abc SHA512 eec7d0fb9daf4559e3ad70f1d3fc8fa422239886f293ed876552151cde8cd80d015f0672703131f28fb9009e7cfb0045b33c23abcfe477922a57c56f9d2abb2c AUX libsc-2.8.5-use_zlib-ng_symbols.patch 5332 BLAKE2B 6fdd57182822985c23ac3d45ad8008553973ceb76ad285cc6302812765fe1d82d3454bed2268dd0e628a09d582f66e866511d109a898880423603264d3f40f60 SHA512 f58ad84abac25b5462a5bd1b64dcc79f1154b1971bf6ced6d59fdb0933380fa936c55262e449f3d7f9722c5b57c05a60949864e4f7373d1f86848734a58842e5 -DIST libsc-2.8.3.tar.gz 360755 BLAKE2B 2d7e3a16b97de551678ebb33f362e1ef7ebb0bcbf8d00b1a5317bfbf6732cf7bb9be2d215c79395809f3c616c23da5236c4f0f436a7b8bb07171141aaf08bbb3 SHA512 9def8850898f2d7d7a6ffaffd0872bc18af28026407356a1fe10f2b4f6d4a32ae6febe59c91cfa8817969624f995d48f64e0d5424b475e3a4c501338f4de70de +DIST libsc-2.3.6.tar.gz 346618 BLAKE2B 6da88f1eec572a5d30ebef5e17554874e3d88d124fbbb7582092bd43a85a547f130a5406ffd40f86d564c95a3e600b2eb854ee0378b8e0c2d755a7d45d55ff1e SHA512 9037ebeebcf84d1dc3026172ee3fd3182729fbdbdadb478e8c05670b17bd3e2f3b192bac9a509bd99312c5f944a10fb7eb0636e8c7bd133b30677eb5ead6d117 DIST libsc-2.8.5.tar.gz 401520 BLAKE2B 28f74c03dc9a6238c254683585e3a6e372718bbf147f1a1bfe051d9a9079491650eca645bb695ce4c36920dda459904be6f9d41fb53163952d9076302072e181 SHA512 d7854a77cb574531d410c978af5768782d6201c730a3248371a822172cb99fe0b2efc8c2e4f495160924fb867ed77ab1b9ac17a1db349d8a6495228698cf970b -EBUILD libsc-2.8.3.ebuild 1410 BLAKE2B f4654f5c21f62903c0a41e101acf83963972d3d4c243991c909930b8ea85bf601d5b879875bc736ece50bf0fc9ba15140de6cd960ac42532e3866b7c2cd3e388 SHA512 bc4edc505cbee1411027ea8869c8d4feab0006e8fb873cea02f9db59bb4a82f55c7d1391e4dca153e80e5292864120d7baa96f63c83290d0167492e43c381c33 +EBUILD libsc-2.3.6.ebuild 2338 BLAKE2B 2ce1905accf17c14090a169e843a75ae9faf8795959faebbf87c0d2e71e3b2a0276f81db52174ebc8cd44f711433262a5c7f08ed2c1365ed6a434666a2d7d99a SHA512 ebb0e95d78f14b63e45c863ad14e467f3a1e240e1aaf614d6cac5b872344cdd8cc8bd91d4d85033f190d84f45b790b9b57c215af20263016ed2caadb829aeffa EBUILD libsc-2.8.5-r2.ebuild 1550 BLAKE2B 7fcc6491e9aae212d23a21b80df180f8db97fe67cc91837eb609e68d5a1f2c13acbbe279aca0cbaa45082692b53882164821563beecd2c478e2d926c6bb8bed9 SHA512 518ced91237581c049edac4eaffecc5aa128126f76915a4c6ce0801fbed3468671e6fa93fca6c7912e6af40fad5efebbc3b8f02bbe44c6f8fb46436ca99d13f6 -MISC metadata.xml 631 BLAKE2B 190ee7659d372a9152c32e63d436d460a4c2755b4ad42805e400c337430c7031382fdbbc0acf52eb8f5463ef57166d7605f122b0d1884a07aac09d6e878f11bb SHA512 22e5ae0f31b8b6a0ce8df978b473d22d1bed1da057511a58d421b4b6f60e195fc5de71c5ece88ab518ae2d36b7fd96ecd70f61e934b0352cea204990a011a052 +MISC metadata.xml 724 BLAKE2B 3a2a0065f7448d2348083615f24eb0ef7acb6e421b3a901269a746f6a846d959b56643f7bbd5e51de75c7712aa23253a49e9c8157368c070c79bc191c9c33161 SHA512 a9c39d5eb67ff8e83f3019f752b808797c70c7ce4267aad25514e17a151cbd73c368da9e5e3bd16a163724762e3315f250fb145609294c68422de9b80e7adec0 diff --git a/sci-libs/libsc/files/libsc-2.3-autoconf_lua_version.patch b/sci-libs/libsc/files/libsc-2.3-autoconf_lua_version.patch new file mode 100644 index 000000000000..9881d0aa6227 --- /dev/null +++ b/sci-libs/libsc/files/libsc-2.3-autoconf_lua_version.patch @@ -0,0 +1,64 @@ +diff --git a/config/sc_include.m4 b/config/sc_include.m4 +index f6f7873..3befe0e 100644 +--- a/config/sc_include.m4 ++++ b/config/sc_include.m4 +@@ -281,8 +281,7 @@ AC_DEFUN([SC_CHECK_LIBRARIES], + [ + SC_REQUIRE_LIB([m], [fabs]) + SC_CHECK_LIB([z], [adler32_combine], [ZLIB], [$1]) +-SC_CHECK_LIB([lua53 lua5.3 lua52 lua5.2 lua51 lua5.1 lua lua5], [lua_createtable], +- [LUA], [$1]) ++SC_CHECK_LIB([$LUA_IMPL], [lua_createtable], [LUA], [$1]) + SC_CHECK_BLAS_LAPACK([$1]) + SC_BUILTIN_ALL_PREFIX([$1]) + SC_CHECK_PTHREAD([$1]) +diff --git a/configure.ac b/configure.ac +index ce462e0..b291685 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -78,7 +78,7 @@ echo "o---------------------------------------" + AC_CHECK_HEADERS([fcntl.h sys/ioctl.h sys/select.h sys/stat.h]) + AC_CHECK_HEADERS([linux/videodev2.h]) + AC_CHECK_HEADERS([execinfo.h signal.h sys/time.h sys/types.h time.h]) +-AC_CHECK_HEADERS([lua.h lua5.1/lua.h lua5.2/lua.h lua5.3/lua.h]) ++AC_CHECK_HEADERS([$LUA_IMPL/lua.h]) + + echo "o---------------------------------------" + echo "| Checking functions" +diff --git a/src/sc_lua.h b/src/sc_lua.h +index 770b52f..a6db175 100644 +--- a/src/sc_lua.h ++++ b/src/sc_lua.h +@@ -30,29 +30,9 @@ + + SC_EXTERN_C_BEGIN; + +-#ifdef SC_HAVE_LUA5_3_LUA_H +-#include +-#include +-#include +-#else +-#ifdef SC_HAVE_LUA5_2_LUA_H +-#include +-#include +-#include +-#else +-#ifdef SC_HAVE_LUA5_1_LUA_H +-#include +-#include +-#include +-#else +-#ifdef SC_HAVE_LUA_H +-#include +-#include +-#include +-#endif +-#endif +-#endif +-#endif ++#include <@LUA_IMPL@/lua.h> ++#include <@LUA_IMPL@/lualib.h> ++#include <@LUA_IMPL@/lauxlib.h> + + SC_EXTERN_C_END; + diff --git a/sci-libs/libsc/files/libsc-2.3.6-override_soname.patch b/sci-libs/libsc/files/libsc-2.3.6-override_soname.patch new file mode 100644 index 000000000000..54a45294c380 --- /dev/null +++ b/sci-libs/libsc/files/libsc-2.3.6-override_soname.patch @@ -0,0 +1,13 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index 914237c..0bf982a 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -45,7 +45,7 @@ src_libsc_la_SOURCES = \ + src_libsc_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBSC_CPPFLAGS) + ## This is the official API versioning scheme of libtool. Please see: + ## Read https://www.gnu.org/software/libtool/manual/libtool.html#Versioning +-src_libsc_la_LDFLAGS = -version-info 1:0:0 ++src_libsc_la_LDFLAGS = -release $(VERSION) + LDADD += src/libsc.la + + nodist_include_HEADERS += $(libsc_generated_headers) diff --git a/sci-libs/libsc/libsc-2.3.6.ebuild b/sci-libs/libsc/libsc-2.3.6.ebuild new file mode 100644 index 000000000000..fcea0df228e5 --- /dev/null +++ b/sci-libs/libsc/libsc-2.3.6.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..3} ) + +inherit autotools lua-single toolchain-funcs + +DESCRIPTION="Support for parallel scientific applications" +HOMEPAGE="http://www.p4est.org/" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git" + EGIT_BRANCH="develop" +else + SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="LGPL-2.1+" +SLOT="0" +IUSE="debug examples mpi openmp romio threads" +REQUIRED_USE=" + ${LUA_REQUIRED_USE} + romio? ( mpi )" + +RDEPEND=" + ${LUA_DEPS} + sys-apps/util-linux + virtual/blas + virtual/lapack + mpi? ( virtual/mpi[romio?] )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-2.3-autoconf_lua_version.patch + "${FILESDIR}"/${PN}-2.3.6-override_soname.patch +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + lua-single_pkg_setup +} + +src_prepare() { + default + + sed -i -e "s/@LUA_IMPL@/${ELUA}/" "${S}"/src/sc_lua.h || die + + # Inject a version number into the build system + echo "${PV}" > "${S}"/.tarball-version || die + eautoreconf +} + +src_configure() { + local myeconfargs=( + --disable-static + $(use_enable debug) + $(use_enable mpi) + $(use_enable openmp openmp) + $(use_enable romio mpiio) + $(use_enable threads pthread) + --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" + --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" + ) + econf LUA_IMPL="${ELUA}" "${myeconfargs[@]}" +} + +src_install() { + default + + if use examples; then + docinto examples + dodoc -r example/* + docompress -x /usr/share/doc/${PF}/examples + else + # Remove compiled example binaries in case of -examples: + rm -r "${ED}"/usr/bin || die "rm failed" + fi + + # Remove ac files, bug #619806 + rm -r "${ED}"/usr/share/aclocal || die "rm failed" + + # Fix wrong installation paths: + dodir /usr/share/libsc + mv "${ED}"/etc/* "${ED}"/usr/share/libsc || die "mv failed" + rmdir "${ED}"/etc/ || die "rmdir failed" + mv "${ED}"/usr/share/ini/* "${ED}"/usr/share/libsc || die "mv failed" + rmdir "${ED}"/usr/share/ini || die "rmdir failed" + + # no static archives + find "${ED}" -name '*.la' -delete || die +} diff --git a/sci-libs/libsc/libsc-2.8.3.ebuild b/sci-libs/libsc/libsc-2.8.3.ebuild deleted file mode 100644 index 9ed5ecf5c58f..000000000000 --- a/sci-libs/libsc/libsc-2.8.3.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake toolchain-funcs - -DESCRIPTION="Support for parallel scientific applications" -HOMEPAGE="http://www.p4est.org/" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git" - EGIT_BRANCH="develop" -else - SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="LGPL-2.1+" -SLOT="0" -IUSE="debug examples mpi openmp threads" - -RDEPEND=" - sys-apps/util-linux - sys-libs/zlib - virtual/blas - virtual/lapack - mpi? ( virtual/mpi[romio] )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}-set_version.patch - "${FILESDIR}"/${P}-fix_build_system.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_configure() { - local mycmakeargs=( - -Dmpi="$(usex mpi)" - -Dopenmp="$(usex openmp)" - -Dlibrary_reldir="$(get_libdir)" - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - rm -r "${ED}"/usr/include/getopt.h \ - "${ED}"/usr/include/getopt_int.h \ - "${ED}"/usr/include/sc_builtin || die "rm failed" - - mv "${ED}"/usr/share/docs/SC/* "${ED}"/usr/share/doc/${P}/ || die "mv failed" - rm -r "${ED}"/usr/share/docs || die "rm failed" -} diff --git a/sci-libs/libsc/metadata.xml b/sci-libs/libsc/metadata.xml index ff1113592d21..9267d0132a0b 100644 --- a/sci-libs/libsc/metadata.xml +++ b/sci-libs/libsc/metadata.xml @@ -13,6 +13,9 @@ The SC Library provides support for parallel scientific applications. This support library is primarily used by sci-libs/p4est. + + Build with support for the ROMIO MPI-IO component + cburstedde/libsc -- cgit v1.2.3