Skip to contentSkip to conversation

botan: fix build with mips64el-ctng_n32-linux-gnu toolchain

PATCH New Francois Perrad 2 participants 2 messages Oct 14, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 botan: fix build with mips64el-ctng_n32-linux-gnu toolchain

set --cpu only with "mips"

see http://autobuild.buildroot.org/results/5dc/5dc907c0334d3a3b7abff41eef4e025c1f29a655/build-end.log

---
 package/botan/botan.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/botan/botan.mk +7 -1
index ae0e02d..226294b 100644
@@ -13,8 +13,14 @@ BOTAN_LICENSE_FILES = doc/license.txt
 BOTAN_INSTALL_STAGING = YES
 BOTAN_INSTALL_TARGET = YES
 
+BOTAN_ARCH = $(BR2_ARCH)
+
+ifneq ($(findstring mips,$(BOTAN_ARCH)),)
+	BOTAN_ARCH = mips
+endif
+
 BOTAN_CONF_OPTS = \
-	--cpu=$(BR2_ARCH) \
+	--cpu=$(BOTAN_ARCH) \
 	--os=linux \
 	--cc=gcc \
 	--cc-bin="$(TARGET_CXX)"
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 botan: fix build with mips64el-ctng_n32-linux-gnu toolchain

Quoted 4 lines · Francois Perrad

set --cpu only with "mips"

see http://autobuild.buildroot.org/results/5dc/5dc907c0334d3a3b7abff41eef4e025c1f29a655/build-end.log

I don't think you're doing the right thing here. Botan has correctly identified
this as a mips64; however, it doesn't detect that it's using n32...

Vicente, could you have a look?

Regards,
Arnout

Quoted 26 lines
---
 package/botan/botan.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/botan/botan.mk +7 -1
index ae0e02d..226294b 100644
@@ -13,8 +13,14 @@ BOTAN_LICENSE_FILES = doc/license.txt
 BOTAN_INSTALL_STAGING = YES
 BOTAN_INSTALL_TARGET = YES
 
+BOTAN_ARCH = $(BR2_ARCH)
+
+ifneq ($(findstring mips,$(BOTAN_ARCH)),)
+	BOTAN_ARCH = mips
+endif
+
 BOTAN_CONF_OPTS = \
-	--cpu=$(BR2_ARCH) \
+	--cpu=$(BOTAN_ARCH) \
 	--os=linux \
 	--cc=gcc \
 	--cc-bin="$(TARGET_CXX)"
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F