Skip to content
Snippets Groups Projects
Commit 079025ad authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Merge branch 'add-protobuf-compiler' into 'master'

Add protobuf-compiler package

See merge request !1363
parents 77c95bd7 c8011954
No related branches found
No related tags found
No related merge requests found
......@@ -144,6 +144,7 @@ osx_macports()
install_macports_pkg "scons"
install_macports_pkg "gmake"
install_macports_pkg "lua"
install_macports_pkg "protobuf-c"
}
###############################################################################
......@@ -208,6 +209,7 @@ osx_homebrew()
install_brew_pkg "scons"
install_brew_pkg "lua"
install_brew_pkg "ant"
install_brew_pkg "protobuf"
install_brew_pkg "redox-os/gcc_cross_compilers/x86_64-elf-gcc" "x86_64-elf-gcc"
}
......@@ -274,6 +276,7 @@ freebsd()
install_freebsd_pkg "automake"
install_freebsd_pkg "scons"
install_freebsd_pkg "lua54"
install_freebsd_pkg "py-protobuf-compiler"
set +xe
}
......@@ -325,7 +328,8 @@ archLinux()
perl \
doxygen \
lua \
ant"
ant \
protobuf"
if [ "$1" == "qemu" ]; then
packages="$packages qemu"
elif [ "$1" == "virtualbox" ]; then
......@@ -398,7 +402,8 @@ ubuntu()
doxygen \
g++ \
lua5.4 \
ant"
ant \
protobuf-compiler"
# Not availible for at least ARM hosts
case "$host_arch" in
x86*|i?86) pkgs="$pkgs libc6-dev-i386 syslinux-utils";;
......@@ -501,7 +506,8 @@ fedora()
make \
clang \
doxygen \
ant ; do rpm -q $pkg > /dev/null || echo $pkg; done)
ant \
protobuf-compiler ; do rpm -q $pkg > /dev/null || echo $pkg; done)
# If the list of packages is not empty, install missing
COUNT=$(echo $PKGS | wc -w)
if [ $COUNT -ne 0 ]; then
......@@ -581,7 +587,8 @@ suse()
clang \
doxygen \
lua54 \
ant
ant \
protobuf
}
##############################################################################
......
......@@ -48,7 +48,8 @@ RUN apt-get update \
clang \
perl \
doxygen \
ant
ant \
protobuf-compiler
# _UID_ must be replaced with the user's uid on host
# podman root is mapped to your user id on host during build,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment