Michael R. Crusoe pushed to branch master at Debian Med / ngs-sdk
Commits: fcd73474 by Michael R. Crusoe at 2020-01-10T14:21:00+01:00 don't hardcode 32 vs 64 bits - - - - - 2 changed files: - debian/changelog - debian/patches/more_archs Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +ngs-sdk (2.10.0-4) unstable; urgency=medium + + * Team upload. + * debian/patches/more_archs: don't hardcode 32 vs 64 bits, use + dpkg-architecture -qDEB_TARGET_ARCH_BITS + + -- Michael R. Crusoe <[email protected]> Fri, 10 Jan 2020 14:19:11 +0100 + ngs-sdk (2.10.0-3) unstable; urgency=medium * Team upload. ===================================== debian/patches/more_archs ===================================== @@ -2,60 +2,81 @@ From: Michael R. Crusoe <[email protected]> Subject: Enable building on more architectures --- ngs-sdk.orig/ngs-java/setup/konfigure.perl +++ ngs-sdk/ngs-java/setup/konfigure.perl -@@ -315,6 +315,16 @@ - $BITS = 32; - } elsif ($MARCH =~ /ppc64/i) { - $BITS = 64; -+} elsif ($MARCH eq 'aarch64') { -+ $BITS = 64; -+} elsif ($MARCH eq 'mips64') { -+ $BITS = 64; -+} elsif ($MARCH eq 'ppc64le') { -+ $BITS = 64; -+} elsif ($MARCH eq 's390x') { -+ $BITS = 64; -+} elsif ($MARCH eq 'riscv64') { -+ $BITS = 64; - } else { - die "unrecognized Architecture '$ARCH'"; - } +@@ -307,17 +307,7 @@ + + my $BITS; + +-if ($MARCH =~ /x86_64/i) { +- $BITS = 64; +-} elsif ($MARCH eq 'fat86') { +- $BITS = '32_64'; +-} elsif ($MARCH =~ /i?86/i) { +- $BITS = 32; +-} elsif ($MARCH =~ /ppc64/i) { +- $BITS = 64; +-} else { +- die "unrecognized Architecture '$ARCH'"; +-} ++$BITS=`dpkg-architecture -qDEB_TARGET_ARCH_BITS` + println "$MARCH ($BITS bits) is supported" unless ($AUTORUN); + + # determine OS and related norms --- ngs-sdk.orig/ngs-sdk/setup/konfigure.perl +++ ngs-sdk/ngs-sdk/setup/konfigure.perl -@@ -315,6 +315,16 @@ - $BITS = 32; - } elsif ($MARCH =~ /ppc64/i) { - $BITS = 64; -+} elsif ($MARCH eq 'aarch64') { -+ $BITS = 64; -+} elsif ($MARCH eq 'mips64') { -+ $BITS = 64; -+} elsif ($MARCH eq 'ppc64le') { -+ $BITS = 64; -+} elsif ($MARCH eq 's390x') { -+ $BITS = 64; -+} elsif ($MARCH eq 'riscv64') { -+ $BITS = 64; - } else { - die "unrecognized Architecture '$ARCH'"; - } +@@ -307,17 +307,7 @@ + + my $BITS; + +-if ($MARCH =~ /x86_64/i) { +- $BITS = 64; +-} elsif ($MARCH eq 'fat86') { +- $BITS = '32_64'; +-} elsif ($MARCH =~ /i?86/i) { +- $BITS = 32; +-} elsif ($MARCH =~ /ppc64/i) { +- $BITS = 64; +-} else { +- die "unrecognized Architecture '$ARCH'"; +-} ++$BITS=`dpkg-architecture -qDEB_TARGET_ARCH_BITS` + println "$MARCH ($BITS bits) is supported" unless ($AUTORUN); + + # determine OS and related norms --- ngs-sdk.orig/ngs-python/setup/konfigure.perl +++ ngs-sdk/ngs-python/setup/konfigure.perl -@@ -313,6 +313,18 @@ - $BITS = '32_64'; - } elsif ($MARCH =~ /i?86/i) { - $BITS = 32; -+} elsif ($MARCH =~ /ppc64/i) { -+ $BITS = 64; -+} elsif ($MARCH eq 'aarch64') { -+ $BITS = 64; -+} elsif ($MARCH eq 'mips64') { -+ $BITS = 64; -+} elsif ($MARCH eq 'ppc64le') { -+ $BITS = 64; -+} elsif ($MARCH eq 's390x') { -+ $BITS = 64; -+} elsif ($MARCH eq 'riscv64') { -+ $BITS = 64; - } else { - die "unrecognized Architecture '$ARCH'"; - } +@@ -307,15 +307,7 @@ + + my $BITS; + +-if ($MARCH =~ /x86_64/i) { +- $BITS = 64; +-} elsif ($MARCH eq 'fat86') { +- $BITS = '32_64'; +-} elsif ($MARCH =~ /i?86/i) { +- $BITS = 32; +-} else { +- die "unrecognized Architecture '$ARCH'"; +-} ++$BITS=`dpkg-architecture -qDEB_TARGET_ARCH_BITS` + println "$MARCH ($BITS bits) is supported" unless ($AUTORUN); + + # determine OS and related norms +--- ngs-sdk.orig/ngs-bam/setup/konfigure.perl ++++ ngs-sdk/ngs-bam/setup/konfigure.perl +@@ -307,15 +307,7 @@ + + my $BITS; + +-if ($MARCH =~ /x86_64/i) { +- $BITS = 64; +-} elsif ($MARCH eq 'fat86') { +- $BITS = '32_64'; +-} elsif ($MARCH =~ /i?86/i) { +- $BITS = 32; +-} else { +- die "unrecognized Architecture '$ARCH'"; +-} ++$BITS=`dpkg-architecture -qDEB_TARGET_ARCH_BITS` + println "$MARCH ($BITS bits) is supported" unless ($AUTORUN); + + # determine OS and related norms View it on GitLab: https://salsa.debian.org/med-team/ngs-sdk/commit/fcd73474e2ed28513c87cbe4c62bb26e671b3cb6 -- View it on GitLab: https://salsa.debian.org/med-team/ngs-sdk/commit/fcd73474e2ed28513c87cbe4c62bb26e671b3cb6 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
