[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#744173: pkg-kde-tools: add arm64 support to SymbolsHelper



In article <20140411024540.25679.92521.reportbug__44887.6658724204$1397184506$gmane$org@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.000000000 +0000
+++ pkg-kde-tools-0.15.13+arm64/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm	2014-04-06 01:42:19.000000000 +0000
@@ -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 /\/\ /\ >< `/

Attachment: signature.asc
Description: Digital signature


Reply to: