mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
sci-libs/libsc: drop 2.3.6, 2.8.5-r3
Signed-off-by: Matthias Maier <tamiko@gentoo.org>
This commit is contained in:
@@ -1,3 +1 @@
|
||||
DIST libsc-2.3.6.tar.gz 346618 BLAKE2B 6da88f1eec572a5d30ebef5e17554874e3d88d124fbbb7582092bd43a85a547f130a5406ffd40f86d564c95a3e600b2eb854ee0378b8e0c2d755a7d45d55ff1e SHA512 9037ebeebcf84d1dc3026172ee3fd3182729fbdbdadb478e8c05670b17bd3e2f3b192bac9a509bd99312c5f944a10fb7eb0636e8c7bd133b30677eb5ead6d117
|
||||
DIST libsc-2.8.5.tar.gz 401520 BLAKE2B 28f74c03dc9a6238c254683585e3a6e372718bbf147f1a1bfe051d9a9079491650eca645bb695ce4c36920dda459904be6f9d41fb53163952d9076302072e181 SHA512 d7854a77cb574531d410c978af5768782d6201c730a3248371a822172cb99fe0b2efc8c2e4f495160924fb867ed77ab1b9ac17a1db349d8a6495228698cf970b
|
||||
DIST libsc-2.8.6.tar.gz 436045 BLAKE2B e0c9911ece10703d70686c5fa67700ed28f2ad2cfa6fc5e8f31c18fadb3e85c82a062520765589f71fbb8b69f2ebc9d07803488e8b0eae50d3146cefddb6c1ad SHA512 9e8d9256fafce3a583a9dc850308020ae614434e94146dc81bd1b8a3130e6ff55eb094d97fe48bf2b9205ea16906503313f1ebf4f3386db92d6cf0bac50c2d74
|
||||
|
||||
@@ -1,64 +0,0 @@
|
||||
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 <lua5.3/lua.h>
|
||||
-#include <lua5.3/lualib.h>
|
||||
-#include <lua5.3/lauxlib.h>
|
||||
-#else
|
||||
-#ifdef SC_HAVE_LUA5_2_LUA_H
|
||||
-#include <lua5.2/lua.h>
|
||||
-#include <lua5.2/lualib.h>
|
||||
-#include <lua5.2/lauxlib.h>
|
||||
-#else
|
||||
-#ifdef SC_HAVE_LUA5_1_LUA_H
|
||||
-#include <lua5.1/lua.h>
|
||||
-#include <lua5.1/lualib.h>
|
||||
-#include <lua5.1/lauxlib.h>
|
||||
-#else
|
||||
-#ifdef SC_HAVE_LUA_H
|
||||
-#include <lua.h>
|
||||
-#include <lualib.h>
|
||||
-#include <lauxlib.h>
|
||||
-#endif
|
||||
-#endif
|
||||
-#endif
|
||||
-#endif
|
||||
+#include <@LUA_IMPL@/lua.h>
|
||||
+#include <@LUA_IMPL@/lualib.h>
|
||||
+#include <@LUA_IMPL@/lauxlib.h>
|
||||
|
||||
SC_EXTERN_C_END;
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
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)
|
||||
@@ -1,57 +0,0 @@
|
||||
diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake
|
||||
index 5ca9f6d..86b9035 100644
|
||||
--- a/cmake/zlib.cmake
|
||||
+++ b/cmake/zlib.cmake
|
||||
@@ -1,51 +1,8 @@
|
||||
# build Zlib to ensure compatibility.
|
||||
# We use Zlib 2.x for speed and robustness.
|
||||
include(GNUInstallDirs)
|
||||
-include(ExternalProject)
|
||||
|
||||
-set(ZLIB_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include)
|
||||
-
|
||||
-if(BUILD_SHARED_LIBS)
|
||||
- if(WIN32)
|
||||
- set(ZLIB_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}zlib1${CMAKE_SHARED_LIBRARY_SUFFIX})
|
||||
- else()
|
||||
- set(ZLIB_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}z${CMAKE_SHARED_LIBRARY_SUFFIX})
|
||||
- endif()
|
||||
-else()
|
||||
- if(MSVC)
|
||||
- set(ZLIB_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}zlibstatic${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||||
- else()
|
||||
- set(ZLIB_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}z${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||||
- endif()
|
||||
-endif()
|
||||
-
|
||||
-set(zlib_cmake_args
|
||||
--DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
|
||||
--DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
|
||||
--DCMAKE_BUILD_TYPE=Release
|
||||
--DZLIB_COMPAT:BOOL=on
|
||||
--DZLIB_ENABLE_TESTS:BOOL=off
|
||||
--DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
|
||||
--DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
|
||||
-)
|
||||
-
|
||||
-ExternalProject_Add(ZLIB
|
||||
-GIT_REPOSITORY https://github.com/zlib-ng/zlib-ng.git
|
||||
-GIT_TAG 2.0.6
|
||||
-GIT_SHALLOW true
|
||||
-CMAKE_ARGS ${zlib_cmake_args}
|
||||
-BUILD_BYPRODUCTS ${ZLIB_LIBRARIES}
|
||||
-TLS_VERIFY true
|
||||
-CONFIGURE_HANDLED_BY_BUILD ON
|
||||
-INACTIVITY_TIMEOUT 60
|
||||
-)
|
||||
-
|
||||
-# --- imported target
|
||||
-
|
||||
-file(MAKE_DIRECTORY ${ZLIB_INCLUDE_DIRS})
|
||||
-# avoid race condition
|
||||
+find_library(ZLIB_LIBRARIES NAMES z-ng)
|
||||
|
||||
add_library(ZLIB::ZLIB INTERFACE IMPORTED GLOBAL)
|
||||
-add_dependencies(ZLIB::ZLIB ZLIB) # to avoid include directory race condition
|
||||
target_link_libraries(ZLIB::ZLIB INTERFACE ${ZLIB_LIBRARIES})
|
||||
-target_include_directories(ZLIB::ZLIB INTERFACE ${ZLIB_INCLUDE_DIRS})
|
||||
@@ -1,25 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 87af1b1..82cb357 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)
|
||||
+
|
||||
enable_testing()
|
||||
|
||||
include(cmake/options.cmake)
|
||||
@@ -57,7 +59,10 @@ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
||||
FILES_MATCHING PATTERN "*.h"
|
||||
)
|
||||
|
||||
-install(TARGETS sc EXPORT ${PROJECT_NAME}-targets)
|
||||
+install(TARGETS sc EXPORT ${PROJECT_NAME}-targets
|
||||
+ARCHIVE DESTINATION ${library_reldir}
|
||||
+LIBRARY DESTINATION ${library_reldir}
|
||||
+)
|
||||
|
||||
add_subdirectory(src)
|
||||
add_subdirectory(example)
|
||||
@@ -1,33 +0,0 @@
|
||||
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)
|
||||
@@ -1,49 +0,0 @@
|
||||
diff --git a/cmake/git.cmake b/cmake/git.cmake
|
||||
index f88e984..f04f52b 100644
|
||||
--- a/cmake/git.cmake
|
||||
+++ b/cmake/git.cmake
|
||||
@@ -1,39 +1,5 @@
|
||||
-# --- extract version from Git
|
||||
-
|
||||
-set(PROJECT_MAJOR 0)
|
||||
-set(PROJECT_MINOR 0)
|
||||
-set(PROJECT_PATCH 0)
|
||||
-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(PROJECT_MAJOR "${CMAKE_MATCH_1}")
|
||||
- set(PROJECT_MINOR "${CMAKE_MATCH_2}")
|
||||
- set(PROJECT_PATCH "${CMAKE_MATCH_3}")
|
||||
- set(PROJECT_VERSION ${PROJECT_MAJOR}.${PROJECT_MINOR}.${PROJECT_PATCH}.999)
|
||||
- elseif(git_version MATCHES
|
||||
- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)")
|
||||
- set(PROJECT_MAJOR "${CMAKE_MATCH_1}")
|
||||
- set(PROJECT_MINOR "${CMAKE_MATCH_2}")
|
||||
- set(PROJECT_PATCH "${CMAKE_MATCH_3}")
|
||||
- set(PROJECT_VERSION ${PROJECT_MAJOR}.${PROJECT_MINOR}.${PROJECT_PATCH})
|
||||
- elseif(git_version MATCHES
|
||||
- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)")
|
||||
- set(PROJECT_MAJOR "${CMAKE_MATCH_1}")
|
||||
- set(PROJECT_MINOR "${CMAKE_MATCH_2}")
|
||||
- set(PROJECT_VERSION ${PROJECT_MAJOR}.${PROJECT_MINOR})
|
||||
- elseif(git_version MATCHES
|
||||
- "^(0|[1-9][0-9]*)")
|
||||
- set(PROJECT_MAJOR "${CMAKE_MATCH_1}")
|
||||
- set(PROJECT_VERSION ${PROJECT_MAJOR})
|
||||
- endif()
|
||||
-endif()
|
||||
+set(git_version 2.8.5)
|
||||
+set(PROJECT_MAJOR 2)
|
||||
+set(PROJECT_MINOR 8)
|
||||
+set(PROJECT_PATCH 5)
|
||||
+set(PROJECT_VERSION 2.8.5)
|
||||
@@ -1,135 +0,0 @@
|
||||
diff --git a/src/sc_containers.c b/src/sc_containers.c
|
||||
index 47c86d7..b9a1979 100644
|
||||
--- a/src/sc_containers.c
|
||||
+++ b/src/sc_containers.c
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
#include <sc_containers.h>
|
||||
#ifdef SC_HAVE_ZLIB
|
||||
-#include <zlib.h>
|
||||
+#include <zlib-ng.h>
|
||||
#endif
|
||||
|
||||
/* array routines */
|
||||
@@ -636,13 +636,13 @@ sc_array_checksum (sc_array_t * array)
|
||||
unsigned int crc;
|
||||
size_t bytes;
|
||||
|
||||
- crc = adler32 (0, Z_NULL, 0);
|
||||
+ crc = zng_adler32 (0, Z_NULL, 0);
|
||||
if (array->elem_count == 0) {
|
||||
return crc;
|
||||
}
|
||||
|
||||
bytes = array->elem_count * array->elem_size;
|
||||
- crc = adler32 (crc, (const Bytef *) array->array, bytes);
|
||||
+ crc = zng_adler32 (crc, (const Bytef *) array->array, bytes);
|
||||
|
||||
return crc;
|
||||
#else
|
||||
diff --git a/src/sc_io.c b/src/sc_io.c
|
||||
index a7ed413..bc2df7d 100644
|
||||
--- a/src/sc_io.c
|
||||
+++ b/src/sc_io.c
|
||||
@@ -25,7 +25,7 @@
|
||||
#include <sc_puff.h>
|
||||
#include <libb64.h>
|
||||
#ifdef SC_HAVE_ZLIB
|
||||
-#include <zlib.h>
|
||||
+#include <zlib-ng.h>
|
||||
#endif
|
||||
|
||||
#ifndef SC_ENABLE_MPIIO
|
||||
@@ -706,7 +706,7 @@ sc_io_encode_zlib (sc_array_t *data, sc_array_t *out,
|
||||
#ifndef SC_HAVE_ZLIB
|
||||
input_compress_bound = sc_io_noncompress_bound (input_size);
|
||||
#else
|
||||
- input_compress_bound = compressBound ((uLong) input_size);
|
||||
+ input_compress_bound = zng_compressBound ((uLong) input_size);
|
||||
#endif /* SC_HAVE_ZLIB */
|
||||
sc_array_init_count (&compressed, 1,
|
||||
SC_IO_ENCODE_INFO_LEN + input_compress_bound);
|
||||
@@ -715,9 +715,9 @@ sc_io_encode_zlib (sc_array_t *data, sc_array_t *out,
|
||||
sc_io_noncompress (compressed.array + SC_IO_ENCODE_INFO_LEN,
|
||||
input_compress_bound, data->array, input_size);
|
||||
#else
|
||||
- zrv = compress2 ((Bytef *) compressed.array + SC_IO_ENCODE_INFO_LEN,
|
||||
- &input_compress_bound, (Bytef *) data->array,
|
||||
- (uLong) input_size, zlib_compression_level);
|
||||
+ zrv = zng_compress2 ((Bytef *) compressed.array + SC_IO_ENCODE_INFO_LEN,
|
||||
+ &input_compress_bound, (Bytef *) data->array,
|
||||
+ (uLong) input_size, zlib_compression_level);
|
||||
SC_CHECK_ABORT (zrv == Z_OK, "Error on zlib compression");
|
||||
#endif /* SC_HAVE_ZLIB */
|
||||
|
||||
@@ -993,9 +993,9 @@ sc_io_decode (sc_array_t *data, sc_array_t *out,
|
||||
}
|
||||
#else
|
||||
uncompsize = (uLong) encoded_size;
|
||||
- zrv = uncompress ((Bytef *) out->array, &uncompsize,
|
||||
- (Bytef *) (compressed.array + SC_IO_ENCODE_INFO_LEN),
|
||||
- ocnt - SC_IO_ENCODE_INFO_LEN);
|
||||
+ zrv = zng_uncompress ((Bytef *) out->array, &uncompsize,
|
||||
+ (Bytef *) (compressed.array + SC_IO_ENCODE_INFO_LEN),
|
||||
+ ocnt - SC_IO_ENCODE_INFO_LEN);
|
||||
if (zrv != Z_OK) {
|
||||
SC_LERROR ("zlib uncompress error\n");
|
||||
goto decode_error;
|
||||
@@ -1120,9 +1120,9 @@ sc_vtk_write_compressed (FILE * vtkfile, char *numeric_data,
|
||||
base64_init_encodestate (&encode_state);
|
||||
for (theblock = 0; theblock < numregularblocks; ++theblock) {
|
||||
comp_length = code_length;
|
||||
- retval = compress2 ((Bytef *) comp_data, &comp_length,
|
||||
- (const Bytef *) (numeric_data + theblock * blocksize),
|
||||
- (uLong) blocksize, Z_BEST_COMPRESSION);
|
||||
+ retval = zng_compress2 ((Bytef *) comp_data, &comp_length,
|
||||
+ (const Bytef *) (numeric_data + theblock * blocksize),
|
||||
+ (uLong) blocksize, Z_BEST_COMPRESSION);
|
||||
SC_CHECK_ZLIB (retval);
|
||||
compression_header[3 + theblock] = comp_length;
|
||||
base_length = base64_encode_block (comp_data, comp_length,
|
||||
@@ -1135,9 +1135,9 @@ sc_vtk_write_compressed (FILE * vtkfile, char *numeric_data,
|
||||
/* write odd-sized last block if necessary */
|
||||
if (lastsize > 0) {
|
||||
comp_length = code_length;
|
||||
- retval = compress2 ((Bytef *) comp_data, &comp_length,
|
||||
- (const Bytef *) (numeric_data + theblock * blocksize),
|
||||
- (uLong) lastsize, Z_BEST_COMPRESSION);
|
||||
+ retval = zng_compress2 ((Bytef *) comp_data, &comp_length,
|
||||
+ (const Bytef *) (numeric_data + theblock * blocksize),
|
||||
+ (uLong) lastsize, Z_BEST_COMPRESSION);
|
||||
SC_CHECK_ZLIB (retval);
|
||||
compression_header[3 + theblock] = comp_length;
|
||||
base_length = base64_encode_block (comp_data, comp_length,
|
||||
diff --git a/test/test_builtin.c b/test/test_builtin.c
|
||||
index 371aff6..9a99c2d 100644
|
||||
--- a/test/test_builtin.c
|
||||
+++ b/test/test_builtin.c
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
/* truthfully, the libraries below are not builtin anymore */
|
||||
#ifdef SC_HAVE_ZLIB
|
||||
-#include <zlib.h>
|
||||
+#include <zlib-ng.h>
|
||||
#endif
|
||||
|
||||
static int
|
||||
@@ -87,13 +87,13 @@ test_zlib (void)
|
||||
char b3[BUFSIZ];
|
||||
uLong adler0, adler1, adler2, adler3a, adler3b;
|
||||
|
||||
- adler0 = adler32 (0L, Z_NULL, 0);
|
||||
- adler1 = adler32 (adler0, (const Bytef *) b1, l1);
|
||||
- adler2 = adler32 (adler0, (const Bytef *) b2, l2);
|
||||
- adler3a = adler32_combine (adler1, adler2, l2);
|
||||
+ adler0 = zng_adler32 (0L, Z_NULL, 0);
|
||||
+ adler1 = zng_adler32 (adler0, (const Bytef *) b1, l1);
|
||||
+ adler2 = zng_adler32 (adler0, (const Bytef *) b2, l2);
|
||||
+ adler3a = zng_adler32_combine (adler1, adler2, l2);
|
||||
|
||||
snprintf (b3, BUFSIZ, "%s%s", b1, b2);
|
||||
- adler3b = adler32 (adler0, (const Bytef *) b3, l1 + l2);
|
||||
+ adler3b = zng_adler32 (adler0, (const Bytef *) b3, l1 + l2);
|
||||
|
||||
return adler3a != adler3b;
|
||||
}
|
||||
@@ -1,100 +0,0 @@
|
||||
# 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
|
||||
}
|
||||
@@ -1,72 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
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-ng
|
||||
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
|
||||
"${FILESDIR}"/${P}-do_not_compile_zlib-ng.patch
|
||||
"${FILESDIR}"/${P}-use_zlib-ng_symbols.patch
|
||||
"${FILESDIR}"/${P}-fix_cmake_path.patch
|
||||
)
|
||||
|
||||
pkg_pretend() {
|
||||
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# avoid using debug codepaths that are manually enabled with the
|
||||
# RelWithDebInfo build type
|
||||
local CMAKE_BUILD_TYPE="Release"
|
||||
|
||||
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/${PF}/ || die "mv failed"
|
||||
rm -r "${ED}"/usr/share/docs || die "rm failed"
|
||||
}
|
||||
@@ -13,9 +13,6 @@
|
||||
The SC Library provides support for parallel scientific applications.
|
||||
This support library is primarily used by <pkg>sci-libs/p4est</pkg>.
|
||||
</longdescription>
|
||||
<use>
|
||||
<flag name="romio">Build with support for the ROMIO MPI-IO component</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<remote-id type="github">cburstedde/libsc</remote-id>
|
||||
</upstream>
|
||||
|
||||
Reference in New Issue
Block a user