From c6e756dc2147c9a1379b3092ed4d98758ebb4a17 Mon Sep 17 00:00:00 2001
From: Adam Lindberg <hello@alind.io>
Date: Tue, 26 Mar 2019 10:55:32 +0100
Subject: [PATCH] Update to fix building on macOS 10.14

Note: Python 3 is now needed to build libbsd (because of the bug
https://devel.rtems.org/ticket/3709).
---
 .gitmodules           | 8 ++++----
 build/build-libbsd.sh | 8 +++++---
 rtems                 | 2 +-
 rtems-libbsd          | 2 +-
 rtems-source-builder  | 2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 3e6f1b9..7f854c7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,11 +1,11 @@
 [submodule "rtems"]
 	path = rtems
-	url = https://github.com/grisp/rtems
-	branch = grisp-20171025-patches
+	url = git://git.rtems.org/rtems.git
+	branch = master
 [submodule "rtems-libbsd"]
 	path = rtems-libbsd
-	url = https://github.com/grisp/rtems-libbsd
-	branch = grisp
+	url = git://git.rtems.org/rtems-libbsd.git
+	branch = 5-freebsd-12
 [submodule "rtems-source-builder"]
 	path = rtems-source-builder
 	url = git://git.rtems.org/rtems-source-builder.git
diff --git a/build/build-libbsd.sh b/build/build-libbsd.sh
index 61bc009..df50cc7 100755
--- a/build/build-libbsd.sh
+++ b/build/build-libbsd.sh
@@ -14,6 +14,8 @@ PROJECTDIR="${SCRIPTDIR}/../"
 . "${SCRIPTDIR}/configuration.sh"
 export PATH="${PREFIX}/bin:${PATH}"
 
+WAF="${PROJECTDIR}/rtems-libbsd/waf"
+
 cd "${LIBBSD_SOURCE_DIR}"
 
 if [ "$BSP_NAME" = "atsamv" ]
@@ -55,15 +57,15 @@ then
 	fi
 fi
 
-waf configure \
+python3 $WAF configure \
 	--prefix="${PREFIX}" \
 	--rtems-bsps="${RTEMS_CPU}/${BSP_NAME}" \
 	--buildset="${SCRIPTDIR}/libbsd-buildset.ini"
-waf
+python3 $WAF
 
 if [ $DO_INSTALL -ne 0 ]
 then
-	waf install
+	python3 $WAF install
 fi
 
 if [ "$BSP_NAME" = "atsamv" ]
diff --git a/rtems b/rtems
index b131cb2..7a1934d 160000
--- a/rtems
+++ b/rtems
@@ -1 +1 @@
-Subproject commit b131cb2aa035e6176e6ef362f09e39778f9063cb
+Subproject commit 7a1934dac087295b209563d984549a48728599a3
diff --git a/rtems-libbsd b/rtems-libbsd
index 1e77a45..eb1d30a 160000
--- a/rtems-libbsd
+++ b/rtems-libbsd
@@ -1 +1 @@
-Subproject commit 1e77a45d54bfc52eb76453f3e1327645acc8f77b
+Subproject commit eb1d30ad351ed18116acbd8b224ed8e07d6627d0
diff --git a/rtems-source-builder b/rtems-source-builder
index d2d4678..9c825f0 160000
--- a/rtems-source-builder
+++ b/rtems-source-builder
@@ -1 +1 @@
-Subproject commit d2d46786f113ed39d29deafa3feeb4d42ae94001
+Subproject commit 9c825f0b9a4eff4f87d22e12d3c94072712c3918