[Buildroot] [PATCH 1/1] package/boost: fix boost-log build

* [Buildroot] [PATCH 1/1] package/boost: fix boost-log build
@ 2022-05-21 12:29 Fabrice Fontaine
  2022-05-30 20:58 ` Thomas Petazzoni via buildroot
  0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2022-05-21 12:29 UTC (permalink / raw)
  To: buildroot; +Cc: Fabrice Fontaine

Fix the following build failure with boost-log raised since bump to
version 1.79.0 in commit 7fa88b8eb637f5ec4927ac1bd05309dea7d60bc9 and
https://github.com/boostorg/log/commit/3cbc2585c3b7ff5d884a6c337a99525b57fa184b:

error: at libs/log/build/Jamfile.v2:59
error: Unable to find file or target named
error:     '/boost/architecture//mips'
error: referred to from project at
error:     'libs/log/build'

Fixes:
 - http://autobuild.buildroot.org/results/edcc7c7f3586993a77b6cc06ed02363a42c09a83

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...ips1-to-mips-and-alias-mips1-to-mips.patch | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 package/boost/0002-Rename-mips1-to-mips-and-alias-mips1-to-mips.patch

diff --git a/package/boost/0002-Rename-mips1-to-mips-and-alias-mips1-to-mips.patch b/package/boost/0002-Rename-mips1-to-mips-and-alias-mips1-to-mips.patch
new file mode 100644
index 0000000000..cc4ab8a2f8
--- /dev/null
+++ b/package/boost/0002-Rename-mips1-to-mips-and-alias-mips1-to-mips.patch
@@ -0,0 +1,48 @@
+From 1a55d1d9c6d1cf7739645080bdd92fe903b4211e Mon Sep 17 00:00:00 2001
+From: Nikita Kniazev <nok.raven@gmail.com>
+Date: Wed, 28 Jul 2021 21:06:54 +0300
+Subject: [PATCH] Rename mips1 to mips and alias mips1 to mips
+
+[Retrieved from:
+https://github.com/boostorg/config/commit/1a55d1d9c6d1cf7739645080bdd92fe903b4211e]
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ checks/architecture/Jamfile.jam             | 3 ++-
+ checks/architecture/{mips1.cpp => mips.cpp} | 4 ++--
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+ rename checks/architecture/{mips1.cpp => mips.cpp} (89%)
+
+diff --git a/libs/config/checks/architecture/Jamfile.jam b/libs/config/checks/architecture/Jamfile.jam
+index 2ba54f9ad..c3779d917 100644
+--- a/libs/config/checks/architecture/Jamfile.jam
++++ b/libs/config/checks/architecture/Jamfile.jam
+@@ -18,7 +18,8 @@ obj 64 : 64.cpp ;
+ 
+ obj arm      : arm.cpp ;
+ obj combined : combined.cpp ;
+-obj mips1    : mips1.cpp ;
++obj mips     : mips.cpp ;
++alias mips1  : mips ; # Backwards compatibility
+ obj power    : power.cpp ;
+ obj riscv    : riscv.cpp ;
+ obj sparc    : sparc.cpp ;
+diff --git a/libs/config/checks/architecture/mips1.cpp b/libs/config/checks/architecture/mips.cpp
+similarity index 89%
+rename from checks/architecture/mips1.cpp
+rename to checks/architecture/mips.cpp
+index b4a670b89..85f85583d 100644
+--- a/libs/config/checks/architecture/mips1.cpp
++++ b/libs/config/checks/architecture/mips.cpp
+@@ -1,4 +1,4 @@
+-// mips1.cpp
++// mips.cpp
+ //
+ // Copyright (c) 2012 Steven Watanabe
+ //
+@@ -7,5 +7,5 @@
+ // http://www.boost.org/LICENSE_1_0.txt)
+ 
+ #if !(defined(__mips) || defined(_MIPS_ISA_MIPS1) || defined(_R3000))
+-#error "Not MIPS1"
++#error "Not MIPS"
+ #endif
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread