[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsc/files/, sci-libs/libsc/
commit: deade5ff52628efc8005c16ca711917bf8565f99 Author: Matthias Maier gentoo org> AuthorDate: Sat Jul 15 01:23:44 2023 + Commit: Matthias Maier gentoo org> CommitDate: Sat Jul 15 02:15:12 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=deade5ff sci-libs/libsc: add 2.3.6 This partially reverts commit 406d3fc821c6be208814445bc2ad98bed3c2e9b4 and bumps 2.3.3 to 2.3.6. In turns out that libsc/p4est-2.8.5 has a massive performance regression which necessitates to use the "stable" version 2.3.6. Thus, bring it back into the tree Signed-off-by: Matthias Maier gentoo.org> sci-libs/libsc/Manifest| 1 + .../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/metadata.xml| 3 + 5 files changed, 181 insertions(+) diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest index af1e9c81cb76..d17cc1e97d93 100644 --- a/sci-libs/libsc/Manifest +++ b/sci-libs/libsc/Manifest @@ -1,2 +1,3 @@ +DIST libsc-2.3.6.tar.gz 346618 BLAKE2B 6da88f1eec572a5d30ebef5e17554874e3d88d124fbbb7582092bd43a85a547f130a5406ffd40f86d564c95a3e600b2eb854ee0378b8e0c2d755a7d45d55ff1e SHA512 9037ebeebcf84d1dc3026172ee3fd3182729fbdbdadb478e8c05670b17bd3e2f3b192bac9a509bd99312c5f944a10fb7eb0636e8c7bd133b30677eb5ead6d117 DIST libsc-2.8.3.tar.gz 360755 BLAKE2B 2d7e3a16b97de551678ebb33f362e1ef7ebb0bcbf8d00b1a5317bfbf6732cf7bb9be2d215c79395809f3c616c23da5236c4f0f436a7b8bb07171141aaf08bbb3 SHA512 9def8850898f2d7d7a6ffaffd0872bc18af28026407356a1fe10f2b4f6d4a32ae6febe59c91cfa8817969624f995d48f64e0d5424b475e3a4c501338f4de70de DIST libsc-2.8.5.tar.gz 401520 BLAKE2B 28f74c03dc9a6238c254683585e3a6e372718bbf147f1a1bfe051d9a9079491650eca645bb695ce4c36920dda459904be6f9d41fb53163952d9076302072e181 SHA512 d7854a77cb574531d410c978af5768782d6201c730a3248371a822172cb99fe0b2efc8c2e4f495160924fb867ed77ab1b9ac17a1db349d8a6495228698cf970b 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 ..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 ..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
[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsc/files/, sci-libs/libsc/
commit: c5fa4cd54e6ce9ecb1d40b444587763d0507abd5
Author: Matthias Maier gentoo org>
AuthorDate: Tue Jun 20 00:17:41 2023 +
Commit: Matthias Maier gentoo org>
CommitDate: Tue Jun 20 00:45:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5fa4cd5
sci-libs/libsc: QA: fix install locations, EAPI bump
Signed-off-by: Matthias Maier gentoo.org>
.../libsc/files/libsc-2.8.5-fix_cmake_path.patch | 33 ++
...libsc-2.8.5-r1.ebuild => libsc-2.8.5-r2.ebuild} | 7 ++---
2 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/sci-libs/libsc/files/libsc-2.8.5-fix_cmake_path.patch
b/sci-libs/libsc/files/libsc-2.8.5-fix_cmake_path.patch
new file mode 100644
index ..d36f9151901c
--- /dev/null
+++ b/sci-libs/libsc/files/libsc-2.8.5-fix_cmake_path.patch
@@ -0,0 +1,33 @@
+diff --git a/cmake/install.cmake b/cmake/install.cmake
+index f093fa9..c281f66 100644
+--- a/cmake/install.cmake
b/cmake/install.cmake
+@@ -14,13 +14,13 @@ COMPATIBILITY SameMajorVersion
+
+ install(EXPORT ${PROJECT_NAME}-targets
+ NAMESPACE ${PROJECT_NAME}::
+-DESTINATION cmake
++DESTINATION ${library_reldir}/cmake/SC
+ )
+
+ install(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}Config.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}ConfigVersion.cmake
+-DESTINATION cmake
++DESTINATION ${library_reldir}/cmake/SC
+ )
+
+ export(EXPORT ${PROJECT_NAME}-targets
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 800937f..9de0cfe 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -75,7 +75,7 @@ endif(BUILD_TESTING)
+
+ install(FILES
+ ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindSC.cmake
+-DESTINATION cmake)
++DESTINATION ${library_reldir}/cmake/SC)
+
+ include(cmake/pkgconf.cmake)
+ include(cmake/install.cmake)
diff --git a/sci-libs/libsc/libsc-2.8.5-r1.ebuild
b/sci-libs/libsc/libsc-2.8.5-r2.ebuild
similarity index 90%
rename from sci-libs/libsc/libsc-2.8.5-r1.ebuild
rename to sci-libs/libsc/libsc-2.8.5-r2.ebuild
index 33d78e6073fe..786ecf6012b8 100644
--- a/sci-libs/libsc/libsc-2.8.5-r1.ebuild
+++ b/sci-libs/libsc/libsc-2.8.5-r2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake toolchain-funcs
@@ -35,6 +35,7 @@ PATCHES=(
"${FILESDIR}"/${P}-fix_build_system.patch
"${FILESDIR}"/${P}-do_not_compile_zlib-ng.patch
"${FILESDIR}"/${P}-use_zlib-ng_symbols.patch
+ "${FILESDIR}"/${P}-fix_cmake_path.patch
)
pkg_pretend() {
@@ -58,12 +59,10 @@ src_configure() {
src_install() {
cmake_src_install
- mv "${ED}"/usr/cmake "${ED}"/usr/$(get_libdir)/ || die "mv failed"
-
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"
+ mv "${ED}"/usr/share/docs/SC/* "${ED}"/usr/share/doc/${PF}/ || die "mv
failed"
rm -r "${ED}"/usr/share/docs || die "rm failed"
}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsc/files/, sci-libs/libsc/
commit: fc1125212d7c3f05146818f6870d48521231fda4
Author: Matthias Maier gentoo org>
AuthorDate: Mon Feb 14 00:15:02 2022 +
Commit: Matthias Maier gentoo org>
CommitDate: Mon Feb 14 00:51:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc112521
sci-libs/libsc: version bump to 2.8.3
With the switch to CMake the new version should now obey all compiler
and linker flag overrides.
Closes: https://bugs.gentoo.org/794859
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthias Maier gentoo.org>
sci-libs/libsc/Manifest| 1 +
.../libsc/files/libsc-2.8.3-fix_build_system.patch | 41 ++
sci-libs/libsc/files/libsc-2.8.3-set_version.patch | 44 +++
sci-libs/libsc/libsc-2.8.3.ebuild | 65 ++
4 files changed, 151 insertions(+)
diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest
index f5ddaed8843d..05ef5652e9e8 100644
--- a/sci-libs/libsc/Manifest
+++ b/sci-libs/libsc/Manifest
@@ -1,2 +1,3 @@
DIST libsc-2.3.1.tar.gz 344456 BLAKE2B
cee44d07372162aecc8104257d1c5d4935d60030ceae4041ae4c5110f491b48b7709c55af0286b2a1fc5df2d7883b2ab4499c3884162b779fb9aaa86fbc5822c
SHA512
02e160ad6fb4e674a9de2a41cfef6727d470a17c184e7b0310fe3e39f1112f4c643ca35a62377562caf1e8cc753cd5c0f5f996fba24b115498b01d16c140080a
DIST libsc-2.3.3.tar.gz 345177 BLAKE2B
c9077cfe7af3eb8bfb34cf655fa8e49658f1ce0b866b58398fc7bae305ac276b002c83d930a20df1bdf52a22645ebb1698d51a937ce56db993d36ef68d640e8a
SHA512
b51d08a987d7c8a83eaae0be98a078a4a9160b9141b482015110534ddac075337c81f54f3efa4f8a8bce54e31565a6323aad37e35674c1d40686d4ab3747ed6b
+DIST libsc-2.8.3.tar.gz 360755 BLAKE2B
2d7e3a16b97de551678ebb33f362e1ef7ebb0bcbf8d00b1a5317bfbf6732cf7bb9be2d215c79395809f3c616c23da5236c4f0f436a7b8bb07171141aaf08bbb3
SHA512
9def8850898f2d7d7a6ffaffd0872bc18af28026407356a1fe10f2b4f6d4a32ae6febe59c91cfa8817969624f995d48f64e0d5424b475e3a4c501338f4de70de
diff --git a/sci-libs/libsc/files/libsc-2.8.3-fix_build_system.patch
b/sci-libs/libsc/files/libsc-2.8.3-fix_build_system.patch
new file mode 100644
index ..b5bdc734ab55
--- /dev/null
+++ b/sci-libs/libsc/files/libsc-2.8.3-fix_build_system.patch
@@ -0,0 +1,41 @@
+https://github.com/cburstedde/libsc/pull/54
+https://github.com/cburstedde/libsc/pull/55
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2ce08e2..a588beb 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -8,6 +8,8 @@ HOMEPAGE_URL https://www.p4est.org/
+ DESCRIPTION "The SC library supports parallel scientific applications."
+ VERSION ${PROJECT_VERSION})
+
++set(CMAKE_POSITION_INDEPENDENT_CODE ON)
++
+ include(CTest)
+
+ include(cmake/options.cmake)
+@@ -28,8 +30,7 @@ if(MPI_FOUND)
+ endif()
+
+ # --- libb64
+-add_library(libb64 OBJECT libb64/cencode.c libb64/cdecode.c
+- libb64/b64dec.c libb64/b64enc.c)
++add_library(libb64 OBJECT libb64/cencode.c libb64/cdecode.c)
+ target_include_directories(libb64 PRIVATE libb64)
+
+ # --- sc
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a588beb..aff0eca 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -64,8 +64,8 @@ install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/
${PROJECT_SOURCE_DIR}/src/sc_builti
+
+ install(TARGETS sc
+ EXPORT ${PROJECT_NAME}Targets
+- ARCHIVE DESTINATION lib
+- LIBRARY DESTINATION lib)
++ ARCHIVE DESTINATION ${library_reldir}
++ LIBRARY DESTINATION ${library_reldir})
+
+ add_subdirectory(src)
+
diff --git a/sci-libs/libsc/files/libsc-2.8.3-set_version.patch
b/sci-libs/libsc/files/libsc-2.8.3-set_version.patch
new file mode 100644
index ..dcd63994cc67
--- /dev/null
+++ b/sci-libs/libsc/files/libsc-2.8.3-set_version.patch
@@ -0,0 +1,44 @@
+diff --git a/cmake/git.cmake b/cmake/git.cmake
+index dd6009e..7c5c8f3 100644
+--- a/cmake/git.cmake
b/cmake/git.cmake
+@@ -1,36 +1,3 @@
+ # --- extract version from Git
+
+-set(PROJECT_VERSION 0.0.0)
+-find_program(GIT_VERSION_GEN NAMES git-version-gen
+- PATHS ${CMAKE_SOURCE_DIR}/build-aux NO_DEFAULT_PATH)
+-if(GIT_VERSION_GEN)
+- execute_process(COMMAND ${GIT_VERSION_GEN} .tarball_version
+-WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+-RESULT_VARIABLE _err
+-OUTPUT_VARIABLE git_version
+-OUTPUT_STRIP_TRAILING_WHITESPACE)
+-endif()
+-if(_err EQUAL 0)
+- if(git_version MATCHES
+- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.].*")
+-set(_major "${CMAKE_MATCH_1}")
+-set(_minor "${CMAKE_MATCH_2}")
+-set(_patch "${CMAKE_MATCH_3}")
+-set(PROJECT_VERSION ${_major}.${_minor}.${_patch}.999)
+- elseif(git_version MATCHES
+- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)")
+-set(_major "${CMAKE_MATCH_1}")
+-set(_minor "${CMAKE_MATCH_2}")
+-set(_patch "${CMAKE_MATCH_3}")
+-set(PROJECT_VERSION ${_major}.${_minor}.${_patch})
+- elseif(git_version MATCHES
+- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)")
+-
[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsc/files/, sci-libs/libsc/
commit: 4a36f33db8b24b3e1d642dfeeb68f0c1ed9c03cf
Author: Matthias Maier gentoo org>
AuthorDate: Mon Feb 14 00:17:45 2022 +
Commit: Matthias Maier gentoo org>
CommitDate: Mon Feb 14 00:51:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a36f33d
sci-libs/libsc: update live ebuild
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthias Maier gentoo.org>
sci-libs/libsc/files/libsc--set_version.patch | 44 ++
sci-libs/libsc/libsc-.ebuild | 72 ++-
2 files changed, 63 insertions(+), 53 deletions(-)
diff --git a/sci-libs/libsc/files/libsc--set_version.patch
b/sci-libs/libsc/files/libsc--set_version.patch
new file mode 100644
index ..0820b001d8cd
--- /dev/null
+++ b/sci-libs/libsc/files/libsc--set_version.patch
@@ -0,0 +1,44 @@
+diff --git a/cmake/git.cmake b/cmake/git.cmake
+index dd6009e..7c5c8f3 100644
+--- a/cmake/git.cmake
b/cmake/git.cmake
+@@ -1,36 +1,3 @@
+ # --- extract version from Git
+
+-set(PROJECT_VERSION 0.0.0)
+-find_program(GIT_VERSION_GEN NAMES git-version-gen
+- PATHS ${CMAKE_SOURCE_DIR}/build-aux NO_DEFAULT_PATH)
+-if(GIT_VERSION_GEN)
+- execute_process(COMMAND ${GIT_VERSION_GEN} .tarball_version
+-WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+-RESULT_VARIABLE _err
+-OUTPUT_VARIABLE git_version
+-OUTPUT_STRIP_TRAILING_WHITESPACE)
+-endif()
+-if(_err EQUAL 0)
+- if(git_version MATCHES
+- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.].*")
+-set(_major "${CMAKE_MATCH_1}")
+-set(_minor "${CMAKE_MATCH_2}")
+-set(_patch "${CMAKE_MATCH_3}")
+-set(PROJECT_VERSION ${_major}.${_minor}.${_patch}.999)
+- elseif(git_version MATCHES
+- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)")
+-set(_major "${CMAKE_MATCH_1}")
+-set(_minor "${CMAKE_MATCH_2}")
+-set(_patch "${CMAKE_MATCH_3}")
+-set(PROJECT_VERSION ${_major}.${_minor}.${_patch})
+- elseif(git_version MATCHES
+- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)")
+-set(_major "${CMAKE_MATCH_1}")
+-set(_minor "${CMAKE_MATCH_2}")
+-set(PROJECT_VERSION ${_major}.${_minor})
+- elseif(git_version MATCHES
+- "^(0|[1-9][0-9]*)")
+-set(_major "${CMAKE_MATCH_1}")
+-set(PROJECT_VERSION ${_major})
+- endif()
+-endif()
++set(PROJECT_VERSION .0.0)
+
+
diff --git a/sci-libs/libsc/libsc-.ebuild b/sci-libs/libsc/libsc-.ebuild
index 00143eccd873..8d6bdbb8314c 100644
--- a/sci-libs/libsc/libsc-.ebuild
+++ b/sci-libs/libsc/libsc-.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-LUA_COMPAT=( lua5-{1..3} )
-
-inherit autotools lua-single toolchain-funcs
+inherit cmake toolchain-funcs
DESCRIPTION="Support for parallel scientific applications"
HOMEPAGE="http://www.p4est.org/;
@@ -21,22 +19,20 @@ fi
LICENSE="LGPL-2.1+"
SLOT="0"
-IUSE="debug examples mpi openmp romio threads"
-REQUIRED_USE="
- ${LUA_REQUIRED_USE}
- romio? ( mpi )"
+IUSE="debug examples mpi openmp threads"
RDEPEND="
- ${LUA_DEPS}
sys-apps/util-linux
+ sys-libs/zlib
virtual/blas
virtual/lapack
- mpi? ( virtual/mpi[romio?] )"
+ mpi? ( virtual/mpi[romio] )"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
PATCHES=(
- "${FILESDIR}"/${PN}-_20201220-autoconf_lua_version.patch
+ "${FILESDIR}"/${PN}-2.8.3-fix_build_system.patch
+ "${FILESDIR}"/${P}-set_version.patch
)
pkg_pretend() {
@@ -45,55 +41,25 @@ pkg_pretend() {
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)"
+ local mycmakeargs=(
+ -Dmpi="$(usex mpi)"
+ -Dopenmp="$(usex openmp)"
+ -Dlibrary_reldir="$(get_libdir)"
)
- econf LUA_IMPL="${ELUA}" "${myeconfargs[@]}"
+
+ cmake_src_configure
}
src_install() {
- default
-
- if use examples; then
- docinto examples
- dodoc -r example/*
- docompress -x /usr/share/doc/${PF}/examples
- else
- # Remove compiled
[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsc/files/, sci-libs/libsc/
commit: 68d1bc6fccd1f7732b15f206a598dcc9a46514ae
Author: David Seifert gentoo org>
AuthorDate: Wed Aug 4 17:40:37 2021 +
Commit: David Seifert gentoo org>
CommitDate: Wed Aug 4 17:40:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68d1bc6f
sci-libs/libsc: drop 2.2-r100
Signed-off-by: David Seifert gentoo.org>
sci-libs/libsc/Manifest| 1 -
.../files/libsc-2.2-autoconf_lua_version.patch | 51 ---
sci-libs/libsc/libsc-2.2-r100.ebuild | 100 -
3 files changed, 152 deletions(-)
diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest
index 4cd22d93ef3..f17c047aae4 100644
--- a/sci-libs/libsc/Manifest
+++ b/sci-libs/libsc/Manifest
@@ -1,2 +1 @@
-DIST libsc-2.2.tar.gz 311542 BLAKE2B
0879be69208f0964d73cc297a64b158ad88344e876a90dd4bd39c80fc0cf8237f4551cb684dee36e08068fa04644b887ec56230335a9984363055c1248aa6185
SHA512
97953794fdeb985bedb1dc9378f10ed4824446c63762d7813aced3309c2d6b27368c91fecb22587dccdf8b3b42aaaba9e782b739086cf542570360795897ac14
DIST libsc-2.3.1.tar.gz 344456 BLAKE2B
cee44d07372162aecc8104257d1c5d4935d60030ceae4041ae4c5110f491b48b7709c55af0286b2a1fc5df2d7883b2ab4499c3884162b779fb9aaa86fbc5822c
SHA512
02e160ad6fb4e674a9de2a41cfef6727d470a17c184e7b0310fe3e39f1112f4c643ca35a62377562caf1e8cc753cd5c0f5f996fba24b115498b01d16c140080a
diff --git a/sci-libs/libsc/files/libsc-2.2-autoconf_lua_version.patch
b/sci-libs/libsc/files/libsc-2.2-autoconf_lua_version.patch
deleted file mode 100644
index c2cbdb1b003..000
--- a/sci-libs/libsc/files/libsc-2.2-autoconf_lua_version.patch
+++ /dev/null
@@ -1,51 +0,0 @@
a/config/sc_include.m4
-+++ b/config/sc_include.m4
-@@ -281,7 +281,7 @@ AC_DEFUN([SC_CHECK_LIBRARIES],
- [
- SC_REQUIRE_LIB([m], [fabs])
- SC_CHECK_LIB([z], [adler32_combine], [ZLIB], [$1])
--SC_CHECK_LIB([lua52 lua5.2 lua51 lua5.1 lua lua5], [lua_createtable],
-+SC_CHECK_LIB([$LUA_IMPL], [lua_createtable],
-[LUA], [$1])
- SC_CHECK_BLAS_LAPACK([$1])
- SC_BUILTIN_ALL_PREFIX([$1])
a/configure.ac
-+++ b/configure.ac
-@@ -74,7 +74,7 @@ echo "| Checking headers"
- echo "o---"
-
- 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"
a/src/sc_lua.h
-+++ b/src/sc_lua.h
-@@ -30,23 +30,9 @@
-
- SC_EXTERN_C_BEGIN;
-
--#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
-+#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/libsc-2.2-r100.ebuild
b/sci-libs/libsc/libsc-2.2-r100.ebuild
deleted file mode 100644
index e29a4201d39..000
--- a/sci-libs/libsc/libsc-2.2-r100.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} )
-
-inherit autotools lua-single toolchain-funcs
-
-DESCRIPTION="Support for parallel scientific applications"
-HOMEPAGE="http://www.p4est.org/;
-
-if [[ ${PV} = ** ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git;
- EGIT_BRANCH="develop"
- SRC_URI=""
-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 static-libs 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}
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.2-autoconf_lua_version.patch
-)
-
-DOCS=( AUTHORS NEWS README )
-
-AUTOTOOLS_AUTORECONF=true
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then
- tc-has-openmp || \
- die "Please select an openmp capable compiler like
gcc[openmp]"
- fi
-}
-
-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=(
- $(use_enable debug)
- $(use_enable mpi)
- $(use_enable openmp openmp)
- $(use_enable romio mpiio)
- $(use_enable static-libs static)
- $(use_enable threads pthread)
-
[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsc/files/, sci-libs/libsc/
commit: c52d9871a73bf583fc7e013a30893d9019e89721
Author: Matthias Maier gentoo org>
AuthorDate: Mon Jun 7 15:33:21 2021 +
Commit: Matthias Maier gentoo org>
CommitDate: Mon Jun 7 16:41:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c52d9871
sci-libs/libsc: version bump to 2.3.1
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Matthias Maier gentoo.org>
sci-libs/libsc/Manifest| 1 +
.../files/libsc-2.3-autoconf_lua_version.patch | 64 +
sci-libs/libsc/libsc-2.3.1.ebuild | 100 +
3 files changed, 165 insertions(+)
diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest
index 9357d90a6a8..4cd22d93ef3 100644
--- a/sci-libs/libsc/Manifest
+++ b/sci-libs/libsc/Manifest
@@ -1 +1,2 @@
DIST libsc-2.2.tar.gz 311542 BLAKE2B
0879be69208f0964d73cc297a64b158ad88344e876a90dd4bd39c80fc0cf8237f4551cb684dee36e08068fa04644b887ec56230335a9984363055c1248aa6185
SHA512
97953794fdeb985bedb1dc9378f10ed4824446c63762d7813aced3309c2d6b27368c91fecb22587dccdf8b3b42aaaba9e782b739086cf542570360795897ac14
+DIST libsc-2.3.1.tar.gz 344456 BLAKE2B
cee44d07372162aecc8104257d1c5d4935d60030ceae4041ae4c5110f491b48b7709c55af0286b2a1fc5df2d7883b2ab4499c3884162b779fb9aaa86fbc5822c
SHA512
02e160ad6fb4e674a9de2a41cfef6727d470a17c184e7b0310fe3e39f1112f4c643ca35a62377562caf1e8cc753cd5c0f5f996fba24b115498b01d16c140080a
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 000..9881d0aa622
--- /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/libsc-2.3.1.ebuild
b/sci-libs/libsc/libsc-2.3.1.ebuild
new file mode 100644
index 000..1e37b3080cf
--- /dev/null
+++ b/sci-libs/libsc/libsc-2.3.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+
+inherit autotools lua-single toolchain-funcs
+
+DESCRIPTION="Support for parallel scientific applications"
+HOMEPAGE="http://www.p4est.org/;
+
+if [[ ${PV} = ** ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git;
+ EGIT_BRANCH="develop"
+ SRC_URI=""
+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 static-libs 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}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.3-autoconf_lua_version.patch
+)
+
+DOCS=( AUTHORS NEWS README )
+
+AUTOTOOLS_AUTORECONF=true
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then
+ tc-has-openmp || \
+ die "Please select an openmp capable compiler like
gcc[openmp]"
+ fi
+}
+
+src_prepare() {
+ default
+
+ sed -i -e
