Bug#1068100: armci-mpi: autopkgtest spuriously fails
Samuel Thibault, le sam. 30 mars 2024 16:55:11 +0100, a ecrit: > I have forwarded a fix to upstream > https://github.com/pmodels/armci-mpi/pull/47 > which is already merged. > > Unless somebody objects, I'll NMU it. I have uploaded the attached changes to delayed/2. Samuel diff -Nru armci-mpi-0.3.1~beta/debian/changelog armci-mpi-0.3.1~beta/debian/changelog --- armci-mpi-0.3.1~beta/debian/changelog 2023-03-19 14:08:54.0 +0100 +++ armci-mpi-0.3.1~beta/debian/changelog 2024-03-30 23:17:18.0 +0100 @@ -1,3 +1,12 @@ +armci-mpi (0.3.1~beta-7.1) unstable; urgency=medium + + * Non-maintainer upload. + * patches/fix-test.patch: Fix test_mpi_indexed_gets.c test and strengthen +the others. Closes: #1066227. + * patches/ftbfs.patch: Fix build with qa=+bug-implicit-func. + + -- Samuel Thibault Sat, 30 Mar 2024 23:17:18 +0100 + armci-mpi (0.3.1~beta-7) unstable; urgency=medium * Team upload. diff -Nru armci-mpi-0.3.1~beta/debian/patches/fix-test.patch armci-mpi-0.3.1~beta/debian/patches/fix-test.patch --- armci-mpi-0.3.1~beta/debian/patches/fix-test.patch 1970-01-01 01:00:00.0 +0100 +++ armci-mpi-0.3.1~beta/debian/patches/fix-test.patch 2024-03-30 23:17:18.0 +0100 @@ -0,0 +1,193 @@ +https://github.com/pmodels/armci-mpi/pull/47 + +commit 80cc91748392aec9eced295eb531548a565dac0e +Author: Samuel Thibault +Date: Sat Mar 30 16:35:11 2024 +0100 + +tests/mpi/test_mpi_indexed_gets.c: Fix reception buffer initialization + +loc_buf was completely uninitialized, while the second and third loop nests +are checking that the values are 1.0 + rank. With luck it would be zero, and +thus the actual - expected > 1e-10 check would pass (since the difference is +then negative). With less luck the check would spuriously fail for the part +that is not overwritten by the MPI_Get. + + Signed-off-by: Samuel Thibault + +commit 9c0f6b08ba706a7c2f3e74d325cfd2a010300108 +Author: Samuel Thibault +Date: Sat Mar 30 16:38:58 2024 +0100 + +tests/mpi: Fix comparison of floating-double types + +In case the actual value is zero and the expected value is positive, the +check would spuriously succeed. + + Signed-off-by: Samuel Thibault + +commit cd001a46801fed9f406ea57238a131b0a0e063fe +Author: Samuel Thibault +Date: Sat Mar 30 16:41:58 2024 +0100 + +tests/mpi/test_mpi_indexed_gets.c: Strengthen test + +Now that it is fixed, we can make it actually perform strided accesses. + + Signed-off-by: Samuel Thibault + +--- + tests/mpi/test_mpi_accs.c |2 +- + tests/mpi/test_mpi_indexed_accs.c |6 +++--- + tests/mpi/test_mpi_indexed_gets.c | 12 +++- + tests/mpi/test_mpi_indexed_puts_gets.c |6 +++--- + tests/mpi/test_mpi_subarray_accs.c |6 +++--- + 5 files changed, 17 insertions(+), 15 deletions(-) + +--- a/tests/mpi/test_mpi_indexed_gets.c b/tests/mpi/test_mpi_indexed_gets.c +@@ -19,7 +19,7 @@ + + #define XDIM 8 + #define YDIM 1024 +-#define SUB_XDIM 8 ++#define SUB_XDIM 4 + #define SUB_YDIM 256 + + int main(int argc, char **argv) { +@@ -44,8 +44,10 @@ int main(int argc, char **argv) { + if (rank == 0) + printf("MPI RMA Strided Get Test:\n"); + +-for (i = 0; i < XDIM*YDIM; i++) ++for (i = 0; i < XDIM*YDIM; i++) { + *(win_buf + i) = 1.0 + rank; ++*(loc_buf + i) = 1.0 + rank; ++} + + MPI_Win_create(win_buf, bufsize, 1, MPI_INFO_NULL, MPI_COMM_WORLD, _win); + +@@ -88,7 +90,7 @@ int main(int argc, char **argv) { + for (j = 0; j < SUB_YDIM; j++) { + const double actual = *(loc_buf + i + j*XDIM); + const double expected = (1.0 + peer); +-if (actual - expected > 1e-10) { ++if (fabs(actual - expected) > 1e-10) { + printf("%d: Data validation failed at [%d, %d] expected=%f actual=%f\n", + rank, j, i, expected, actual); + errors++; +@@ -100,7 +102,7 @@ int main(int argc, char **argv) { + for (j = 0; j < SUB_YDIM; j++) { + const double actual = *(loc_buf + i + j*XDIM); + const double expected = 1.0 + rank; +-if (actual - expected > 1e-10) { ++if (fabs(actual - expected) > 1e-10) { + printf("%d: Data validation failed at [%d, %d] expected=%f actual=%f\n", + rank, j, i, expected, actual); + errors++; +@@ -112,7 +114,7 @@ int main(int argc, char **argv) { + for (j = SUB_YDIM; j < YDIM; j++) { + const double actual = *(loc_buf + i + j*XDIM); + const double expected = 1.0 + rank; +-if (actual - expected > 1e-10) { ++if (fabs(actual - expected) > 1e-10) { + printf("%d: Data validation failed at [%d, %d] expected=%f actual=%f\n", + rank, j, i, expected, actual); + errors++; +--- a/tests/mpi/test_mp
Bug#1068100: armci-mpi: autopkgtest spuriously fails
Source: armci-mpi Version: 0.3.1~beta-7 Severity: serious Tags: patch upstream fixed-upstream Forwarded: https://github.com/pmodels/armci-mpi/pull/47 Justification: Prevents mpich migration Hello, The test_mpi_indexed_gets test is currently failing spuriously in debian unstable due to an uninitialized value, e.g. https://ci.debian.net/packages/a/armci-mpi/testing/amd64/44486187/ , preventing the newer mpich version from migrating to unstable. I have forwarded a fix to upstream https://github.com/pmodels/armci-mpi/pull/47 which is already merged. Unless somebody objects, I'll NMU it. Samuel -- System Information: Debian Release: trixie/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 'unreleased'), (500, 'testing-debug'), (500, 'stable-security'), (500, 'stable-debug'), (500, 'oldstable-proposed-updates-debug'), (500, 'oldstable-proposed-updates'), (500, 'oldoldstable'), (500, 'buildd-unstable'), (500, 'unstable'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental-debug'), (1, 'buildd-experimental'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386, arm64 Kernel: Linux 6.8.0 (SMP w/8 CPU threads; PREEMPT) Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE not set Shell: /bin/sh linked to /usr/bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled commit 80cc91748392aec9eced295eb531548a565dac0e Author: Samuel Thibault Date: Sat Mar 30 16:35:11 2024 +0100 tests/mpi/test_mpi_indexed_gets.c: Fix reception buffer initialization loc_buf was completely uninitialized, while the second and third loop nests are checking that the values are 1.0 + rank. With luck it would be zero, and thus the actual - expected > 1e-10 check would pass (since the difference is then negative). With less luck the check would spuriously fail for the part that is not overwritten by the MPI_Get. Signed-off-by: Samuel Thibault commit 9c0f6b08ba706a7c2f3e74d325cfd2a010300108 Author: Samuel Thibault Date: Sat Mar 30 16:38:58 2024 +0100 tests/mpi: Fix comparison of floating-double types In case the actual value is zero and the expected value is positive, the check would spuriously succeed. Signed-off-by: Samuel Thibault commit cd001a46801fed9f406ea57238a131b0a0e063fe Author: Samuel Thibault Date: Sat Mar 30 16:41:58 2024 +0100 tests/mpi/test_mpi_indexed_gets.c: Strengthen test Now that it is fixed, we can make it actually perform strided accesses. Signed-off-by: Samuel Thibault diff --git a/tests/mpi/test_mpi_indexed_gets.c b/tests/mpi/test_mpi_indexed_gets.c index dc1bd9d..3570492 100644 --- a/tests/mpi/test_mpi_indexed_gets.c +++ b/tests/mpi/test_mpi_indexed_gets.c @@ -44,8 +44,10 @@ int main(int argc, char **argv) { if (rank == 0) printf("MPI RMA Strided Get Test:\n"); -for (i = 0; i < XDIM*YDIM; i++) +for (i = 0; i < XDIM*YDIM; i++) { *(win_buf + i) = 1.0 + rank; +*(loc_buf + i) = 1.0 + rank; +} MPI_Win_create(win_buf, bufsize, 1, MPI_INFO_NULL, MPI_COMM_WORLD, _win); diff --git a/tests/mpi/test_mpi_accs.c b/tests/mpi/test_mpi_accs.c index ee9b0a9..730a632 100644 --- a/tests/mpi/test_mpi_accs.c +++ b/tests/mpi/test_mpi_accs.c @@ -55,7 +55,7 @@ int main(int argc, char **argv) { for (j = 0; j < YDIM; j++) { const double actual = *(buffer + i + j*XDIM); const double expected = (1.0 + rank) + (1.0 + ((rank+nranks-1)%nranks)) * (ITERATIONS); -if (actual - expected > 1e-10) { +if (fabs(actual - expected) > 1e-10) { printf("%d: Data validation failed at [%d, %d] expected=%f actual=%f\n", rank, j, i, expected, actual); errors++; diff --git a/tests/mpi/test_mpi_indexed_accs.c b/tests/mpi/test_mpi_indexed_accs.c index 78c06bd..0fc3baa 100644 --- a/tests/mpi/test_mpi_indexed_accs.c +++ b/tests/mpi/test_mpi_indexed_accs.c @@ -97,7 +97,7 @@ int main(int argc, char **argv) { for (j = 0; j < SUB_YDIM; j++) { const double actual = *(win_buf + i + j*XDIM); const double expected = (1.0 + rank) + (1.0 + ((rank+nranks-1)%nranks)) * (ITERATIONS); -if (actual - expected > 1e-10) { +if (fabs(actual - expected) > 1e-10) { printf("%d: Data validation failed at [%d, %d] expected=%f actual=%f\n", rank, j, i, expected, actual); errors++; @@ -109,7 +109,7 @@ int main(int argc, char **argv) { for (j = 0; j < SUB_YDIM; j++) { const double actual = *(win_buf + i + j*XDIM); const double expected = 1.0 + rank; -if (actual - expected > 1e-10) { +if (fabs(actual - expected) > 1e-10) { printf("%d: Data validation failed at [%d, %d] expected=%f actual
Bug#1066735: mpich: fails to connect processes and report ranks with trivial mpi test
Samuel Thibault, le mar. 26 mars 2024 18:38:22 +0100, a ecrit: > Samuel Thibault, le ven. 15 mars 2024 10:31:54 +0100, a ecrit: > > Lucas Nussbaum, le mer. 13 mars 2024 15:56:40 +0100, a ecrit: > > I'm 0/1 > > I'm 0/1 > > > > and the same with a hosts file containing localhost twice. > > I tried with disabling PMIX (commenting PMIX:= > --with-pmix=/usr/lib/$(DEB_HOST_MULTIARCH)/pmix2), and that fixed it. > > Unless somebody complains, I will NMU that change, to get back mpich > working in unstable. I have uploaded the attached change to DELAYED/2. Samuel diff -Nru mpich-4.2.0/debian/changelog mpich-4.2.0/debian/changelog --- mpich-4.2.0/debian/changelog2024-02-27 09:59:43.0 +0100 +++ mpich-4.2.0/debian/changelog2024-03-26 22:40:26.0 +0100 @@ -1,3 +1,10 @@ +mpich (4.2.0-5.1) unstable; urgency=medium + + * Non-maintainer upload. + * rules: Re-disable pmix: Closes: #1066735 + + -- Samuel Thibault Tue, 26 Mar 2024 22:40:26 +0100 + mpich (4.2.0-5) unstable; urgency=medium * Install mod files in include dir until all deps updated diff -Nru mpich-4.2.0/debian/rules mpich-4.2.0/debian/rules --- mpich-4.2.0/debian/rules2024-02-27 09:59:43.0 +0100 +++ mpich-4.2.0/debian/rules2024-03-26 22:40:26.0 +0100 @@ -54,12 +54,12 @@ PMIX:= ifeq (,$(findstring $(DEB_HOST_ARCH),$(NO_CH4_ARCH))) DEVICE:= --with-device=ch4:ofi - PMIX:= --with-pmix=/usr/lib/$(DEB_HOST_MULTIARCH)/pmix2 + #PMIX:= --with-pmix=/usr/lib/$(DEB_HOST_MULTIARCH)/pmix2 endif ifneq (,$(filter $(DEB_HOST_ARCH),$(UCX_ARCH))) DEVICE:= --with-device=ch4:ucx UCX:= --with-ucx=/usr - PMIX:= --with-pmix=/usr/lib/$(DEB_HOST_MULTIARCH)/pmix2 + #PMIX:= --with-pmix=/usr/lib/$(DEB_HOST_MULTIARCH)/pmix2 endif extra_flags += \ -- debian-science-maintainers mailing list debian-science-maintainers@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers
Bug#1066735: mpich: fails to connect processes and report ranks with trivial mpi test
Hello, Samuel Thibault, le ven. 15 mars 2024 10:31:54 +0100, a ecrit: > Lucas Nussbaum, le mer. 13 mars 2024 15:56:40 +0100, a ecrit: > > > [P0T0] Starting EZTrace (pid: 878489)... > > > [P0T0] MPI mode selected > > > This program requires 2 MPI processes, aborting... > > > dir: mpi_ping_trace > > > /bin/rm: cannot remove 'mpi_ping_trace': Directory not empty > > > [P0T0] Stopping EZTrace (pid:878489)... > > > [P0T0] Starting EZTrace (pid: 878488)... > > > [P0T0] MPI mode selected > > > This program requires 2 MPI processes, aborting... > > > [P0T0] Stopping EZTrace (pid:878488)... > > > [[1;32mOK[0m] > > The test does run 2 processes. I tried this: > > $ cat test.c > #include > #include > int main(int argc, char *argv[]) { > int rank, size; > MPI_Init(, ); > MPI_Comm_rank(MPI_COMM_WORLD, ); > MPI_Comm_size(MPI_COMM_WORLD, ); > printf("I'm %d/%d\n", rank, size); > return 0; > } > > And it reports: > > $ mpirun -np 2 ./test > Authorization required, but no authorization protocol specified > > Authorization required, but no authorization protocol specified > > Authorization required, but no authorization protocol specified > > Authorization required, but no authorization protocol specified > > I'm 0/1 > I'm 0/1 > > and the same with a hosts file containing localhost twice. I tried with disabling PMIX (commenting PMIX:= --with-pmix=/usr/lib/$(DEB_HOST_MULTIARCH)/pmix2), and that fixed it. Unless somebody complains, I will NMU that change, to get back mpich working in unstable. Samuel -- debian-science-maintainers mailing list debian-science-maintainers@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers
Re: Bug#1066735: mpich: fails to connect processes and report ranks with trivial mpi test
Control: notfound -1 4.1.2-3 Samuel Thibault, le ven. 15 mars 2024 10:31:54 +0100, a ecrit: > $ mpirun -np 2 ./test > Authorization required, but no authorization protocol specified > > Authorization required, but no authorization protocol specified > > Authorization required, but no authorization protocol specified > > Authorization required, but no authorization protocol specified > > I'm 0/1 > I'm 0/1 Note: this is new with mpich 4.2.0, 4.1.2-3 is fine. Samuel -- debian-science-maintainers mailing list debian-science-maintainers@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers
Re: Bug#1066735: mpich: fails to connect processes and report ranks with trivial mpi test
Control: reassign -1 mpich Control: retitle -1 mpich: fails to connect processes and report ranks Control: affects -1 + eztrace Hello, Lucas Nussbaum, le mer. 13 mars 2024 15:56:40 +0100, a ecrit: > > [P0T0] Starting EZTrace (pid: 878489)... > > [P0T0] MPI mode selected > > This program requires 2 MPI processes, aborting... > > dir: mpi_ping_trace > > /bin/rm: cannot remove 'mpi_ping_trace': Directory not empty > > [P0T0] Stopping EZTrace (pid:878489)... > > [P0T0] Starting EZTrace (pid: 878488)... > > [P0T0] MPI mode selected > > This program requires 2 MPI processes, aborting... > > [P0T0] Stopping EZTrace (pid:878488)... > > [[1;32mOK[0m] The test does run 2 processes. I tried this: $ cat test.c #include #include int main(int argc, char *argv[]) { int rank, size; MPI_Init(, ); MPI_Comm_rank(MPI_COMM_WORLD, ); MPI_Comm_size(MPI_COMM_WORLD, ); printf("I'm %d/%d\n", rank, size); return 0; } And it reports: $ mpirun -np 2 ./test Authorization required, but no authorization protocol specified Authorization required, but no authorization protocol specified Authorization required, but no authorization protocol specified Authorization required, but no authorization protocol specified I'm 0/1 I'm 0/1 and the same with a hosts file containing localhost twice. Samuel -- debian-science-maintainers mailing list debian-science-maintainers@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers
Bug#1055458: mpi-defaults: Please add hurd-amd64 cases
Hello, Santiago Vila, le lun. 06 nov. 2023 23:24:52 +0100, a ecrit: > Hi. Just FYI: After the upload, the package is currently > BD-Uninstallable on hurd-amd64: > > https://buildd.debian.org/status/package.php?p=mpi-defaults=sid > > (I guess this should be fixed somewhere else). Yes, it's waiting for a full-build of hwloc, that will happen during the bootstrapping. In the meanwhile I have already built a patched package to unreleased, so we'll be fine with it for now. Samuel -- debian-science-maintainers mailing list debian-science-maintainers@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers
Bug#1055458: mpi-defaults: Please add hurd-amd64 cases
Santiago Vila, le lun. 06 nov. 2023 20:05:58 +0100, a ecrit: > El 6/11/23 a las 19:01, Samuel Thibault escribió: > > Source: mpi-defaults > > Version: 1.14 > > Severity: important > > Tags: patch > > > > Hello, > > > > Could you apply the attached patch to add hurd-amd64 support? > > Hello. There is a very similar request here for loong64: > > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050845 > > but your patch is a lot smaller. > > Are you sure that your patch is complete? AIUI the debian/control part is auto-generated. Samuel -- debian-science-maintainers mailing list debian-science-maintainers@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers
Bug#1055458: mpi-defaults: Please add hurd-amd64 cases
Source: mpi-defaults Version: 1.14 Severity: important Tags: patch Hello, Could you apply the attached patch to add hurd-amd64 support? Thanks, Samuel -- System Information: Debian Release: trixie/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'stable-security'), (500, 'stable-debug'), (500, 'oldstable-proposed-updates-debug'), (500, 'oldstable-proposed-updates'), (500, 'oldoldstable-proposed-updates'), (500, 'oldoldstable'), (500, 'buildd-unstable'), (500, 'unstable'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental-debug'), (1, 'buildd-experimental'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386, arm64 Kernel: Linux 6.5.0-1-amd64 (SMP w/8 CPU threads; PREEMPT) Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE not set Shell: /bin/sh linked to /usr/bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled -- Samuel --- Pour une évaluation indépendante, transparente et rigoureuse ! Je soutiens la Commission d'Évaluation de l'Inria. --- debian/rules.original 2023-11-04 23:03:26.0 + +++ debian/rules2023-11-04 23:32:41.0 + @@ -16,6 +16,7 @@ armel \ armhf \ hppa \ + hurd-amd64 \ hurd-i386 \ i386 \ ia64 \ @@ -42,6 +43,7 @@ armel \ armhf \ hppa \ + hurd-amd64 \ hurd-i386 \ i386 \ ia64 \ @@ -71,6 +73,7 @@ armel \ armhf \ hppa \ + hurd-amd64 \ hurd-i386 \ i386 \ ia64 \ -- debian-science-maintainers mailing list debian-science-maintainers@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers
Bug#1055455: mpich: Update hurd configuration
Package: mpich Version: 4.1.2-2 Severity: important Tags: patch Hello, The mpich package needs a few fixes to build on hurd-amd64, as the attached patch does. The patch incidentally fixes passing --with-ibverbs --with-libfabric=/usr --with-slurm on most archs : the condition was inverted in debian/rules... It probably also fixes build failures reported on ppc64 (see #1032008 #1054035) Samuel -- System Information: Debian Release: trixie/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'stable-security'), (500, 'stable-debug'), (500, 'oldstable-proposed-updates-debug'), (500, 'oldstable-proposed-updates'), (500, 'oldoldstable-proposed-updates'), (500, 'oldoldstable'), (500, 'buildd-unstable'), (500, 'unstable'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental-debug'), (1, 'buildd-experimental'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386, arm64 Kernel: Linux 6.5.0-1-amd64 (SMP w/8 CPU threads; PREEMPT) Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE not set Shell: /bin/sh linked to /usr/bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled Versions of packages mpich depends on: ii hwloc 2.9.3-1 ii libc6 2.37-12 ii libhwloc15 2.9.3-1 ii libmpich12 4.1.2-2 ii libslurm39 23.02.3-2 Versions of packages mpich recommends: ii libmpich-dev 4.1.2-2 Versions of packages mpich suggests: pn mpich-doc -- no debconf information -- Samuel --- Pour une évaluation indépendante, transparente et rigoureuse ! Je soutiens la Commission d'Évaluation de l'Inria. --- debian/rules.original 2023-11-05 21:03:47.0 + +++ debian/rules2023-11-05 22:06:10.0 + @@ -23,40 +23,40 @@ # Keep old library naming scheme export MPILIBNAME=mpich -NO_ROMIO_ARCH:= hurd-i386 -NO_VERBS_ARCH:= hurd-i386 s390x -NO_SLURM_ARCH:= hurd-i386 -NO_FABRIC_ARCH:= hurd-i386 s390x powerpc sh4 x32 +NO_ROMIO_ARCH:= hurd-amd64 hurd-i386 +NO_VERBS_ARCH:= hurd-amd64 hurd-i386 s390x +NO_SLURM_ARCH:= hurd-amd64 hurd-i386 +NO_FABRIC_ARCH:= hurd-amd64 hurd-i386 s390x powerpc sh4 x32 BUILTIN_ATOMICS_ARCH:= armhf riscv64 hppa NO_REAL128_ARCH:= armel armhf mipsel hppa m68k sh5 # Pick one as default NO_CH4_ARCH:= armel armhf i386 mipsel hppa m68k sh4 powerpc x32 mips64el s390x UCX_ARCH:= amd64 ppc64el arm64 -ifneq (,$(findstring " $(DEB_HOST_ARCH)",$(NO_VERBS_ARCH))) +ifeq (,$(filter $(DEB_HOST_ARCH),$(NO_VERBS_ARCH))) VERBS := --with-ibverbs endif -ifneq (,$(findstring $(DEB_HOST_ARCH),$(BUILTIN_ATOMICS_ARCH))) +ifneq (,$(filter $(DEB_HOST_ARCH),$(BUILTIN_ATOMICS_ARCH))) DISABLE_BUILTIN_ATOMICS:= --with-atomic-primitives=no endif -ifneq (,$(findstring $(DEB_HOST_ARCH),$(NO_FABRIC_ARCH))) +ifeq (,$(filter $(DEB_HOST_ARCH),$(NO_FABRIC_ARCH))) FABRIC := --with-libfabric=/usr endif -ifneq (,$(findstring $(DEB_HOST_ARCH),$(NO_REAL128_ARCH))) +ifneq (,$(filter $(DEB_HOST_ARCH),$(NO_REAL128_ARCH))) MPICHLIB_FCFLAGS:=$(MPICHLIB_FCFLAGS) -DNO_REAL128 endif -ifneq (,$(findstring $(DEB_HOST_ARCH),$(NO_SLURM_ARCH))) +ifeq (,$(filter $(DEB_HOST_ARCH),$(NO_SLURM_ARCH))) SLURM := --with-slurm=/usr endif DEVICE:= --with-device=ch3 UCX:= PMIX:= -ifeq (,$(findstring $(DEB_HOST_ARCH),$(NO_CH4_ARCH))) +ifeq (,$(filter $(DEB_HOST_ARCH),$(NO_CH4_ARCH))) DEVICE:= --with-device=ch4:ofi #PMIX:= --with-pmix=/usr/lib/$(DEB_HOST_MULTIARCH)/pmix2 endif -ifneq (,$(findstring $(DEB_HOST_ARCH),$(UCX_ARCH))) +ifneq (,$(filter $(DEB_HOST_ARCH),$(UCX_ARCH))) DEVICE:= --with-device=ch4:ucx UCX:= --with-ucx=/usr #PMIX:= --with-pmix=/usr/lib/$(DEB_HOST_MULTIARCH)/pmix2 @@ -87,7 +87,7 @@ # On sparc and sh4, OPA isn't available, so we need to fallback to # emulation mode. There's a performance penalty, unfortunately. -ifneq (,$(findstring $(DEB_HOST_GNU_CPU),sparc sh4)) +ifneq (,$(filter $(DEB_HOST_GNU_CPU),sparc sh4)) extra_flags += --with-atomic-primitives=no endif @@ -146,9 +146,9 @@ override_dh_installchangelogs: dh_installchangelogs README -# Some tests are failing on hurd-i386. +# Some tests are failing on hurd-amd64 hurd-i386. # Disable them, to be investiated later -# disable_test_archs = hurd-i386 +# disable_test_archs = hurd-amd64 hurd-i386 disable_test_archs = # ifneq (,$(filter $(DEB_HOST_ARCH),$(disable_test_archs))) override_dh_auto_test: --- debian/control.original 2023-11-05 21:17:37.0 + +++ debian/control 2023-11-05 21:17:52.0 + @@ -11,11 +11,11 @@ chrpath, hwloc-nox, libhwloc-dev, - librdmacm-dev [!hurd-i386], - libslurm-dev [!hurd-i386], - libibverbs-dev (>= 1.1.7) [!hurd-i386], - libfabric-dev [!hurd-i386 !powerpc !sh4 !x32], -
Bug#1054475: spyder: Fix language autoconfiguration
Julian Gilbey, le sam. 28 oct. 2023 20:06:53 +0100, a ecrit: > On Fri, Oct 27, 2023 at 07:33:19PM +0200, Samuel Thibault wrote: > > Control: tags -1 + fixed-upstream. > > > > Samuel Thibault, le mar. 24 oct. 2023 13:40:58 +0200, a ecrit: > > > The autoconfiguration of the language is currently completely broken in > > > spyder: when starting spyder on a e.g. french-installed Debian, spyder > > > still displays english by default, and one has to change the language > > > by hand. I have submitted a bug to upstream, but a very simple fix is > > > possible for Debian to apply easily, as attached, could you apply it? > > > > Upstream preferred to apply the attached patch, which explicitly > > disables these language (they are incomplete translations) > > [...] > > Ah, so it is probably not worth applying this to bookworm, as these > languages are not enabled at present in the bookworm version, and this > patch would essentially leave them disable. Is that a correct > understanding? No, it is missing the point: currently, language autoconfiguration is broken even for complete translations: even if you have a french-installed Debian, spyder will by default show an english interface, even if the french translation *is* complete. That is because of a bug that is fixed by https://github.com/spyder-ide/spyder/pull/21451/commits/7daea2051fbd28c9bf60523423366e96d68d660a but rather than backporting that codechange which might uncover who-knows-what bug, better apply the language list update patch: https://github.com/spyder-ide/spyder/pull/21451/commits/28c12114299d8da8e58ee150cf1f7af1e0fd75b4 which happens to avoid the bug and let language autoconfiguration actually work (for those languages which are not disabled due to incompleteness). Samuel -- debian-science-maintainers mailing list debian-science-maintainers@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers
Bug#1054475: spyder: Fix language autoconfiguration
Control: tags -1 + fixed-upstream. Hello, Samuel Thibault, le mar. 24 oct. 2023 13:40:58 +0200, a ecrit: > The autoconfiguration of the language is currently completely broken in > spyder: when starting spyder on a e.g. french-installed Debian, spyder > still displays english by default, and one has to change the language > by hand. I have submitted a bug to upstream, but a very simple fix is > possible for Debian to apply easily, as attached, could you apply it? Upstream preferred to apply the attached patch, which explicitly disables these language (they are incomplete translations) Samuel > I'd argue that it would be very useful to upload it to bookworm too. > It's hard to convince our thousands of students that spyder is a good > IDE, when it's not even able to automatically speak their language. commit 28c12114299d8da8e58ee150cf1f7af1e0fd75b4 Author: Samuel Thibault Date: Tue Oct 24 13:05:45 2023 +0200 Fix language autoconfiguration for fa, hr, te, uk Addition to LANGUAGE_CODES and DISABLED_LANGUAGES was missed. diff --git a/spyder/config/base.py b/spyder/config/base.py index a10bbec7f..1f64cb1cb 100644 --- a/spyder/config/base.py +++ b/spyder/config/base.py @@ -360,11 +360,15 @@ def is_py2exe_or_cx_Freeze(): 'zh_CN': u'简体中文', 'ja': u'日本語', 'de': u'Deutsch', -'pl': u'Polski' +'pl': u'Polski', +'fa': u'Persian', +'hr': u'Croatian', +'te': u'Telugu', +'uk': u'Ukrainian', } # Disabled languages because their translations are outdated or incomplete -DISABLED_LANGUAGES = ['hu', 'pl'] +DISABLED_LANGUAGES = ['fa', 'hr', 'hu', 'pl', 'te', 'uk'] def get_available_translations(): -- debian-science-maintainers mailing list debian-science-maintainers@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers
Bug#1054475: spyder: Fix language autoconfiguration
5.15.10+dfsg-3 ii libstdc++6 13.2.0-5 ii python33.11.4-5+b1 ii python3-pyqt5.sip 12.12.2-1 -- no debconf information -- Samuel --- Pour une évaluation indépendante, transparente et rigoureuse ! Je soutiens la Commission d'Évaluation de l'Inria. commit 32f72bd898c2e75c8496252f005788d2cd85f61b Author: Samuel Thibault Date: Tue Oct 24 13:05:45 2023 +0200 Fix language autoconfiguration for fa, hr, te, uk Addition to LANGUAGE_CODES was missed. diff --git a/spyder/config/base.py b/spyder/config/base.py index a10bbec7f..d46c5ae90 100644 --- a/spyder/config/base.py +++ b/spyder/config/base.py @@ -360,7 +360,11 @@ def is_py2exe_or_cx_Freeze(): 'zh_CN': u'简体中文', 'ja': u'日本語', 'de': u'Deutsch', -'pl': u'Polski' +'pl': u'Polski', +'fa': u'Persian', +'hr': u'Croatian', +'te': u'Telugu', +'uk': u'Ukrainian', } # Disabled languages because their translations are outdated or incomplete -- debian-science-maintainers mailing list debian-science-maintainers@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers
Bug#1050397: yosys-src is huge
Package: yosys-src Version: 0.30-5 Severity: normal Hello, The yosys-src package is huge, it contains a 2.2GiB tarball, perhaps it should at least be compressed? Samuel -- System Information: Debian Release: trixie/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'stable-security'), (500, 'stable-debug'), (500, 'oldstable-proposed-updates-debug'), (500, 'oldstable-proposed-updates'), (500, 'oldoldstable-proposed-updates'), (500, 'oldoldstable'), (500, 'buildd-unstable'), (500, 'unstable'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental-debug'), (1, 'buildd-experimental'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386, arm64 Kernel: Linux 6.4.0-1-amd64 (SMP w/8 CPU threads; PREEMPT) Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE not set Shell: /bin/sh linked to /usr/bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled -- no debconf information -- debian-science-maintainers mailing list debian-science-maintainers@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers
Bug#1042857: coinor-libcbc3.1: Fails to install, conflicts with coinor-libcbc3:amd64
Package: coinor-libcbc3.1 Version: 2.10.10+really2.10.10+ds1-2 Severity: serious Justification: Fails to install Hello, While upgrading testing today: Preparing to unpack .../coinor-libcbc3.1_2.10.10+really2.10.10+ds1-2_amd64.deb ... Unpacking coinor-libcbc3.1:amd64 (2.10.10+really2.10.10+ds1-2) ... dpkg: error processing archive /var/cache/apt/archives/coinor-libcbc3.1_2.10.10+really2.10.10+ds1-2_amd64.deb (--unpack): trying to overwrite '/usr/lib/x86_64-linux-gnu/libCbc.so.3.10.10', which is also in package coinor-libcbc3:amd64 2.10.10+ds1-1 Errors were encountered while processing: /var/cache/apt/archives/coinor-libcbc3.1_2.10.10+really2.10.10+ds1-2_amd64.deb needrestart is being skipped since dpkg has failed I guess there should be some breaks+replace or some renaming? Samuel -- System Information: Debian Release: trixie/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'stable-security'), (500, 'stable-debug'), (500, 'oldstable-proposed-updates-debug'), (500, 'oldstable-proposed-updates'), (500, 'oldoldstable-proposed-updates'), (500, 'oldoldstable'), (500, 'buildd-unstable'), (500, 'unstable'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental-debug'), (1, 'buildd-experimental'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386, arm64 Kernel: Linux 6.3.0-1-amd64 (SMP w/8 CPU threads; PREEMPT) Kernel taint flags: TAINT_DIE, TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE not set Shell: /bin/sh linked to /usr/bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled Versions of packages coinor-libcbc3.1 depends on: ii coinor-libcgl1 0.60.3+repack1-4 ii coinor-libclp1 1.17.6-3 ii coinor-libcoinutils3v5 2.11.4+repack1-2 ii coinor-libosi1v50.108.6+repack1-2 ii libc6 2.37-6 ii libgcc-s1 13.1.0-6 ii libstdc++6 13.1.0-6 coinor-libcbc3.1 recommends no packages. coinor-libcbc3.1 suggests no packages. -- debian-science-maintainers mailing list debian-science-maintainers@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers
Bug#996257: vtk9: Please disable libtbb-dev build-dep on !linux
Hello, Samuel Thibault, le mar. 12 oct. 2021 18:14:43 +0200, a ecrit: > vtk9 is not getting built on non-linux ports, because tbb is marked as > linux-only. Could you apply the attached patch to disable the libtbb-dev > build-dep to fix this? I forgot to disable the tbb dep in the libvtk9-dev package, here is a fixed patch. Samuel --- debian/control.original 2021-10-11 17:41:17.0 + +++ debian/control 2021-10-11 17:41:22.0 + @@ -49,7 +49,7 @@ libproj-dev, libsqlite3-dev, libswscale-dev, - libtbb-dev, + libtbb-dev [linux-any], libtheora-dev, libtiff-dev, libutfcpp-dev, @@ -112,7 +112,7 @@ libproj-dev, libpython3-dev, libswscale-dev, - libtbb-dev, + libtbb-dev [linux-any], libtheora-dev, libtiff-dev, libutfcpp-dev, --- debian/rules.original 2021-10-11 20:24:21.0 + +++ debian/rules2021-10-11 20:25:00.0 + @@ -14,6 +14,13 @@ export DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed endif +notbb_archs=hurd-i386 kfreebsd-i386 kfreebsd-amd64 +ifneq ($(DEB_BUILD_ARCH),$(filter $(DEB_BUILD_ARCH), $(notbb_archs))) + extra_flags += -DVTK_SMP_IMPLEMENTATION_TYPE:STRING="TBB" +else + extra_flags += -DVTK_SMP_IMPLEMENTATION_TYPE:STRING="OpenMP" +endif + %: dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --with python3 --with javahelper @@ -63,7 +70,6 @@ -DVTK_MODULE_USE_EXTERNAL_VTK_tiff:BOOL=ON \ -DVTK_MODULE_USE_EXTERNAL_VTK_utf8:BOOL=ON \ -DVTK_MODULE_USE_EXTERNAL_VTK_zlib:BOOL=ON \ - -DVTK_SMP_IMPLEMENTATION_TYPE:STRING="TBB" \ -DVTK_PYTHON_VERSION:STRING=3 \ -DVTK_USE_TK=ON \ -DVTK_WRAP_PYTHON=ON \ -- debian-science-maintainers mailing list debian-science-maintainers@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers
Bug#996257: vtk9: Please disable libtbb-dev build-dep on !linux
Package: vtk9 Version: 9.0.3+dfsg1-2 Severity: important Tags: patch Hello, vtk9 is not getting built on non-linux ports, because tbb is marked as linux-only. Could you apply the attached patch to disable the libtbb-dev build-dep to fix this? Samuel -- System Information: Debian Release: bookworm/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'stable-security'), (500, 'stable-debug'), (500, 'proposed-updates-debug'), (500, 'proposed-updates'), (500, 'oldstable-proposed-updates-debug'), (500, 'oldstable-proposed-updates'), (500, 'oldoldstable'), (500, 'buildd-unstable'), (500, 'unstable'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental-debug'), (1, 'buildd-experimental'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 5.14.0 (SMP w/8 CPU threads) Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE not set Shell: /bin/sh linked to /usr/bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled Versions of packages vtk9 depends on: ii libc62.32-4 ii libgcc-s1 [libgcc1] 11.2.0-8 ii libstdc++6 11.2.0-8 ii libvtk9 9.0.3+dfsg1-2+b1 vtk9 recommends no packages. Versions of packages vtk9 suggests: pn vtk9-doc pn vtk9-examples -- Samuel Créer une hiérarchie supplementaire pour remedier à un problème (?) de dispersion est d'une logique digne des Shadocks. * BT in: Guide du Cabaliste Usenet - La Cabale vote oui (les Shadocks aussi) * --- debian/control.original 2021-10-11 17:41:17.0 + +++ debian/control 2021-10-11 17:41:22.0 + @@ -49,7 +49,7 @@ libproj-dev, libsqlite3-dev, libswscale-dev, - libtbb-dev, + libtbb-dev [linux-any], libtheora-dev, libtiff-dev, libutfcpp-dev, --- debian/rules.original 2021-10-11 20:24:21.0 + +++ debian/rules2021-10-11 20:25:00.0 + @@ -14,6 +14,13 @@ export DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed endif +notbb_archs=hurd-i386 kfreebsd-i386 kfreebsd-amd64 +ifneq ($(DEB_BUILD_ARCH),$(filter $(DEB_BUILD_ARCH), $(notbb_archs))) + extra_flags += -DVTK_SMP_IMPLEMENTATION_TYPE:STRING="TBB" +else + extra_flags += -DVTK_SMP_IMPLEMENTATION_TYPE:STRING="OpenMP" +endif + %: dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --with python3 --with javahelper @@ -63,7 +70,6 @@ -DVTK_MODULE_USE_EXTERNAL_VTK_tiff:BOOL=ON \ -DVTK_MODULE_USE_EXTERNAL_VTK_utf8:BOOL=ON \ -DVTK_MODULE_USE_EXTERNAL_VTK_zlib:BOOL=ON \ - -DVTK_SMP_IMPLEMENTATION_TYPE:STRING="TBB" \ -DVTK_PYTHON_VERSION:STRING=3 \ -DVTK_USE_TK=ON \ -DVTK_WRAP_PYTHON=ON \ -- debian-science-maintainers mailing list debian-science-maintainers@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers
Bug#980125: vtk9: Fix java dep on non-java ports
Package: vtk9 Version: 9.0.1+dfsg1-7 Severity: normal Tags: patch User: debian-h...@lists.debian.org Usertags: hurd Hello, It seems I missed one change in the control file for the non-java ports: libvtk9-dev shouldn't depend on default-jdk on those archs, as the attached patch fixes. Samuel -- System Information: Debian Release: bullseye/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'stable-debug'), (500, 'proposed-updates-debug'), (500, 'proposed-updates'), (500, 'oldoldstable'), (500, 'buildd-unstable'), (500, 'unstable'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental-debug'), (1, 'buildd-experimental'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 5.10.0-1-amd64 (SMP w/8 CPU threads) Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE not set Shell: /bin/sh linked to /usr/bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled Versions of packages vtk9 depends on: ii libc6 2.31-9 ii libgcc-s1 10.2.1-3 ii libstdc++6 10.2.1-3 ii libvtk9 9.0.1+dfsg1-5 vtk9 recommends no packages. Versions of packages vtk9 suggests: pn vtk9-doc pn vtk9-examples -- Samuel argh, pi est plus grand que 2. Ca casse tout -+- #ens-mim -+- --- debian/control.original 2021-01-14 21:22:49.379024997 +0100 +++ debian/control 2021-01-14 21:23:22.074973349 +0100 @@ -85,7 +85,7 @@ Section: libdevel Depends: ${misc:Depends}, ${shlibs:Depends}, - default-jdk, + default-jdk [!hppa !hurd-any !kfreebsd-any], default-libmysqlclient-dev, libavcodec-dev, libavformat-dev, -- debian-science-maintainers mailing list debian-science-maintainers@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers
Bug#978659: vtk9: FTBFS on hurd-i386 and non-java ports
Package: vtk9 Version: 9.0.1+dfsg1-5 Severity: important Tags: patch Hello, Just like for vtk7, vtk9 needs fixes on hurd-i386 (for applism), and on non-java ports, please see the attached patches. Samuel -- System Information: Debian Release: bullseye/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'stable-debug'), (500, 'proposed-updates-debug'), (500, 'proposed-updates'), (500, 'oldoldstable'), (500, 'buildd-unstable'), (500, 'unstable'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental-debug'), (1, 'buildd-experimental'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 5.10.0 (SMP w/8 CPU threads) Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE not set Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled Versions of packages vtk9 depends on: ii libc6 2.31-6 ii libgcc-s1 11-20201216-2 ii libstdc++6 11-20201216-2 pn libvtk9 vtk9 recommends no packages. Versions of packages vtk9 suggests: pn vtk9-doc pn vtk9-examples -- Samuel bouhouhouh, b il m'a abandonné. Tout ca parce que je regardais plus mon emacs que lui ! s/lui/ses messages irc/ -+- #ens-mim esseulé -+- https://gitlab.kitware.com/diatomic/diy/-/merge_requests/59 >From bb0d55c8ae34a43354b1002262dad722c410d8cb Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sat, 13 Jun 2020 13:59:31 +0200 Subject: [PATCH] Fix build on mach-based OS which are not OS X --- include/diy/time.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp b/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp index 692cf36..671e69d 100644 --- a/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp +++ b/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp @@ -3,11 +3,11 @@ #ifndef _WIN32 #include -#ifdef __MACH__ +#if defined(__MACH__) && defined(__APPLE__) #include #include -#endif // __MACH__ +#endif // __MACH__ && __APPLE__ #endif // ifndef _WIN32 namespace diy { @@ -16,7 +16,7 @@ typedef unsigned long time_type; inline time_type get_time() { -#ifdef __MACH__ // OS X does not have clock_gettime, use clock_get_time +#if defined(__MACH__) && defined(__APPLE__) // OS X does not have clock_gettime, use clock_get_time clock_serv_t cclock; mach_timespec_t ts; host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, ); -- GitLab --- debian/control.original 2020-12-29 14:14:29.0 + +++ debian/control 2020-12-29 14:15:29.0 + @@ -8,7 +8,7 @@ Build-Depends: chrpath, cmake (>= 3.2.0), debhelper-compat (= 13), - default-jdk, + default-jdk [!hppa !hurd-any !kfreebsd-any], default-libmysqlclient-dev, dh-python, doxygen-latex, @@ -115,7 +115,7 @@ libtiff-dev, libutfcpp-dev, libvtk9 (= ${binary:Version}), - libvtk9-java (= ${binary:Version}), + libvtk9-java (= ${binary:Version}) [!hppa !hurd-any !kfreebsd-any], libx11-dev, libxft-dev, libxml2-dev, @@ -161,7 +161,7 @@ that use VTK. Package: libvtk9-java -Architecture: any +Architecture: amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x alpha ia64 m68k powerpc ppc64 riscv64 sh4 sparc64 x32 Section: java Depends: ${java:Depends}, ${misc:Depends}, --- debian/rules.original 2020-12-29 14:15:37.0 + +++ debian/rules2020-12-29 14:18:12.0 + @@ -3,7 +3,11 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +nojava_archs=hppa hurd-i386 kfreebsd-i386 kfreebsd-amd64 +ifneq ($(DEB_BUILD_ARCH),$(filter $(DEB_BUILD_ARCH), $(nojava_archs))) export JAVA_HOME=/usr/lib/jvm/default-java +extra_flags += -DVTK_WRAP_JAVA=ON +endif ifneq (,$(filter $(DEB_HOST_ARCH), armel m68k mips mipsel powerpc sh4)) export DEB_CXXFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed @@ -52,7 +56,6 @@ -DVTK_MODULE_USE_EXTERNAL_VTK_zlib:BOOL=ON \ -DVTK_PYTHON_VERSION:STRING=3 \ -DVTK_USE_TK=ON \ - -DVTK_WRAP_JAVA=ON \ -DVTK_WRAP_PYTHON=ON \ -DCMAKE_BUILD_TYPE=RelWithDebInfo @@ -70,8 +73,10 @@ override_dh_auto_install: dh_auto_install -X.pyc -X.pyo +ifneq ($(JAVA_HOME),) # Correct headers for paraview mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/java/vtk.jar $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/java/vtk9.jar +endif sed -i -e "s/FATAL_ERROR/STATUS/g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/vtk-9.0/VTK-targets.cmake override_dh_install: -- debian-science-maintainers mailing list debian-science-maintainer
Bug#959526: opencv: ftbfs on non-linux
Source: opencv Version: 4.2.0+dfsg-6 Severity: important Tags: patch upstream Hello, opencv currently FTBFS on non-linux because it hardcodes the list of systems which have dlopen() etc. The attached patch fixes this by just enabling it on all glibc-based systems since glibc provides it. Samuel -- System Information: Debian Release: bullseye/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'stable-debug'), (500, 'proposed-updates-debug'), (500, 'proposed-updates'), (500, 'oldstable-proposed-updates-debug'), (500, 'oldstable-proposed-updates'), (500, 'oldoldstable'), (500, 'buildd-unstable'), (500, 'unstable'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental-debug'), (1, 'buildd-experimental'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 5.6.0 (SMP w/8 CPU cores) Kernel taint flags: TAINT_OOT_MODULE Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) -- Samuel * c is away : cuisine; bouffe oh, moi je fais plutôt cuisine & bouffe en fait :) oui c'est vrai, certains font cuisine && bouffe (juste au cas où... ;-)) ( cuisine && bouffe ) || restau voire ((cuisine && bouffe) || restau) & apéritif -+- #ens-mim -+- Index: opencv-4.2.0+dfsg/modules/videoio/src/backend_plugin.cpp === --- opencv-4.2.0+dfsg.orig/modules/videoio/src/backend_plugin.cpp +++ opencv-4.2.0+dfsg/modules/videoio/src/backend_plugin.cpp @@ -21,7 +21,7 @@ using namespace std; #if defined(_WIN32) #include -#elif defined(__linux__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) +#elif defined(__linux__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__GLIBC__) #include #endif @@ -77,7 +77,7 @@ void* getSymbol_(LibHandle_t h, const ch { #if defined(_WIN32) return (void*)GetProcAddress(h, symbolName); -#elif defined(__linux__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) +#elif defined(__linux__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__GLIBC__) return dlsym(h, symbolName); #endif } @@ -91,7 +91,7 @@ LibHandle_t libraryLoad_(const FileSyste # else return LoadLibraryW(filename.c_str()); #endif -#elif defined(__linux__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) +#elif defined(__linux__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__GLIBC__) return dlopen(filename.c_str(), RTLD_LAZY); #endif } @@ -101,7 +101,7 @@ void libraryRelease_(LibHandle_t h) { #if defined(_WIN32) FreeLibrary(h); -#elif defined(__linux__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) +#elif defined(__linux__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__GLIBC__) dlclose(h); #endif } -- debian-science-maintainers mailing list debian-science-maintainers@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers
Bug#948248: opencv: Doesn't build on ports without java
Samuel Thibault, le ven. 10 janv. 2020 11:41:12 +0100, a ecrit: > (as a side note, the build failure on hurd-i386 is being handled in > https://github.com/opencv/opencv/pull/16302 ) Here is the patch applied upstream, could you apply it as well? Thanks, Samuel commit e57ceea3d3769ef130465bcbe45e32d2cb2954ca Author: Samuel Thibault Date: Wed Jan 8 01:32:12 2020 +0100 Fix build on non-Linux glibc-based systems dl functions are provided by all glibc-based systems (GNU/Linux, but also GNU/Hurd, GNU/kFreeBSD) diff --git a/modules/videoio/src/backend_plugin.cpp b/modules/videoio/src/backend_plugin.cpp index 617c3cda29..f73a9ad7ac 100644 --- a/modules/videoio/src/backend_plugin.cpp +++ b/modules/videoio/src/backend_plugin.cpp @@ -21,7 +21,7 @@ using namespace std; #if defined(_WIN32) #include -#elif defined(__linux__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) +#elif defined(__linux__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__GLIBC__) #include #endif @@ -77,7 +77,7 @@ void* getSymbol_(LibHandle_t h, const char* symbolName) { #if defined(_WIN32) return (void*)GetProcAddress(h, symbolName); -#elif defined(__linux__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) +#elif defined(__linux__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__GLIBC__) return dlsym(h, symbolName); #endif } @@ -91,7 +91,7 @@ LibHandle_t libraryLoad_(const FileSystemPath_t& filename) # else return LoadLibraryW(filename.c_str()); #endif -#elif defined(__linux__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) +#elif defined(__linux__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__GLIBC__) return dlopen(filename.c_str(), RTLD_LAZY); #endif } @@ -101,7 +101,7 @@ void libraryRelease_(LibHandle_t h) { #if defined(_WIN32) FreeLibrary(h); -#elif defined(__linux__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) +#elif defined(__linux__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__GLIBC__) dlclose(h); #endif } -- debian-science-maintainers mailing list debian-science-maintainers@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers
Bug#948248: opencv: Doesn't build on ports without java
(as a side note, the build failure on hurd-i386 is being handled in https://github.com/opencv/opencv/pull/16302 ) Samuel -- debian-science-maintainers mailing list debian-science-maintainers@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers
Bug#943706: opencv: delete static build dir to save lots of space during build
Control: reopen -1 Hello, I see that what got uploaded is -DCMAKE_SHARED_LINKER_FLAGS_RELEASE="$(LDFLAGS)" \ - -DBUILD_SHARED_LIBS=ON -DBUILD_DOCS=ON + -DBUILD_SHARED_LIBS=ON -DBUILD_DOCS=ON \ + -DBUILD_TESTS=OFF -- $(CMAKE_FLAGS) \ - -DBUILD_SHARED_LIBS=OFF -DBUILD_DOCS=OFF + -DBUILD_SHARED_LIBS=OFF -DBUILD_DOCS=OFF \ + -DBUILD_TESTS=ON But that's the converse of what I proposed. What I proposed is to build the tests in the shared library build case, so that the tests are small since they use the shared library. Instead, what got uploaded will build the tests in the static library build case, and thus each test will weight about 100MB, thus making the build uselessly big. Here is a patch that reverses the flags. Samuel --- debian/rules.original 2020-01-10 10:58:21.240453383 +0100 +++ debian/rules2020-01-10 10:58:28.520509620 +0100 @@ -142,12 +142,12 @@ -- $(CMAKE_FLAGS) \ -DCMAKE_SHARED_LINKER_FLAGS_RELEASE="$(LDFLAGS)" \ -DBUILD_SHARED_LIBS=ON -DBUILD_DOCS=ON \ - -DBUILD_TESTS=OFF + -DBUILD_TESTS=ON # statically linked dh_auto_configure -B $(BUILDDIR)-static \ -- $(CMAKE_FLAGS) \ -DBUILD_SHARED_LIBS=OFF -DBUILD_DOCS=OFF \ - -DBUILD_TESTS=ON + -DBUILD_TESTS=OFF override_dh_auto_build: # documentation -- debian-science-maintainers mailing list debian-science-maintainers@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers
Bug#948248: opencv: Doesn't build on ports without java
Samuel Thibault, le dim. 05 janv. 2020 23:56:33 +0100, a ecrit: > The attached patch fix that: it disables the ant, default-jdk, and > maven-repo-helper build-deps on non-java ports, they enable the > libopencv4.1-jni package only on java ports, and enable the dh java > helpers and pass -DBUILD_JAVA=ON to configure only on java ports. The attached version additionally drops the libopencv4.1-java from libopencv-dev, otherwise it is uninstallable. Samuel diff --exclude .svn --exclude .git --exclude CVS --exclude .hg -ur ../tmp/opencv-4.1.2+dfsg/debian/control debian/control --- ../tmp/opencv-4.1.2+dfsg/debian/control 2019-11-24 07:53:15.0 +0100 +++ debian/control 2020-01-02 13:05:15.0 +0100 @@ -7,10 +7,10 @@ Nobuhiro Iwamatsu , Mo Zhou , Build-Depends: - ant, + ant [!hppa !hurd-any !kfreebsd-any], cmake (>= 2.8.7), debhelper (>= 11), - default-jdk, + default-jdk [!hppa !hurd-any !kfreebsd-any], dh-python, doxygen, javahelper, @@ -42,7 +42,7 @@ libvtk6-dev, libvtkgdcm-dev [!alpha !ppc64 !riscv64 !x32], libgdcm-tools, - maven-repo-helper, + maven-repo-helper [!hppa !hurd-any !kfreebsd-any], ocl-icd-opencl-dev, protobuf-compiler, python3-dev, @@ -101,7 +101,7 @@ libopencv-videoio-dev (= ${binary:Version}), libopencv-videostab-dev (= ${binary:Version}), libopencv-viz-dev (= ${binary:Version}), - libopencv4.1-java (= ${source:Version}), + libopencv4.1-java (= ${source:Version}) [!hppa !hurd-any !kfreebsd-any], pkg-config, ${misc:Depends}, ${shlibs:Depends}, @@ -1228,7 +1228,7 @@ Package: libopencv4.1-jni Section: java -Architecture: any +Architecture: amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x alpha ia64 m68k powerpc ppc64 riscv64 sh4 sparc64 x32 Depends: libopencv-calib3d4.1 (= ${binary:Version}), libopencv-highgui4.1 (= ${binary:Version}), diff --exclude .svn --exclude .git --exclude CVS --exclude .hg -ur ../tmp/opencv-4.1.2+dfsg/debian/rules debian/rules --- ../tmp/opencv-4.1.2+dfsg/debian/rules 2019-11-24 07:53:15.0 +0100 +++ debian/rules2020-01-02 13:05:15.0 +0100 @@ -40,6 +40,12 @@ CMAKE_ARCH_FLAGS += -DWITH_1394=OFF -DWITH_V4L=OFF endif +# Java support +ifeq (,$(findstring $(DEB_HOST_ARCH), hppa hurd-i386 kfreebsd-i386 kfreebsd-amd64)) +DH_HELPERS = ,javahelper,jh_maven_repo_helper +CMAKE_ARCH_FLAGS += -DBUILD_JAVA=ON +endif + # mitigate compiler OOM during build ifeq ($(DEB_HOST_ARCH),mipsel) export DEB_BUILD_OPTIONS=noopt @@ -52,7 +58,6 @@ -GNinja \ -DANT_EXECUTABLE=/usr/bin/ant \ -DBUILD_EXAMPLES=ON \ - -DBUILD_JAVA=ON \ -DBUILD_PROTOBUF=OFF \ -DBUILD_TESTS=ON \ -DBUILD_PERF_TESTS=OFF \ @@ -104,7 +108,7 @@ $(CMAKE_ARCH_FLAGS) %: - dh $@ --with python3,javahelper,jh_maven_repo_helper + dh $@ --with python3$(DH_HELPERS) override_dh_clean: rm -rvf modules/python/src2/hdr_parser.pyc -- debian-science-maintainers mailing list debian-science-maintainers@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers
Bug#948248: opencv: Doesn't build on ports without java
Source: opencv Version: 4.1.2+dfsg-5 Severity: important Tags: patch User: debian-h...@lists.debian.org Usertags: hurd Hello, opencv currently doesn't build on ports without java support. The attached patch fix that: it disables the ant, default-jdk, and maven-repo-helper build-deps on non-java ports, they enable the libopencv4.1-jni package only on java ports, and enable the dh java helpers and pass -DBUILD_JAVA=ON to configure only on java ports. Samuel -- System Information: Debian Release: bullseye/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'stable-debug'), (500, 'proposed-updates-debug'), (500, 'proposed-updates'), (500, 'oldstable-proposed-updates-debug'), (500, 'oldstable-proposed-updates'), (500, 'oldoldstable'), (500, 'buildd-unstable'), (500, 'unstable'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental-debug'), (1, 'buildd-experimental'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 5.4.0 (SMP w/8 CPU cores) Kernel taint flags: TAINT_OOT_MODULE Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) -- Samuel l'alim je sais où elle est, elle est juste à côté de la dame qui dort B: clairement faut revoir les priorités dans la vie B: une dame ça se retrouve, un uptime... --- debian/control.original 2020-01-01 19:26:38.0 + +++ debian/control 2020-01-02 12:53:28.0 + @@ -7,10 +7,10 @@ Nobuhiro Iwamatsu , Mo Zhou , Build-Depends: - ant, + ant [!hppa !hurd-any !kfreebsd-any], cmake (>= 2.8.7), debhelper (>= 11), - default-jdk, + default-jdk [!hppa !hurd-any !kfreebsd-any], dh-python, doxygen, javahelper, @@ -42,7 +42,7 @@ libvtk6-dev, libvtkgdcm-dev [!alpha !ppc64 !riscv64 !x32], libgdcm-tools, - maven-repo-helper, + maven-repo-helper [!hppa !hurd-any !kfreebsd-any], ocl-icd-opencl-dev, protobuf-compiler, python3-dev, @@ -1228,7 +1228,7 @@ Package: libopencv4.1-jni Section: java -Architecture: any +Architecture: amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x alpha ia64 m68k powerpc ppc64 riscv64 sh4 sparc64 x32 Depends: libopencv-calib3d4.1 (= ${binary:Version}), libopencv-highgui4.1 (= ${binary:Version}), --- debian/rules.original 2020-01-01 19:27:07.0 + +++ debian/rules2020-01-05 21:45:22.0 + @@ -40,6 +40,12 @@ CMAKE_ARCH_FLAGS += -DWITH_1394=OFF -DWITH_V4L=OFF endif +# Java support +ifeq (,$(findstring $(DEB_HOST_ARCH), hppa hurd-i386 kfreebsd-i386 kfreebsd-amd64)) +DH_HELPERS = ,javahelper,jh_maven_repo_helper +CMAKE_ARCH_FLAGS += -DBUILD_JAVA=ON +endif + # mitigate compiler OOM during build ifeq ($(DEB_HOST_ARCH),mipsel) export DEB_BUILD_OPTIONS=noopt @@ -52,7 +58,6 @@ -GNinja \ -DANT_EXECUTABLE=/usr/bin/ant \ -DBUILD_EXAMPLES=ON \ - -DBUILD_JAVA=ON \ -DBUILD_PROTOBUF=OFF \ -DBUILD_TESTS=ON \ -DBUILD_PERF_TESTS=OFF \ @@ -104,7 +108,7 @@ $(CMAKE_ARCH_FLAGS) %: - dh $@ --with python3,javahelper,jh_maven_repo_helper + dh $@ --with python3$(DH_HELPERS) override_dh_clean: rm -rvf modules/python/src2/hdr_parser.pyc -- debian-science-maintainers mailing list debian-science-maintainers@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers
Bug#943706: opencv: delete static build dir to save lots of space during build
Samuel Thibault, le dim. 05 janv. 2020 20:34:46 +0100, a ecrit: > At least, we could avoid uselessly building the unused static version > with the attached change. That'll reduce disk usage from tens of > gigabytes down to a few gigabytes, and probably reduce the build time > a lot as well. Even better, there is no need to build the test binaries since they are not installed either and the testsuite is run on the dynamic version only. Samuel --- debian/rules.original 2020-01-01 19:27:07.0 + +++ debian/rules2020-01-05 20:28:17.0 + @@ -52,10 +58,8 @@ CMAKE_FLAGS = \ -GNinja \ -DANT_EXECUTABLE=/usr/bin/ant \ - -DBUILD_EXAMPLES=ON \ -DBUILD_JAVA=ON \ -DBUILD_PROTOBUF=OFF \ - -DBUILD_TESTS=ON \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_opencv_dnn=ON \ -DBUILD_opencv_dnn_modern=ON \ @@ -123,11 +126,15 @@ # dynamicly linked dh_auto_configure -B $(BUILDDIR) \ -- $(CMAKE_FLAGS) \ + -DBUILD_EXAMPLES=ON \ + -DBUILD_TESTS=ON \ -DCMAKE_SHARED_LINKER_FLAGS_RELEASE="$(LDFLAGS)" \ -DBUILD_SHARED_LIBS=ON -DBUILD_DOCS=ON # statically linked dh_auto_configure -B $(BUILDDIR)-static \ -- $(CMAKE_FLAGS) \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_TESTS=OFF \ -DBUILD_SHARED_LIBS=OFF -DBUILD_DOCS=OFF override_dh_auto_build: -- debian-science-maintainers mailing list debian-science-maintainers@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers
Bug#943706: opencv: delete static build dir to save lots of space during build
Control: reopen -1 Control: retitle -1 opencv: avoid building gigabytes of unused example binaries Hello, > du -hs obj-x86_64-linux-gnu-static > 46G obj-x86_64-linux-gnu-static > this is just used during dh_install place, can we just remove it after > copying files into debian/tmp/ directory? Mmm. That huge space is actually coming mostly from the few hundreds of 100-MB statically-linked examples... which we don't even install. Do we really need to enable -DBUILD_EXAMPLES=ON, actually? At least, we could avoid uselessly building the unused static version with the attached change. That'll reduce disk usage from tens of gigabytes down to a few gigabytes, and probably reduce the build time a lot as well. Samuel --- debian/rules.original 2020-01-01 19:27:07.0 + +++ debian/rules2020-01-05 19:30:09.0 + @@ -52,7 +58,6 @@ CMAKE_FLAGS = \ -GNinja \ -DANT_EXECUTABLE=/usr/bin/ant \ - -DBUILD_EXAMPLES=ON \ -DBUILD_JAVA=ON \ -DBUILD_PROTOBUF=OFF \ -DBUILD_TESTS=ON \ @@ -123,6 +127,7 @@ # dynamicly linked dh_auto_configure -B $(BUILDDIR) \ -- $(CMAKE_FLAGS) \ + -DBUILD_EXAMPLES=ON \ -DCMAKE_SHARED_LINKER_FLAGS_RELEASE="$(LDFLAGS)" \ -DBUILD_SHARED_LIBS=ON -DBUILD_DOCS=ON # statically linked -- debian-science-maintainers mailing list debian-science-maintainers@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers
Bug#947986: vtk7: Doesn't build on ports without java
Source: vtk7 Version: 7.1.1+dfsg2-1 Severity: important Tags: patch User: debian-h...@lists.debian.org Usertags: hurd Hello, vtk7 currently doesn't build on ports without java support. The attached patch fix that: it disables the default-jdk and libvtk7-java build-deps on non-java ports, they enable the libvtk7-jni/java packages only on java ports, pass -DVTK_WRAP_JAVA=ON to configure only on java ports, and install java bits only on java ports. Samuel -- System Information: Debian Release: bullseye/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'stable-debug'), (500, 'proposed-updates-debug'), (500, 'proposed-updates'), (500, 'oldstable-proposed-updates-debug'), (500, 'oldstable-proposed-updates'), (500, 'oldoldstable'), (500, 'buildd-unstable'), (500, 'unstable'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental-debug'), (1, 'buildd-experimental'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 5.4.0 (SMP w/8 CPU cores) Kernel taint flags: TAINT_OOT_MODULE Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) -- Samuel Now, it we had this sort of thing: yield -a for yield to all traffic yield -t for yield to trucks yield -f for yield to people walking (yield foot) yield -d t* for yield on days starting with t ...you'd have a lot of dead people at intersections, and traffic jams you wouldn't believe... (Discussion in comp.os.linux.misc on the intuitiveness of commands.) --- debian/control.original 2020-01-02 12:46:30.0 + +++ debian/control 2020-01-02 12:47:41.0 + @@ -7,7 +7,7 @@ Build-Depends: chrpath, cmake (>= 3.2.0), debhelper (>= 9), - default-jdk, + default-jdk [!hppa !hurd-any !kfreebsd-any], default-libmysqlclient-dev, dh-python, libftgl-dev, @@ -110,7 +110,7 @@ libtheora-dev, libtiff-dev, libvtk7.1p (= ${binary:Version}), - libvtk7-java (= ${binary:Version}), + libvtk7-java (= ${binary:Version}) [!hppa !hurd-any !kfreebsd-any], libx11-dev, libxft-dev, libxml2-dev, @@ -187,7 +187,7 @@ that use VTK. Qt files Package: libvtk7-jni -Architecture: any +Architecture: amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x alpha ia64 m68k powerpc ppc64 riscv64 sh4 sparc64 x32 Section: java Depends: ${java:Depends}, ${misc:Depends}, @@ -202,7 +202,7 @@ This package provides the VTK Java language support. Package: libvtk7-java -Architecture: any +Architecture: amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x alpha ia64 m68k powerpc ppc64 riscv64 sh4 sparc64 x32 Section: java Depends: libvtk7-jni (= ${binary:Version}), ${java:Depends}, --- debian/rules.original 2020-01-02 12:47:46.0 + +++ debian/rules2020-01-02 12:50:59.0 + @@ -14,21 +14,25 @@ export DEB_CXXFLAGS_MAINT_APPEND=-ffloat-store endif -ifeq ($(DEB_BUILD_ARCH),$(filter $(DEB_BUILD_ARCH),hppa hurd-i386)) -JAVA_VERSION=1.5 +extra_flags= + +nojava_archs=hppa hurd-i386 kfreebsd-i386 kfreebsd-amd64 +ifeq ($(DEB_BUILD_ARCH),$(filter $(DEB_BUILD_ARCH), $(nojava_archs))) +JAVA_VERSION= else JAVA_VERSION=1.8 +extra_flags += -DVTK_WRAP_JAVA=ON endif noqt_archs="" ifeq ($(DEB_BUILD_ARCH),$(filter $(DEB_BUILD_ARCH), $(noqt_archs))) -extra_flags=-DVTK_Group_Qt=OFF \ --DMODULE_vtkParseOGLExt=ON \ --DModule_vtkWrappingTools=ON \ --DModule_vtkRenderingSceneGraph=ON \ --DModule_vtkIOExportOpenGL2=ON \ --DModule_vtkPython=ON \ --DVTK_BUILD_ALL_MODULES=OFF +extra_flags += -DVTK_Group_Qt=OFF \ + -DMODULE_vtkParseOGLExt=ON \ + -DModule_vtkWrappingTools=ON \ + -DModule_vtkRenderingSceneGraph=ON \ + -DModule_vtkIOExportOpenGL2=ON \ + -DModule_vtkPython=ON \ + -DVTK_BUILD_ALL_MODULES=OFF else extra_flags += -DVTK_QT_VERSION=5 \ -DVTK_Group_Qt=ON \ @@ -53,7 +57,6 @@ -DVTK_JAVA_SOURCE_VERSION=$(JAVA_VERSION) \ -DVTK_JAVA_TARGET_VERSION=$(JAVA_VERSION) \ -DVTK_USE_TK=ON \ - -DVTK_WRAP_JAVA=ON \ -DVTK_WRAP_PYTHON=ON \ -DVTK_PYTHON_VERSION:STRING=3 \ -DVTK_WRAP_TCL=ON \ @@ -121,11 +124,13 @@ override_dh_auto_install: pwd dh_auto_install -X.pyc -X.pyo +ifneq ($(JAVA_VERSION),) # Modify vtkWrapJava.cmake to properly upload JavaDependencies.cmake.in from $VTK_DIR perl -pi -e
Re: Bug#945113: transition: hwloc
Paul Gevers, le jeu. 28 nov. 2019 10:12:57 +0100, a ecrit: > On 28-11-2019 09:24, Samuel Thibault wrote: > > compile-examples FAIL stderr: /usr/bin/ld: warning: libhwloc.so.5, > > needed by /usr/lib/x86_64-linux-gnu/librsb.so, may conflict with > > libhwloc.so.15 > [...] > so far I haven't > figured out what we exactly want, let alone implement it. Ok, I see. > So, I don't think the situation is very bad at this moment. In this case > the test doesn't fail by itself, the reason why the autopkgtest fails is > due to a WARNING on stderr. The autopkgtest of librsb follows the > default behavior of failing on output to strerr, which, in cases like > this shows that could be the wrong setting for this package if the test > is otherwise showing that the package works. The package works only by luck, the warning does indicate that something wrong is happening. I do think that in the case of hwloc it could very well crash, because structures have changed between hwloc1 and hwloc2. Personally I almost always leave the stderr check, because most often they are a sign of something wrong happening, and we want to fix it somewhere, even if it is harmless for the test at case. Perhaps what we are lacking here is a button for the maintainer of the migrating package and the maintainer of the failing package to be able to say "never mind, this is fine", and/or another to say "please retry this with all to-be-migrated packages". That could cover most of the cases, without the debian-release team having to delve into them. Samuel -- debian-science-maintainers mailing list debian-science-maintainers@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers
Re: Bug#916565: libopenmpi3,openmpi-{common,doc}: fails to remove: post-removal script subprocess returned error exit status 1
Control: reassign -1 dh-fortran-mod Control: affects -1 + openmpi Control: tags -1 + patch > rm: cannot remove '/usr/lib/x86_64-linux-gnu/fortran/gfortran-8#': No such > file or directory > rm: cannot remove 'End': No such file or directory > rm: cannot remove 'automatically': No such file or directory > rm: cannot remove 'added': No such file or directory > rm: cannot remove 'section': No such file or directory Looking at the postrm script, I see rmdir --ignore-fail-on-non-empty --parents /usr/lib/$multiarch/fortran/$base [ -d /usr/lib/$multiarch/fortran/$base ] && rm /usr/lib/$multiarch/fortran/$cmplr# End automatically added section Its seems to be coming from dh-fortran-mod: the postrm-fortran-mod does not have a \n on the last line. Could you apply the attached patch? Then we'll have to rebuild openmpi and possibly others with the same resulting issue. Samuel --- postrm-fortran-mod.orig 2018-12-19 16:20:54.080650624 +0100 +++ postrm-fortran-mod 2018-12-19 16:20:57.120660630 +0100 @@ -3,4 +3,4 @@ cmplr="#FCOMPILER#" rmdir --ignore-fail-on-non-empty --parents /usr/lib/$multiarch/fortran/$base -[ -d /usr/lib/$multiarch/fortran/$base ] && rm /usr/lib/$multiarch/fortran/$cmplr \ No newline at end of file +[ -d /usr/lib/$multiarch/fortran/$base ] && rm /usr/lib/$multiarch/fortran/$cmplr -- debian-science-maintainers mailing list debian-science-maintainers@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers
Bug#914682: lapacke missing tmg interface
Source: lapack Version: 3.8.0-1 Severity: normal Tags: patch Hello, We are missing the tmg interface in lapacke (LAPACKE_dlatms_work etc.) which is only a matter of enabling it in cmake.inc as the attached patch does, could you apply it? Thanks, Samuel -- System Information: Debian Release: buster/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'stable-debug'), (500, 'proposed-updates-debug'), (500, 'proposed-updates'), (500, 'oldoldstable'), (500, 'buildd-unstable'), (500, 'unstable'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental-debug'), (1, 'buildd-experimental'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.19.0 (SMP w/8 CPU cores) Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash Init: systemd (via /run/systemd/system) --- debian/rules.orig 2018-11-26 10:08:02.649821869 +0100 +++ debian/rules2018-11-26 10:03:57.105827901 +0100 @@ -69,6 +69,7 @@ -e "s%\(^ARCH *=\).*%\1 $(DEB_HOST_GNU_TYPE)-ar%1" \ -e "s%\(^RANLIB *=\).*%\1 $(DEB_HOST_GNU_TYPE)-ranlib%1" \ -e "s%\(^CFLAGS *=\).*%\1 $(CPPFLAGS) \$$(PICOPTS) $(CFLAGS)%1" \ + -e "s%^#\(LAPACKE_WITH_TMG *=\)%\1%1" \ < $< > $@ # Build deprecated routines (see #810143) echo "BUILD_DEPRECATED=1" >> $@ -- debian-science-maintainers mailing list debian-science-maintainers@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers
Bug#896566: gummi: FTBFS against new libsyntex
Control: tags -1 + patch Hello, Sebastian Ramacher, le dim. 22 avril 2018 13:17:48 +0200, a ecrit: > | gui/gui-preview.c:1044:5: error: unknown type name 'synctex_scanner_t'; use > 'struct' keyword to refer to the type Here is a proposed patch. Samuel Index: gummi-0.6.6/src/gui/gui-preview.c === --- gummi-0.6.6.orig/src/gui/gui-preview.c +++ gummi-0.6.6/src/gui/gui-preview.c @@ -1041,18 +1041,18 @@ static gboolean synctex_run_parser(GuPre gint column = gtk_text_iter_get_line_offset(sync_to); slog(L_DEBUG, "Syncing to %s, line %i, column %i\n", tex_file, line, column); -synctex_scanner_t sync_scanner = synctex_scanner_new_with_output_file(pc->uri, C_TMPDIR, 1); +synctex_scanner_p sync_scanner = synctex_scanner_new_with_output_file(pc->uri, C_TMPDIR, 1); synctex_clear_sync_nodes(pc); -if(synctex_display_query(sync_scanner, tex_file, line, column)>0) { -synctex_node_t node; +if(synctex_display_query(sync_scanner, tex_file, line, column, -1)>0) { +synctex_node_p node; /* * SyncTeX can return several nodes. It seems best to use the last one, as * this one rarely is below (usually slighly above) the edited line. */ -while ((node = synctex_next_result(sync_scanner))) { +while ((node = synctex_scanner_next_result(sync_scanner))) { SyncNode *sn = g_new0(SyncNode, 1); @@ -2038,16 +2038,16 @@ gboolean on_button_pressed(GtkWidget* w, slog(L_DEBUG, "Ctrl-click to %i, %i\n", x, y); -synctex_scanner_t sync_scanner = synctex_scanner_new_with_output_file(pc->uri, C_TMPDIR, 1); +synctex_scanner_p sync_scanner = synctex_scanner_new_with_output_file(pc->uri, C_TMPDIR, 1); if(synctex_edit_query(sync_scanner, page+1, x/pc->scale, y/pc->scale)>0) { -synctex_node_t node; +synctex_node_p node; /* * SyncTeX can return several nodes. It seems best to use the last one, as * this one rarely is below (usually slighly above) the edited line. */ -if ((node = synctex_next_result(sync_scanner))) { +if ((node = synctex_scanner_next_result(sync_scanner))) { const gchar *file = synctex_scanner_get_name(sync_scanner, synctex_node_tag(node)); gint line = synctex_node_line(node); -- debian-science-maintainers mailing list debian-science-maintainers@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers