science/libmesh
SHA256
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
main
libmesh/use_system_netcdf.patch

44 lines
1.9 KiB
Diff
Raw Permalink Normal View History

Accepting request 701783 from home:StefanBruens:branches:science Currently fails in the testsuite on TW, but I think this is still much better as the current state, and I don't want this to get lost. - Update to version 1.2.1 - Disable components which would disallow distribution under LGPL-2.1 * disable tetgen (AGPL-3.0) and triangle (custom license), these are incompatible with libmesh (LGPL-2.1, not newer) * disable metis (Apache 2.0), can be combined with LGPL-2.1 components, but not used from within * disable parmetis (requires separate license for non-commercial use) - change URL: to current project homepage - point Source: to github release location - make libmesh-devel installable (bad Requires:) OBS-URL: https://build.opensuse.org/request/show/701783 OBS-URL: https://build.opensuse.org/package/show/science/libmesh?expand=0&rev=2
2019-06-05 17:02:45 +00:00
diff --git a/m4/libmesh_optional_packages.m4 b/m4/libmesh_optional_packages.m4
index b33ed9d..6305ee7 100644
--- a/m4/libmesh_optional_packages.m4
+++ b/m4/libmesh_optional_packages.m4
Accepting request 762208 from home:StefanBruens:branches:science - Update to version 1.5.1 Too many changes to list here, see included NEWS file. - Rebase use_system_netcdf.patch - Cleanup spec file - Convert to _multibuild, add openmpi1/openmpi2/openmpi3 flavors OBS-URL: https://build.opensuse.org/request/show/762208 OBS-URL: https://build.opensuse.org/package/show/science/libmesh?expand=0&rev=3
2020-01-10 14:56:45 +00:00
@@ -610,7 +610,15 @@ AM_CONDITIONAL(LIBMESH_ENABLE_HDF5, test x$enablehdf5 = xyes)
Accepting request 701783 from home:StefanBruens:branches:science Currently fails in the testsuite on TW, but I think this is still much better as the current state, and I don't want this to get lost. - Update to version 1.2.1 - Disable components which would disallow distribution under LGPL-2.1 * disable tetgen (AGPL-3.0) and triangle (custom license), these are incompatible with libmesh (LGPL-2.1, not newer) * disable metis (Apache 2.0), can be combined with LGPL-2.1 components, but not used from within * disable parmetis (requires separate license for non-commercial use) - change URL: to current project homepage - point Source: to github release location - make libmesh-devel installable (bad Requires:) OBS-URL: https://build.opensuse.org/request/show/701783 OBS-URL: https://build.opensuse.org/package/show/science/libmesh?expand=0&rev=2
2019-06-05 17:02:45 +00:00
# --------------------------------------------------------------
CONFIGURE_NETCDF
Accepting request 762208 from home:StefanBruens:branches:science - Update to version 1.5.1 Too many changes to list here, see included NEWS file. - Rebase use_system_netcdf.patch - Cleanup spec file - Convert to _multibuild, add openmpi1/openmpi2/openmpi3 flavors OBS-URL: https://build.opensuse.org/request/show/762208 OBS-URL: https://build.opensuse.org/package/show/science/libmesh?expand=0&rev=3
2020-01-10 14:56:45 +00:00
AS_IF([test $enablenetcdf = yes],
- [libmesh_contrib_INCLUDES="$NETCDF_INCLUDE $libmesh_contrib_INCLUDES"])
+ [
+ AS_IF([test x$netcdfversion = xsystem],
+ [
+ libmesh_optional_INCLUDES="$NETCDF_CFLAGS $libmesh_optional_INCLUDES"
+ libmesh_optional_LIBS="$NETCDF_LIBS $libmesh_optional_LIBS"
+ ],
+ [
+ libmesh_contrib_INCLUDES="$NETCDF_INCLUDE $libmesh_contrib_INCLUDES"])
+ ])
Accepting request 701783 from home:StefanBruens:branches:science Currently fails in the testsuite on TW, but I think this is still much better as the current state, and I don't want this to get lost. - Update to version 1.2.1 - Disable components which would disallow distribution under LGPL-2.1 * disable tetgen (AGPL-3.0) and triangle (custom license), these are incompatible with libmesh (LGPL-2.1, not newer) * disable metis (Apache 2.0), can be combined with LGPL-2.1 components, but not used from within * disable parmetis (requires separate license for non-commercial use) - change URL: to current project homepage - point Source: to github release location - make libmesh-devel installable (bad Requires:) OBS-URL: https://build.opensuse.org/request/show/701783 OBS-URL: https://build.opensuse.org/package/show/science/libmesh?expand=0&rev=2
2019-06-05 17:02:45 +00:00
AM_CONDITIONAL(LIBMESH_ENABLE_NETCDF, test x$enablenetcdf = xyes)
Accepting request 762208 from home:StefanBruens:branches:science - Update to version 1.5.1 Too many changes to list here, see included NEWS file. - Rebase use_system_netcdf.patch - Cleanup spec file - Convert to _multibuild, add openmpi1/openmpi2/openmpi3 flavors OBS-URL: https://build.opensuse.org/request/show/762208 OBS-URL: https://build.opensuse.org/package/show/science/libmesh?expand=0&rev=3
2020-01-10 14:56:45 +00:00
AM_CONDITIONAL(LIBMESH_ENABLE_NETCDF_V4, test x$netcdfversion = x4)
Accepting request 701783 from home:StefanBruens:branches:science Currently fails in the testsuite on TW, but I think this is still much better as the current state, and I don't want this to get lost. - Update to version 1.2.1 - Disable components which would disallow distribution under LGPL-2.1 * disable tetgen (AGPL-3.0) and triangle (custom license), these are incompatible with libmesh (LGPL-2.1, not newer) * disable metis (Apache 2.0), can be combined with LGPL-2.1 components, but not used from within * disable parmetis (requires separate license for non-commercial use) - change URL: to current project homepage - point Source: to github release location - make libmesh-devel installable (bad Requires:) OBS-URL: https://build.opensuse.org/request/show/701783 OBS-URL: https://build.opensuse.org/package/show/science/libmesh?expand=0&rev=2
2019-06-05 17:02:45 +00:00
diff --git a/m4/netcdf.m4 b/m4/netcdf.m4
index 698f753..01ff7e2 100644
--- a/m4/netcdf.m4
+++ b/m4/netcdf.m4
Accepting request 762208 from home:StefanBruens:branches:science - Update to version 1.5.1 Too many changes to list here, see included NEWS file. - Rebase use_system_netcdf.patch - Cleanup spec file - Convert to _multibuild, add openmpi1/openmpi2/openmpi3 flavors OBS-URL: https://build.opensuse.org/request/show/762208 OBS-URL: https://build.opensuse.org/package/show/science/libmesh?expand=0&rev=3
2020-01-10 14:56:45 +00:00
@@ -7,6 +7,8 @@ AC_DEFUN([CONFIGURE_NETCDF],
Accepting request 701783 from home:StefanBruens:branches:science Currently fails in the testsuite on TW, but I think this is still much better as the current state, and I don't want this to get lost. - Update to version 1.2.1 - Disable components which would disallow distribution under LGPL-2.1 * disable tetgen (AGPL-3.0) and triangle (custom license), these are incompatible with libmesh (LGPL-2.1, not newer) * disable metis (Apache 2.0), can be combined with LGPL-2.1 components, but not used from within * disable parmetis (requires separate license for non-commercial use) - change URL: to current project homepage - point Source: to github release location - make libmesh-devel installable (bad Requires:) OBS-URL: https://build.opensuse.org/request/show/701783 OBS-URL: https://build.opensuse.org/package/show/science/libmesh?expand=0&rev=2
2019-06-05 17:02:45 +00:00
AS_HELP_STRING([--disable-netcdf],
[build without netCDF binary I/O]),
Accepting request 762208 from home:StefanBruens:branches:science - Update to version 1.5.1 Too many changes to list here, see included NEWS file. - Rebase use_system_netcdf.patch - Cleanup spec file - Convert to _multibuild, add openmpi1/openmpi2/openmpi3 flavors OBS-URL: https://build.opensuse.org/request/show/762208 OBS-URL: https://build.opensuse.org/package/show/science/libmesh?expand=0&rev=3
2020-01-10 14:56:45 +00:00
[AS_CASE("${enableval}",
+ [system], [enablenetcdf=yes
+ netcdfversion=system],
[yes|new|v4], [enablenetcdf=yes
netcdfversion=4],
[old|v3], [enablenetcdf=yes
@@ -27,6 +29,8 @@ AC_DEFUN([CONFIGURE_NETCDF],
])
Accepting request 701783 from home:StefanBruens:branches:science Currently fails in the testsuite on TW, but I think this is still much better as the current state, and I don't want this to get lost. - Update to version 1.2.1 - Disable components which would disallow distribution under LGPL-2.1 * disable tetgen (AGPL-3.0) and triangle (custom license), these are incompatible with libmesh (LGPL-2.1, not newer) * disable metis (Apache 2.0), can be combined with LGPL-2.1 components, but not used from within * disable parmetis (requires separate license for non-commercial use) - change URL: to current project homepage - point Source: to github release location - make libmesh-devel installable (bad Requires:) OBS-URL: https://build.opensuse.org/request/show/701783 OBS-URL: https://build.opensuse.org/package/show/science/libmesh?expand=0&rev=2
2019-06-05 17:02:45 +00:00
Accepting request 762208 from home:StefanBruens:branches:science - Update to version 1.5.1 Too many changes to list here, see included NEWS file. - Rebase use_system_netcdf.patch - Cleanup spec file - Convert to _multibuild, add openmpi1/openmpi2/openmpi3 flavors OBS-URL: https://build.opensuse.org/request/show/762208 OBS-URL: https://build.opensuse.org/package/show/science/libmesh?expand=0&rev=3
2020-01-10 14:56:45 +00:00
AS_CASE("${netcdfversion}",
+ [system], [PKG_CHECK_MODULES([NETCDF], [netcdf >= 4.2])],
Accepting request 701783 from home:StefanBruens:branches:science Currently fails in the testsuite on TW, but I think this is still much better as the current state, and I don't want this to get lost. - Update to version 1.2.1 - Disable components which would disallow distribution under LGPL-2.1 * disable tetgen (AGPL-3.0) and triangle (custom license), these are incompatible with libmesh (LGPL-2.1, not newer) * disable metis (Apache 2.0), can be combined with LGPL-2.1 components, but not used from within * disable parmetis (requires separate license for non-commercial use) - change URL: to current project homepage - point Source: to github release location - make libmesh-devel installable (bad Requires:) OBS-URL: https://build.opensuse.org/request/show/701783 OBS-URL: https://build.opensuse.org/package/show/science/libmesh?expand=0&rev=2
2019-06-05 17:02:45 +00:00
+
Accepting request 762208 from home:StefanBruens:branches:science - Update to version 1.5.1 Too many changes to list here, see included NEWS file. - Rebase use_system_netcdf.patch - Cleanup spec file - Convert to _multibuild, add openmpi1/openmpi2/openmpi3 flavors OBS-URL: https://build.opensuse.org/request/show/762208 OBS-URL: https://build.opensuse.org/package/show/science/libmesh?expand=0&rev=3
2020-01-10 14:56:45 +00:00
[3], [
dnl We shouldn't get here, see if test above.
AC_MSG_ERROR([>>> Error: netCDF3 is no longer distributed with libMesh <<<])
Reference in New Issue Copy Permalink