[Pkg-pascal-devel] Bug#963623: fpc: Please enable build on ppc64el

[John Paul Adrian Glaubitz]

Hi!

On 6/25/20 10:22 AM, John Paul Adrian Glaubitz wrote:
> On 6/25/20 9:01 AM, John Paul Adrian Glaubitz wrote:
>> It seems more a packaging problem to me. Normally bootstrapping is very
>> simple, but for some reason, FPC is not using the proper paths.
>>
>> I will talk to the upstream contacts I have and see if they can help
>> me.
> 
> Okay, I got it. Will send you a patch later today. Uploading the bootstrapped
> binaries now.

This works:

diff -Nru old/fpc-3.2.0~rc1+dfsg/debian/fp-units-gfx.install.in new/fpc-3.2.0~rc1+dfsg/debian/fp-units-gfx.install.in
--- old/fpc-3.2.0~rc1+dfsg/debian/fp-units-gfx.install.in       2020-06-23 12:42:34.000000000 -0700
+++ new/fpc-3.2.0~rc1+dfsg/debian/fp-units-gfx.install.in       2020-06-25 01:20:33.425433597 -0700
@@ -1,12 +1,12 @@
 #! /usr/bin/dh-exec
 usr/lib/${DEB_HOST_MULTIARCH}/fpc/*/*/*/ggi*
-usr/lib/${DEB_HOST_MULTIARCH}/fpc/*/*/*/graph*        [!linux-arm64 !linux-armel !linux-armhf !linux-m68k !linux-mips !linux-mipsel !linux-ppc64 !linux-sparc64]
+usr/lib/${DEB_HOST_MULTIARCH}/fpc/*/*/*/graph*        [!linux-arm64 !linux-armel !linux-armhf !linux-m68k !linux-mips !linux-mipsel !linux-ppc64 !linux-ppc64el !linux-sparc64]
 usr/lib/${DEB_HOST_MULTIARCH}/fpc/*/*/*/hermes*
 usr/lib/${DEB_HOST_MULTIARCH}/fpc/*/*/*/imagemagick*
 usr/lib/${DEB_HOST_MULTIARCH}/fpc/*/*/*/libfontconfig*
 usr/lib/${DEB_HOST_MULTIARCH}/fpc/*/*/*/libgd*
 usr/lib/${DEB_HOST_MULTIARCH}/fpc/*/*/*/libpng*
-usr/lib/${DEB_HOST_MULTIARCH}/fpc/*/*/*/opencl*       [!freebsd-any !linux-arm64 !linux-armel !linux-armhf !linux-m68k !linux-mips !linux-mipsel !linux-powerpc !linux-ppc64 !linux-sparc64]
+usr/lib/${DEB_HOST_MULTIARCH}/fpc/*/*/*/opencl*       [!freebsd-any !linux-arm64 !linux-armel !linux-armhf !linux-m68k !linux-mips !linux-mipsel !linux-powerpc !linux-ppc64 !linux-ppc64el !linux-sparc64]
 usr/lib/${DEB_HOST_MULTIARCH}/fpc/*/*/*/opengl*
 usr/lib/${DEB_HOST_MULTIARCH}/fpc/*/*/*/opengles*
 usr/lib/${DEB_HOST_MULTIARCH}/fpc/*/*/*/ptc*          [!freebsd-any]
diff -Nru old/fpc-3.2.0~rc1+dfsg/debian/rules new/fpc-3.2.0~rc1+dfsg/debian/rules
--- old/fpc-3.2.0~rc1+dfsg/debian/rules 2020-06-23 12:42:34.000000000 -0700
+++ new/fpc-3.2.0~rc1+dfsg/debian/rules 2020-06-25 01:31:43.216567013 -0700
@@ -28,9 +28,14 @@
 # Take care that Debian uses arm64 while FPC perfers aarch64 instead
 CPU_SOURCE := $(subst arm64,aarch64,${CPU_SOURCE})
 CPU_TARGET := $(subst arm64,aarch64,${CPU_TARGET})
-# Take care that debian uses ppc64 while FPC prefers powerpc64 instead
+# Take care that debian uses ppc64/-el while FPC prefers powerpc64 instead
+ifeq ($(DEB_HOST_ARCH_CPU),ppc64el)
+CPU_SOURCE := $(subst ppc64el,powerpc64,${CPU_SOURCE})
+CPU_TARGET := $(subst ppc64el,powerpc64,${CPU_TARGET})
+else
 CPU_SOURCE := $(subst ppc64,powerpc64,${CPU_SOURCE})
 CPU_TARGET := $(subst ppc64,powerpc64,${CPU_TARGET})
+endif
 # Shuld get rid of this one day, as it is done automatically  by FPC make files
 ifeq ($(CPU_TARGET),m68k)
 PPSUF=68k
@@ -129,7 +134,11 @@
 # Set default compilation options
 DEB_BUILD_FPC_OPT=debian/deb-build-fpc.cfg
 DEB_HOST_FPC_OPT=debian/deb-host-fpc.cfg
+ifeq ($(DEB_HOST_ARCH_CPU),ppc64el)
+BUILDOPTS=PP=$(NEWPP) OPT='@${CURDIR}/${DEB_HOST_FPC_OPT} -Cb- -Caelfv2'
+else
 BUILDOPTS=PP=$(NEWPP) OPT='@${CURDIR}/${DEB_HOST_FPC_OPT}'
+endif
 ifdef CROSSOPT
 BUILDOPTS+= CROSSOPT=${CROSSOPT}
 endif

Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaubitz at debian.org
`. `'   Freie Universitaet Berlin - glaubitz at physik.fu-berlin.de
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913