diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-03-02 12:35:13 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-03-02 12:35:16 +0100 |
| commit | 89397c4e10d630eb16d889e7f035efbaaceedf02 (patch) | |
| tree | c24e1c445799a54b59f00b5d2ddc88a824f12c77 /rules | |
| parent | a95d9b55a720d05bf04c7c28946278e6b03354c0 (diff) | |
| download | ptxdist-89397c4e10d630eb16d889e7f035efbaaceedf02.tar.gz ptxdist-89397c4e10d630eb16d889e7f035efbaaceedf02.tar.xz | |
openssl: fix architecture selection
Only debian-i386 remains for 32 bit x86. debian-armeb is also gone.
Use ':=' brecause only one architecture makes sense here.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/openssl.make | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/rules/openssl.make b/rules/openssl.make index a6962baed..17ee27914 100644 --- a/rules/openssl.make +++ b/rules/openssl.make @@ -37,28 +37,22 @@ OPENSSL_LICENSE := OpenSSL OPENSSL_CONF_ENV := $(CROSS_ENV) -OPENSSL_ARCH-$(PTXCONF_ARCH_X86_I386) += debian-i386 -OPENSSL_ARCH-$(PTXCONF_ARCH_X86_I486) += debian-i386-i486 -OPENSSL_ARCH-$(PTXCONF_ARCH_X86_I586) += debian-i386-i586 -OPENSSL_ARCH-$(PTXCONF_ARCH_X86_I686) += debian-i386-i686/cmov -OPENSSL_ARCH-$(PTXCONF_ARCH_X86_P2) += debian-i386-i686/cmov -OPENSSL_ARCH-$(PTXCONF_ARCH_X86_P3M) += debian-i386-i686/cmov -OPENSSL_ARCH-$(PTXCONF_ARCH_X86_64) += debian-amd64 -OPENSSL_ARCH-$(PTXCONF_ARCH_M68K) += debian-m68k -OPENSSL_ARCH-$(PTXCONF_ARCH_PPC) += debian-powerpc -OPENSSL_ARCH-$(PTXCONF_ARCH_SPARC) += debian-sparc -OPENSSL_ARCH-$(PTXCONF_ARCH_ARM64) += debian-arm64 +OPENSSL_ARCH-$(PTXCONF_ARCH_X86) := debian-i386 +OPENSSL_ARCH-$(PTXCONF_ARCH_X86_64) := debian-amd64 +OPENSSL_ARCH-$(PTXCONF_ARCH_M68K) := debian-m68k +OPENSSL_ARCH-$(PTXCONF_ARCH_PPC) := debian-powerpc +OPENSSL_ARCH-$(PTXCONF_ARCH_SPARC) := debian-sparc +OPENSSL_ARCH-$(PTXCONF_ARCH_ARM64) := debian-arm64 ifdef PTXCONF_ENDIAN_LITTLE -OPENSSL_ARCH-$(PTXCONF_ARCH_ARM) += debian-armel -OPENSSL_ARCH-$(PTXCONF_ARCH_MIPS) += debian-mipsel -OPENSSL_ARCH-$(PTXCONF_ARCH_SH_SH3) += debian-sh3 -OPENSSL_ARCH-$(PTXCONF_ARCH_SH_SH4) += debian-sh4 +OPENSSL_ARCH-$(PTXCONF_ARCH_ARM) := debian-armel +OPENSSL_ARCH-$(PTXCONF_ARCH_MIPS) := debian-mipsel +OPENSSL_ARCH-$(PTXCONF_ARCH_SH_SH3) := debian-sh3 +OPENSSL_ARCH-$(PTXCONF_ARCH_SH_SH4) := debian-sh4 else -OPENSSL_ARCH-$(PTXCONF_ARCH_ARM) += debian-armeb -OPENSSL_ARCH-$(PTXCONF_ARCH_MIPS) += debian-mips -OPENSSL_ARCH-$(PTXCONF_ARCH_SH_SH3) += debian-sh3eb -OPENSSL_ARCH-$(PTXCONF_ARCH_SH_SH4) += debian-sh4eb +OPENSSL_ARCH-$(PTXCONF_ARCH_MIPS) := debian-mips +OPENSSL_ARCH-$(PTXCONF_ARCH_SH_SH3) := debian-sh3eb +OPENSSL_ARCH-$(PTXCONF_ARCH_SH_SH4) := debian-sh4eb endif ifdef PTXCONF_OPENSSL |