diff --git a/README.Rmd b/README.Rmd index 044fd70..370ffba 100644 --- a/README.Rmd +++ b/README.Rmd @@ -53,18 +53,15 @@ remotes::install_github("meztez/bigrquerystorage") ```sh # install protoc and grpc -apt-get install -y libprotobuf-dev protobuf-compiler-grpc \ - libgrpc++-dev libc-ares-dev libre2-dev \ +apt-get install -y libgrpc++-dev libprotobuf-dev protobuf-compiler-grpc \ pkg-config ``` #### Fedora 38 ```sh -# install protoc and grpc -dnf install -y protobuf-devel protobuf-compiler \ - grpc-devel c-ares-devel \ - re2-devel pkgconf +# install grpc, protoc is automatically installed +dnf install -y grpc-devel pkgconf ``` #### macOS diff --git a/README.md b/README.md index bc6e8fb..eda2405 100644 --- a/README.md +++ b/README.md @@ -52,18 +52,15 @@ remotes::install_github("meztez/bigrquerystorage") ``` sh # install protoc and grpc -apt-get install -y libprotobuf-dev protobuf-compiler-grpc \ - libgrpc++-dev libc-ares-dev libre2-dev \ +apt-get install -y libgrpc++-dev libprotobuf-dev protobuf-compiler-grpc \ pkg-config ``` #### Fedora 38 ``` sh -# install protoc and grpc -dnf install -y protobuf-devel protobuf-compiler \ - grpc-devel c-ares-devel \ - re2-devel pkgconf +# install grpc, protoc is automatically installed +dnf install -y grpc-devel pkgconf ``` #### macOS diff --git a/configure b/configure index 9019693..8a61d72 100755 --- a/configure +++ b/configure @@ -6,9 +6,9 @@ # Library settings PKG_CONFIG_NAME="protobuf grpc++" -PKG_DEB_NAME="libgrpc-dev" -PKG_RPM_NAME="grpc-devel" -PKG_BREW_NAME="grpc" +PKG_DEB_NAME="libgrpc++-dev libprotobuf-dev protobuf-compiler-grpc pkg-config" +PKG_RPM_NAME="grpc-devel pkgconf" +PKG_BREW_NAME="grpc pkg-config" PKG_TEST_HEADER="" PKG_LIBS="-lgrpc++ -lgrpc -lprotobuf" PKG_CFLAGS="" diff --git a/tools/build/linux/Dockerfile-debian-12 b/tools/build/linux/Dockerfile-debian-12 index 6143c83..df61a1b 100644 --- a/tools/build/linux/Dockerfile-debian-12 +++ b/tools/build/linux/Dockerfile-debian-12 @@ -12,12 +12,6 @@ RUN echo "deb http://rig.r-pkg.org/deb rig main" > \ apt-get install -y r-rig && \ rig add release -# ------------------------------------------------------------------------- -# FIXME: We don't need this once grpc is in the system requirements db -RUN apt-get install -y libprotobuf-dev protobuf-compiler-grpc \ - libgrpc++-dev libc-ares-dev \ - libre2-dev pkg-config - # ------------------------------------------------------------------------- # Only copy DESCRIPTION, so Docker can cache the dependency install RUN mkdir /root/bigrquerystorage @@ -26,6 +20,11 @@ WORKDIR /root/bigrquerystorage # No upgrade, to always install binary packages, in case P3M is behind RUN R -q -e 'pak::local_install_deps(upgrade = FALSE)' +# ------------------------------------------------------------------------- +# FIXME: We don't need this once grpc is in the system requirements db +RUN apt-get install -y libgrpc++-dev libprotobuf-dev protobuf-compiler-grpc \ + pkg-config + # ------------------------------------------------------------------------- # Call R CMD build first, so we get rid of Makevars, .o, .so, etc. # Change file ownership, otherwise git complains diff --git a/tools/build/linux/Dockerfile-fedora-38 b/tools/build/linux/Dockerfile-fedora-38 index 1ca5d96..6b5c491 100644 --- a/tools/build/linux/Dockerfile-fedora-38 +++ b/tools/build/linux/Dockerfile-fedora-38 @@ -7,12 +7,6 @@ RUN yum install -y \ https://github.com/r-lib/rig/releases/download/latest/r-rig-latest-1.$(arch).rpm && \ rig add devel -# ------------------------------------------------------------------------- -# FIXME: We don't need this once grpc is in the system requirements db -RUN dnf install -y protobuf-devel protobuf-compiler \ - grpc-devel c-ares-devel \ - re2-devel pkgconf - # ------------------------------------------------------------------------- # Only copy DESCRIPTION, so Docker can cache the dependency install RUN mkdir /root/bigrquerystorage @@ -21,6 +15,10 @@ WORKDIR /root/bigrquerystorage # No upgrade, to always install binary packages, in case P3M is behind RUN R -q -e 'pak::local_install_deps(upgrade = FALSE)' +# ------------------------------------------------------------------------- +# FIXME: We don't need this once grpc is in the system requirements db +RUN dnf install -y grpc-devel pkgconf + # ------------------------------------------------------------------------- # Call R CMD build first, so we get rid of Makevars, .o, .so, etc. # Change file ownership, otherwise git complains diff --git a/tools/build/linux/Dockerfile-ubuntu-22.04 b/tools/build/linux/Dockerfile-ubuntu-22.04 index 6829efb..c5b7e2f 100644 --- a/tools/build/linux/Dockerfile-ubuntu-22.04 +++ b/tools/build/linux/Dockerfile-ubuntu-22.04 @@ -12,12 +12,6 @@ RUN echo "deb http://rig.r-pkg.org/deb rig main" > \ apt-get install -y r-rig && \ rig add release -# ------------------------------------------------------------------------- -# FIXME: We don't need this once grpc is in the system requirements db -RUN apt-get install -y libprotobuf-dev protobuf-compiler-grpc \ - libgrpc++-dev libc-ares-dev libre2-dev \ - pkg-config - # ------------------------------------------------------------------------- # Only copy DESCRIPTION first, so Docker can cache the dependency install RUN mkdir /root/bigrquerystorage @@ -26,6 +20,11 @@ WORKDIR /root/bigrquerystorage # No upgrade, to always install binary packages, in case P3M is behind RUN R -q -e 'pak::local_install_deps(upgrade = FALSE)' +# ------------------------------------------------------------------------- +# FIXME: We don't need this once grpc is in the system requirements db +RUN apt-get install -y libgrpc++-dev libprotobuf-dev protobuf-compiler-grpc \ + pkg-config + # ------------------------------------------------------------------------- # Call R CMD build first, so we get rid of Makevars, .o, .so, etc. # Change file ownership, otherwise git complains