Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
science/code_saturne: upgrade to v8.1.0
Release notes at <https://github.com/code-saturne/code_saturne/releases/tag/v8.1.0>
- Loading branch information
1 parent
b73567f
commit 2e9ed05
Showing
6 changed files
with
75 additions
and
10,934 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
TIMESTAMP = 1697142365 | ||
SHA256 (code_saturne-8.0.2.tar.gz) = 48d33a55e9f7b77b486e0fa1706223910eb9add7d13f11bb18dc79583587378f | ||
SIZE (code_saturne-8.0.2.tar.gz) = 61255604 | ||
TIMESTAMP = 1702564424 | ||
SHA256 (code_saturne-8.1.0.tar.gz) = 6f2b067337b8ad003a26b91f59971a1028f01cf14c962031629203899dc4053f | ||
SIZE (code_saturne-8.1.0.tar.gz) = 64587304 |
14 changes: 14 additions & 0 deletions
14
science/code_saturne/files/patch-build-aux_cs__compile__build.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
--- build-aux/cs_compile_build.py.orig 2023-12-14 20:49:47 UTC | ||
+++ build-aux/cs_compile_build.py | ||
@@ -394,8 +394,9 @@ def get_dynamic_lib_dep_flags(pkg, top_builddir=None, | ||
if libs: | ||
cmd_line += libs + " " | ||
|
||
- if rpath_list: | ||
- cmd_line += "-Wl,-rpath -Wl," + ':'.join(rpath_list) | ||
+ # Not needed on FreeBSD, we have ldconfig, and it causes the libs to get linked against $DESTDIR | ||
+ #if rpath_list: | ||
+ # cmd_line += "-Wl,-rpath -Wl," + ':'.join(rpath_list) | ||
|
||
return cmd_line.rstrip() | ||
|
12 changes: 12 additions & 0 deletions
12
science/code_saturne/files/patch-build-aux_cs__link__library.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
--- build-aux/cs_link_library.py.orig 2023-12-14 20:36:11 UTC | ||
+++ build-aux/cs_link_library.py | ||
@@ -263,8 +263,7 @@ def build_shared_library(linker, | ||
for o in other: | ||
if o in ignore_deps: | ||
continue | ||
- if o[:2] == '-R': | ||
- cmd += ["-Wl,-rpath", "-Wl,"+o[2:]] | ||
+ # Not useful on FreeBSD (we have lsconfig) and causes libs to be linked against $DESTDIR | ||
else: | ||
cmd.append(o) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- src/apps/Makefile.am.orig 2023-12-10 13:11:41 UTC | ||
+++ src/apps/Makefile.am | ||
@@ -221,7 +221,7 @@ install-exec-hook: ${local_libraries_add} | ||
$(PYTHON) -B $(top_srcdir)/build-aux/cs_compile_build.py \ | ||
--lib-flags-only --mode=install --dest "$(DESTDIR)"` ; \ | ||
$(PYTHON) -B $(top_srcdir)/build-aux/cs_link_library.py -o "$(DESTDIR)$(libdir)/libsaturne.${SHARED_LIB_EXT}" --echo --linker ${CS_LD} --version ${cs_version_lib} --whole-archive-start ${libsaturne_a_libs} --whole-archive-end ${LDFLAGS_SHARED} ${CXXFLAGS_SHARED} ${LDFLAGS} ${AM_LDFLAGS} $${ldadd_saturne}; \ | ||
- $(PYTHON) -B $(top_srcdir)/build-aux/cs_link_library.py -o "$(DESTDIR)$(libdir)/libcs_solver.${SHARED_LIB_EXT}" --echo --linker ${CS_LD} --version ${cs_version_lib} ${LDFLAGS_SHARED} ${CXXFLAGS_SHARED} cs_solver.$(OBJEXT) ${LDFLAGS} -L"$(DESTDIR)$(libdir)" -lsaturne-${cs_version_lib} ${AM_LDFLAGS} $${ldadd_saturne}; \ | ||
+ $(PYTHON) -B $(top_srcdir)/build-aux/cs_link_library.py -o "$(DESTDIR)$(libdir)/libcs_solver.${SHARED_LIB_EXT}" --echo --linker ${CS_LD} --version ${cs_version_lib} ${LDFLAGS_SHARED} ${CXXFLAGS_SHARED} cs_solver.$(OBJEXT) ${LDFLAGS} -lsaturne-${cs_version_lib} ${AM_LDFLAGS} $${ldadd_saturne}; \ | ||
}; \ | ||
PYTHONPATH=$(top_srcdir)/python/code_saturne/base \ | ||
CS_TOP_BUILDDIR=$(top_builddir) \ |
Oops, something went wrong.