Re: Bug#963729: openmpi: Please update build configuration for ia64

On 6/26/20 10:11 AM, John Paul Adrian Glaubitz wrote:
> On 6/26/20 9:28 AM, John Paul Adrian Glaubitz wrote:
>> The build configuration on ia64 is outdated and most likely is a reason
>> for the package currently FTBFS there. I assume that ia64 is no longer
>> a valid CMA_ARCH, so it should be added to NO_CMA_ARCH.
>>
>> Futhermore, ia64 can use any version of gcc, so I don't see a reason to
>> disable Java on ia64 as Java works just fine.
> 
> Looks like the package needs some patching on ia64. Will work on a patch.

Okay, here's the complete debdiff:

glaubitz@titanium:/srv/tmp/openmpi$ diff -Nru old/openmpi-4.0.3/debian/ new/openmpi-4.0.3/debian/
diff -Nru old/openmpi-4.0.3/debian/control new/openmpi-4.0.3/debian/control
--- old/openmpi-4.0.3/debian/control    2020-06-09 18:09:51.000000000 +0200
+++ new/openmpi-4.0.3/debian/control    2020-06-26 09:24:49.201455913 +0200
@@ -16,8 +16,8 @@
  libfabric-dev [amd64 i386],
  libpsm-infinipath1-dev [amd64 i386],
  libpsm2-dev [amd64],
- libnuma-dev [amd64 i386 ia64 mips mipsel mipsn32 mipsn32el mips64 mips64el ppc64el],
- default-jdk [!hppa !hurd-i386 !ia64] <!stage1>,
+ libnuma-dev [amd64 i386 mips mipsel mipsn32 mipsn32el mips64 mips64el ppc64el],
+ default-jdk [!hppa !hurd-i386] <!stage1>,
  flex
 Build-Conflicts: libmpich-dev, libopenmpi-dev
 Standards-Version: 4.5.0
diff -Nru old/openmpi-4.0.3/debian/patches/ia64-fix.patch new/openmpi-4.0.3/debian/patches/ia64-fix.patch
--- old/openmpi-4.0.3/debian/patches/ia64-fix.patch     1970-01-01 01:00:00.000000000 +0100
+++ new/openmpi-4.0.3/debian/patches/ia64-fix.patch     2020-06-26 11:51:24.376832773 +0200
@@ -0,0 +1,11 @@
+--- openmpi-4.0.3.orig/opal/include/opal/sys/timer.h
++++ openmpi-4.0.3/opal/include/opal/sys/timer.h
+@@ -78,8 +78,6 @@ BEGIN_C_DECLS
+ #include "opal/sys/arm64/timer.h"
+ #elif OPAL_ASSEMBLY_ARCH == OPAL_IA32
+ #include "opal/sys/ia32/timer.h"
+-#elif OPAL_ASSEMBLY_ARCH == OPAL_IA64
+-#include "opal/sys/ia64/timer.h"
+ #elif OPAL_ASSEMBLY_ARCH == OPAL_POWERPC32
+ #include "opal/sys/powerpc/timer.h"
+ #elif OPAL_ASSEMBLY_ARCH == OPAL_POWERPC64
diff -Nru old/openmpi-4.0.3/debian/patches/series new/openmpi-4.0.3/debian/patches/series
--- old/openmpi-4.0.3/debian/patches/series     2020-06-09 18:09:51.000000000 +0200
+++ new/openmpi-4.0.3/debian/patches/series     2020-06-26 10:03:33.046191697 +0200
@@ -10,3 +10,4 @@
 #version-script.patch
 no-warning-unused.patch
 use-openib.patch
+ia64-fix.patch
diff -Nru old/openmpi-4.0.3/debian/rules new/openmpi-4.0.3/debian/rules
--- old/openmpi-4.0.3/debian/rules      2020-06-09 18:09:51.000000000 +0200
+++ new/openmpi-4.0.3/debian/rules      2020-06-26 10:53:33.791334255 +0200
@@ -24,9 +24,8 @@
 PSM2_ARCH:= amd64
 ATOMICS_ARCH:= s390x riscv64
 NO_CMA_ARCH:= s390x mipsel hppa alpha armhf armel m68k sparc64
-NO_JAVA_ARCH:= hppa hurd-i386 ia64
+NO_JAVA_ARCH:= hppa hurd-i386
 NO_TEST_ARCH:= hppa hurd-i386
-GCC7_ARCH:= ia64
 
 
 VERBS:=   $(if $(filter $(DEB_TARGET_ARCH), $(NO_VERBS_ARCH)), , --with-verbs )

Adrian