Bug#744173: pkg-kde-tools: add arm64 support to SymbolsHelper
In article
20140411024540.25679.92521.reportbug__44887.6658724204$1397184506$gmane$o...@stoneboat.aleph1.co.uk
you wrote:
This patch is very dim. I feel that one should be able to at least
move this test into one place instead of having 6 instances to
update. But I started messing with that and it simply made me forget to
file at least this basic, working verison.
diff -Nru
pkg-kde-tools-0.15.13/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm
pkg-kde-tools-0.15.13+arm64/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm
---
pkg-kde-tools-0.15.13/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm
2014-02-23 12:09:30.0 +
+++
pkg-kde-tools-0.15.13+arm64/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm
2014-04-06 01:42:19.0 +
@@ -161,7 +161,7 @@
sub _expand {
my ($self, $arch) = @_;
-return ($arch =~ /amd64|ia64|alpha|s390|sparc64|ppc64|mips64|mips64el/) ?
m : j;
+return ($arch =~
/^(amd64|ia64|alpha|s390|sparc64|ppc64|ppc64el|mips64|mips64el|arm64)$/) ? m
: j;
}
package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::ssize_t;
@@ -294,7 +294,7 @@
sub _expand {
my ($self, $arch) = @_;
-return ($arch =~ /(arm|sh4)/) ? 'f' : 'd';
+return ($arch =~ /(arm|armel|armhf|sh4)/) ? 'f' : 'd';
}
package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst;
Most of the changes in the patch change non anchored regexps to anchored ones
to match the full arch name except the last one, that seems to be matching
arm64, while it shouldn't, right?
Happy hacking,
--
The sooner you start to code, the longer the program will take. -- Roy Carlson
Saludos /\/\ /\ `/
signature.asc
Description: Digital signature
Bug#744173: pkg-kde-tools: add arm64 support to SymbolsHelper
+++ Maximiliano Curia [2014-04-11 09:32 +0200]:
In article
20140411024540.25679.92521.reportbug__44887.6658724204$1397184506$gmane$o...@stoneboat.aleph1.co.uk
you wrote:
-return ($arch =~ /amd64|ia64|alpha|s390|sparc64|ppc64|mips64|mips64el/)
? m : j;
+return ($arch =~
/^(amd64|ia64|alpha|s390|sparc64|ppc64|ppc64el|mips64|mips64el|arm64)$/) ?
m : j;
-return ($arch =~ /(arm|sh4)/) ? 'f' : 'd';
+return ($arch =~ /(arm|armel|armhf|sh4)/) ? 'f' : 'd';
Most of the changes in the patch change non anchored regexps to anchored ones
to match the full arch name except the last one, that seems to be matching
arm64, while it shouldn't, right?
Doh. Well spotted. Thank you. That was indeed the problem.
Changing it to
/^(arm|armel|armhf|sh4)$/)
fixes the phonon build.
But in fact that 'arm' is pointless as the 'arm' architecture is long-dead in
debian.
So /^(armel|armhf|sh4)$/) is a better regexp. However there is one more thing
to consider:
It's not clear to me whether that last regexp should be:
/^(armel|armhf|sh4)$/)
or
/^(armel|sh4)$/)
I read here: https://lists.debian.org/debian-68k/2013/11/msg00012.html
that in QT5 qreal is a double on armhf, but on QT4 it's a float (and
it's float on both for armel). Can this helper know which it is doing
and DTRT? If not which should be the default? Lisandro's message seems
to suggest the former (and the the armhf stuff would be taken care of
with extra symbols lines, not (subst) lines).
If someone can confirm which to use I'd like to have an upload with
this patch in forthwith. I'm happy to do that as an MNU - complain if
that's not OK.
Wookey
--
Principal hats: Linaro, Emdebian, Wookware, Balloonboard, ARM
http://wookware.org/
diff -Nru pkg-kde-tools-0.15.13/debian/changelog pkg-kde-tools-0.15.13+arm64.1/debian/changelog
--- pkg-kde-tools-0.15.13/debian/changelog 2014-02-23 12:09:30.0 +
+++ pkg-kde-tools-0.15.13+arm64.1/debian/changelog 2014-04-11 19:22:51.0 +
@@ -1,3 +1,17 @@
+pkg-kde-tools (0.15.13+arm64.1) unreleased; urgency=low
+
+ * Non-maintainer upload.
+ * Fix last check pattern to only match whole arch names, like the rest
+
+ -- Wookey woo...@wookware.org Fri, 11 Apr 2014 19:19:39 +
+
+pkg-kde-tools (0.15.13+arm64) unreleased; urgency=low
+
+ * Non-maintainer upload.
+ * Add arm64 and ppc64el (and armel/armhf) support to SymbolsHelper substitutions
+
+ -- Wookey woo...@wookware.org Sun, 06 Apr 2014 01:31:56 +
+
pkg-kde-tools (0.15.13) unstable; urgency=medium
[ Maximiliano Curia ]
diff -Nru pkg-kde-tools-0.15.13/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm pkg-kde-tools-0.15.13+arm64.1/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm
--- pkg-kde-tools-0.15.13/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm 2014-02-23 12:09:30.0 +
+++ pkg-kde-tools-0.15.13+arm64.1/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm 2014-04-11 22:21:56.0 +
@@ -161,7 +161,7 @@
sub _expand {
my ($self, $arch) = @_;
-return ($arch =~ /amd64|ia64|alpha|s390|sparc64|ppc64|mips64|mips64el/) ? m : j;
+return ($arch =~ /^(amd64|ia64|alpha|s390x|sparc64|ppc64|ppc64el|mips64|mips64el|arm64)$/) ? m : j;
}
package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::ssize_t;
@@ -180,7 +180,7 @@
sub _expand {
my ($self, $arch) = @_;
-return ($arch =~ /amd64|ia64|alpha|s390|sparc64|ppc64|mips64|mips64el/) ? 'l' : 'i';
+return ($arch =~ /^(amd64|ia64|alpha|s390x|sparc64|ppc64|ppc64el|mips64|mips64el|arm64)$/) ? 'l' : 'i';
}
package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::int64_t;
@@ -199,7 +199,7 @@
sub _expand {
my ($self, $arch) = @_;
-return ($arch =~ /amd64|ia64|alpha|s390x|sparc64|ppc64|mips64|mips64el/) ? 'l' : 'x';
+return ($arch =~ /^(amd64|ia64|alpha|s390x|sparc64|ppc64|ppc64el|mips64|mips64el|arm64)$/) ? 'l' : 'x';
}
package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::uint64_t;
@@ -218,7 +218,7 @@
sub _expand {
my ($self, $arch) = @_;
-return ($arch =~ /amd64|ia64|alpha|s390x|sparc64|ppc64|mips64|mips64el/) ? 'm' : 'y';
+return ($arch =~ /^(amd64|ia64|alpha|s390x|sparc64|ppc64|ppc64el|mips64|mips64el|arm64)$/) ? 'm' : 'y';
}
package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::qptrdiff;
@@ -237,7 +237,7 @@
sub _expand {
my ($self, $arch) = @_;
-return ($arch =~ /amd64|ia64|alpha|s390x|sparc64|ppc64|mips64|mips64el/) ? 'x' : 'i';
+return ($arch =~ /^(amd64|ia64|alpha|s390x|sparc64|ppc64|ppc64el|mips64|mips64el|arm64)$/) ? 'x' : 'i';
}
package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::quintptr;
@@ -256,7 +256,7 @@
sub _expand {
my ($self, $arch) = @_;
-return ($arch =~ /amd64|ia64|alpha|s390x|sparc64|ppc64|mips64|mips64el/) ? 'y' : 'j';
+return ($arch =~ /^(amd64|ia64|alpha|s390x|sparc64|ppc64|ppc64el|mips64|mips64el|arm64)$/) ? 'y' : 'j';
}
package
phonon_4.7.1-1_arm64.changes ACCEPTED
Maintainer: Debian Qt/KDE Maintainers debian-qt-kde@lists.debian.org Uploader: buildd autosigning key turfan buildd_arm64-tur...@buildd.debian-ports.org Host: leda.debian.net Accepted: phonon_4.7.1-1_arm64.changes Files: phonon_4.7.1-1_arm64.deb libphonon-dev_4.7.1-1_arm64.deb libphonon4_4.7.1-1_arm64.deb libphononexperimental-dev_4.7.1-1_arm64.deb libphononexperimental4_4.7.1-1_arm64.deb phonon-backend-null_4.7.1-1_arm64.deb phonon-dbg_4.7.1-1_arm64.deb -- To UNSUBSCRIBE, email to debian-qt-kde-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1wyjno-0005xz...@leda.debian.net
Bug#744257: attica: FTBFS on arm64 (symbols issue)
Package: attica Version: 0.4.2-1 Severity: normal Tags: patch User: debian-...@lists.debian.org Usertag: arm64 Even with the updated kde-pkg-tools patch from https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=23;filename=pkg-kde-tools_0.15.13.arm64-subst-fix-2.patch;att=1;bug=744173 , this package doesn't build on arm64, because these two symbols are missing from the generated file: (optional=gccinternal)_ZN6Attica19DownloadDescription7PrivateD1Ev@Base 0.4.0 (optional=gccinternal)_ZN6Attica19DownloadDescription7PrivateD2Ev@Base 0.4.0 I don't know what that (optional=gccinternal) annotation means, although it saying 'optional' suggests to me that having it missing shouldn't fail the build, but it does. It can be fixed with the attached patch to declare that these are not present on arm64. I don't know if this is the right fix, or if there is some other reason for these symbols being missing which we should look into? As ever guidance is welcome. -- System Information: Debian Release: 7.4 APT prefers stable APT policy: (990, 'stable') Architecture: i386 (i686) Kernel: Linux 3.2.0-kvm-i386-20110111 (SMP w/1 CPU core) Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash diff -Nru attica-0.4.2/debian/changelog attica-0.4.2/debian/changelog --- attica-0.4.2/debian/changelog 2013-06-24 20:28:52.0 + +++ attica-0.4.2/debian/changelog 2014-04-12 00:17:49.0 + @@ -1,3 +1,10 @@ +attica (0.4.2-1+arm64) unreleased; urgency=low + + * Non-maintainer upload. + * Update symbols file for arm64 + + -- Wookey woo...@debian.org Sat, 12 Apr 2014 00:16:48 + + attica (0.4.2-1) unstable; urgency=low * New upstream release. diff -Nru attica-0.4.2/debian/libattica0.4.symbols attica-0.4.2/debian/libattica0.4.symbols --- attica-0.4.2/debian/libattica0.4.symbols 2013-06-23 23:48:44.0 + +++ attica-0.4.2/debian/libattica0.4.symbols 2014-04-12 00:16:35.0 + @@ -340,8 +340,8 @@ _ZN6Attica19DownloadDescription4sizeEv@Base 0.4.0 _ZN6Attica19DownloadDescription4typeEv@Base 0.4.0 _ZN6Attica19DownloadDescription5setIdEi@Base 0.4.0 - (optional=gccinternal)_ZN6Attica19DownloadDescription7PrivateD1Ev@Base 0.4.0 - (optional=gccinternal)_ZN6Attica19DownloadDescription7PrivateD2Ev@Base 0.4.0 + (optional=gccinternal|arch=!arm64)_ZN6Attica19DownloadDescription7PrivateD1Ev@Base 0.4.0 + (optional=gccinternal|arch=!arm64)_ZN6Attica19DownloadDescription7PrivateD2Ev@Base 0.4.0 _ZN6Attica19DownloadDescription7setLinkERK7QString@Base 0.4.0 _ZN6Attica19DownloadDescription7setNameERK7QString@Base 0.4.0 _ZN6Attica19DownloadDescription7setSizeEj@Base 0.4.0
attica_0.4.2-1+arm64_arm64.changes ACCEPTED
Maintainer: Debian Krap Maintainers debian-qt-kde@lists.debian.org Uploader: Wookey woo...@debian.org Host: leda.debian.net Accepted: attica_0.4.2-1+arm64_arm64.changes Files: attica_0.4.2-1+arm64.dsc attica_0.4.2.orig.tar.bz2 attica_0.4.2-1+arm64.debian.tar.xz libattica-dev_0.4.2-1+arm64_arm64.deb libattica0.4_0.4.2-1+arm64_arm64.deb libattica-dbg_0.4.2-1+arm64_arm64.deb -- To UNSUBSCRIBE, email to debian-qt-kde-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1wymny-0003qr...@leda.debian.net
