| 1 |
commit: b10cbd7216b48680b6c9aaaea134fac6352201e1 |
| 2 |
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Mar 31 14:35:04 2022 +0000 |
| 4 |
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
| 5 |
CommitDate: Thu Mar 31 14:35:04 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b10cbd72 |
| 7 |
|
| 8 |
sys-cluster/parallel-netcdf: restrict tests, respect flags |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/835036 |
| 11 |
Closes: https://bugs.gentoo.org/815742 |
| 12 |
Closes: https://bugs.gentoo.org/815739 |
| 13 |
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
| 14 |
|
| 15 |
...netcdf-1.12.2-no-DESTDIR-for-info-clarity.patch | 55 ++++++++++++++++++++++ |
| 16 |
.../parallel-netcdf-1.12.2-respect-flags.patch | 44 +++++++++++++++++ |
| 17 |
.../parallel-netcdf/parallel-netcdf-1.12.2.ebuild | 6 +++ |
| 18 |
3 files changed, 105 insertions(+) |
| 19 |
|
| 20 |
diff --git a/sys-cluster/parallel-netcdf/files/parallel-netcdf-1.12.2-no-DESTDIR-for-info-clarity.patch b/sys-cluster/parallel-netcdf/files/parallel-netcdf-1.12.2-no-DESTDIR-for-info-clarity.patch |
| 21 |
new file mode 100644 |
| 22 |
index 000000000..4a3393b2c |
| 23 |
--- /dev/null |
| 24 |
+++ b/sys-cluster/parallel-netcdf/files/parallel-netcdf-1.12.2-no-DESTDIR-for-info-clarity.patch |
| 25 |
@@ -0,0 +1,55 @@ |
| 26 |
+--- a/Makefile.am |
| 27 |
++++ b/Makefile.am |
| 28 |
+@@ -65,40 +65,40 @@ |
| 29 |
+ @echo '+----------------------------------------------------------------------------+' |
| 30 |
+ @echo '|' |
| 31 |
+ @echo '| PnetCDF has been successfully installed under' |
| 32 |
+- @echo '| $(DESTDIR)$(prefix)' |
| 33 |
++ @echo '| $(prefix)' |
| 34 |
+ @echo '|' |
| 35 |
+ @echo '| * PnetCDF header files have been installed in' |
| 36 |
+- @echo '| $(DESTDIR)$(prefix)/include' |
| 37 |
++ @echo '| $(prefix)/include' |
| 38 |
+ @echo '| * PnetCDF library files have been installed in' |
| 39 |
+- @echo '| $(DESTDIR)$(exec_prefix)/lib' |
| 40 |
++ @echo '| $(exec_prefix)/lib' |
| 41 |
+ @echo '| * PnetCDF utility programs have been installed in' |
| 42 |
+- @echo '| $(DESTDIR)$(exec_prefix)/bin' |
| 43 |
++ @echo '| $(exec_prefix)/bin' |
| 44 |
+ @echo '| * PnetCDF man pages have been installed in' |
| 45 |
+- @echo '| $(DESTDIR)$(prefix)/share/man' |
| 46 |
++ @echo '| $(prefix)/share/man' |
| 47 |
+ @echo '|' |
| 48 |
+ @echo '| To compile your PnetCDF programs, please add the following to the command' |
| 49 |
+ @echo '| line, so the compiler can find the PnetCDF header files:' |
| 50 |
+- @echo '| -I$(DESTDIR)$(prefix)/include' |
| 51 |
++ @echo '| -I$(prefix)/include' |
| 52 |
+ @echo '|' |
| 53 |
+ @if test "x$(has_fortran)" = xyes -a 'x$(FC_MODINC)' != 'x-I' ; then \ |
| 54 |
+ echo '| Add the following line to compile your Fortran programs' ; \ |
| 55 |
+- echo '| $(FC_MODINC)$(DESTDIR)$(prefix)/include' ; \ |
| 56 |
++ echo '| $(FC_MODINC)$(prefix)/include' ; \ |
| 57 |
+ echo '|' ; \ |
| 58 |
+ fi |
| 59 |
+ @echo '| Add the following line to link your program to PnetCDF library:' |
| 60 |
+- @echo '| -L$(DESTDIR)$(exec_prefix)/lib -lpnetcdf' |
| 61 |
++ @echo '| -L$(exec_prefix)/lib -lpnetcdf' |
| 62 |
+ @echo '|' |
| 63 |
+ @if test "x$(enable_shared)" = xyes ; then \ |
| 64 |
+ echo '| Add the following to your run-time environment variable LD_LIBRARY_PATH,' ; \ |
| 65 |
+ echo '| when linking your executable with the PnetCDF shared libraries.' ; \ |
| 66 |
+ if test "x$(enable_netcdf4)" = xyes -a "x$(enable_adios)" = xyes ; then \ |
| 67 |
+- echo '| $(DESTDIR)$(exec_prefix)/lib:$(netcdf4_libdir):$(adios_libdir)' ; \ |
| 68 |
++ echo '| $(exec_prefix)/lib:$(netcdf4_libdir):$(adios_libdir)' ; \ |
| 69 |
+ elif test "x$(enable_netcdf4)" = xyes ; then \ |
| 70 |
+- echo '| $(DESTDIR)$(exec_prefix)/lib:$(netcdf4_libdir)' ; \ |
| 71 |
++ echo '| $(exec_prefix)/lib:$(netcdf4_libdir)' ; \ |
| 72 |
+ elif test "x$(enable_adios)" = xyes ; then \ |
| 73 |
+- echo '| $(DESTDIR)$(exec_prefix)/lib:$(adios_libdir)' ; \ |
| 74 |
++ echo '| $(exec_prefix)/lib:$(adios_libdir)' ; \ |
| 75 |
+ else \ |
| 76 |
+- echo '| $(DESTDIR)$(exec_prefix)/lib' ; \ |
| 77 |
++ echo '| $(exec_prefix)/lib' ; \ |
| 78 |
+ fi ; \ |
| 79 |
+ echo '|' ; \ |
| 80 |
+ fi |
| 81 |
|
| 82 |
diff --git a/sys-cluster/parallel-netcdf/files/parallel-netcdf-1.12.2-respect-flags.patch b/sys-cluster/parallel-netcdf/files/parallel-netcdf-1.12.2-respect-flags.patch |
| 83 |
new file mode 100644 |
| 84 |
index 000000000..3c34675f1 |
| 85 |
--- /dev/null |
| 86 |
+++ b/sys-cluster/parallel-netcdf/files/parallel-netcdf-1.12.2-respect-flags.patch |
| 87 |
@@ -0,0 +1,44 @@ |
| 88 |
+--- a/src/utils/ncmpidiff/Makefile.am |
| 89 |
++++ b/src/utils/ncmpidiff/Makefile.am |
| 90 |
+@@ -18,7 +18,7 @@ |
| 91 |
+ cdfdiff_SOURCES = cdfdiff.c |
| 92 |
+ |
| 93 |
+ cdfdiff$(EXEEXT): cdfdiff.c Makefile |
| 94 |
+- $(SEQ_CC) -I$(top_srcdir)/src/utils/ncvalidator -o $@ $< |
| 95 |
++ $(SEQ_CC) $(CFLAGS) $(LDFLAGS) -PIE -I$(top_srcdir)/src/utils/ncvalidator -o $@ $< |
| 96 |
+ |
| 97 |
+ $(top_builddir)/src/libs/libpnetcdf.la: |
| 98 |
+ set -e; cd $(top_builddir)/src/libs && $(MAKE) $(MFLAGS) |
| 99 |
+--- a/src/utils/ncoffsets/Makefile.am |
| 100 |
++++ b/src/utils/ncoffsets/Makefile.am |
| 101 |
+@@ -10,7 +10,7 @@ |
| 102 |
+ EXTRA_DIST = ncoffsets.c |
| 103 |
+ |
| 104 |
+ ncoffsets$(EXEEXT): ncoffsets.c |
| 105 |
+- $(SEQ_CC) -o $@ $< |
| 106 |
++ $(SEQ_CC) $(CFLAGS) $(LDFLAGS) -PIE -o $@ $< |
| 107 |
+ |
| 108 |
+ dist_man_MANS = ncoffsets.1 |
| 109 |
+ |
| 110 |
+--- a/src/utils/ncvalidator/Makefile.am |
| 111 |
++++ b/src/utils/ncvalidator/Makefile.am |
| 112 |
+@@ -76,7 +76,7 @@ |
| 113 |
+ TST_HDF5_FILES = pad_superblock.h5 |
| 114 |
+ |
| 115 |
+ ncvalidator$(EXEEXT): ncvalidator.c Makefile |
| 116 |
+- $(SEQ_CC) -o $@ $< |
| 117 |
++ $(SEQ_CC) $(CFLAGS) $(LDFLAGS) -PIE -o $@ $< |
| 118 |
+ |
| 119 |
+ # autimake 1.11.3 has not yet implemented AM_TESTS_ENVIRONMENT |
| 120 |
+ # For newer versions, we can use AM_TESTS_ENVIRONMENT instead |
| 121 |
+--- a/src/utils/pnetcdf_version/Makefile.am |
| 122 |
++++ b/src/utils/pnetcdf_version/Makefile.am |
| 123 |
+@@ -22,7 +22,7 @@ |
| 124 |
+ endif |
| 125 |
+ |
| 126 |
+ pnetcdf_version$(EXEEXT): pnetcdf_version.c |
| 127 |
+- $(SEQ_CC) $(XDEFS) -o $@ $< |
| 128 |
++ $(SEQ_CC) $(CFLAGS) $(LDFLAGS) -PIE $(XDEFS) -o $@ $< |
| 129 |
+ |
| 130 |
+ dist_man_MANS = pnetcdf_version.1 |
| 131 |
+ |
| 132 |
|
| 133 |
diff --git a/sys-cluster/parallel-netcdf/parallel-netcdf-1.12.2.ebuild b/sys-cluster/parallel-netcdf/parallel-netcdf-1.12.2.ebuild |
| 134 |
index 34a074397..7126273a1 100644 |
| 135 |
--- a/sys-cluster/parallel-netcdf/parallel-netcdf-1.12.2.ebuild |
| 136 |
+++ b/sys-cluster/parallel-netcdf/parallel-netcdf-1.12.2.ebuild |
| 137 |
@@ -36,6 +36,12 @@ BDEPEND=" |
| 138 |
) |
| 139 |
" |
| 140 |
|
| 141 |
+RESTRICT="test" # tests require MPI set up |
| 142 |
+PATCHES=( |
| 143 |
+ "${FILESDIR}/${P}-no-DESTDIR-for-info-clarity.patch" |
| 144 |
+ "${FILESDIR}/${P}-respect-flags.patch" |
| 145 |
+) |
| 146 |
+ |
| 147 |
pkg_setup() { |
| 148 |
fortran-2_pkg_setup |
| 149 |
} |
Archives