Skip to content

Commit

Permalink
Update to fix building on macOS 10.14
Browse files Browse the repository at this point in the history
Note: Python 3 is now needed to build libbsd (because of the bug
https://devel.rtems.org/ticket/3709).
  • Loading branch information
eproxus committed Mar 26, 2019
1 parent cd73e8f commit c6e756d
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 5 additions & 3 deletions build/build-libbsd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
Expand Down Expand Up @@ -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" ]
Expand Down
2 changes: 1 addition & 1 deletion rtems
Submodule rtems updated from b131cb to 7a1934
2 changes: 1 addition & 1 deletion rtems-libbsd
Submodule rtems-libbsd updated from 1e77a4 to eb1d30
2 changes: 1 addition & 1 deletion rtems-source-builder
Submodule rtems-source-builder updated from d2d467 to 9c825f

0 comments on commit c6e756d

Please sign in to comment.