Skip to content

Commit

Permalink
remove protobuf dependencies
Browse files Browse the repository at this point in the history
Signed-off-by: Bruno Vavala <bruno.vavala@intel.com>
  • Loading branch information
bvavala committed Oct 24, 2022
1 parent 4bad6cc commit e86274a
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 18 deletions.
1 change: 0 additions & 1 deletion build/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ $(PYTHON_DIR) :
. $(abspath $(DSTDIR)/bin/activate) && pip install --upgrade twisted
. $(abspath $(DSTDIR)/bin/activate) && pip install --upgrade pyyaml
. $(abspath $(DSTDIR)/bin/activate) && pip install --upgrade google
. $(abspath $(DSTDIR)/bin/activate) && pip install --upgrade protobuf==3.19.0
. $(abspath $(DSTDIR)/bin/activate) && pip install secp256k1==0.13.2
. $(abspath $(DSTDIR)/bin/activate) && pip install --upgrade cryptography
. $(abspath $(DSTDIR)/bin/activate) && pip install --upgrade pyparsing
Expand Down
6 changes: 0 additions & 6 deletions build/__tools__/verify-pre-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,6 @@ yell --------------- CONFIG AND ENVIRONMENT PRE-BUILD CHECK ---------------

$(pkg-config --atleast-version=1.1.0g openssl) || warn "WARNING: Openssl version found in PKG_CONFIG_PATH must be 1.1.0g or greater"

try command -v protoc
PROTOC_VERSION=$(protoc --version | sed 's/libprotoc \([0-9]\).*/\1/')
if [[ "$PROTOC_VERSION" -lt 3 ]]; then
warn "protoc must be version3 or higher"
fi

try command -v python3
try command -v cmake
try command -v swig
Expand Down
3 changes: 0 additions & 3 deletions docker/Dockerfile.pdo-dev
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ ARG SGXSSL=2.10_1.1.1g
ARG ADD_APT_PKGS=

# Add necessary packages
# TODO(xenial): we need to manually install protobuf 3 as xenial has v2
# Note: ocamlbuild is required by PREREQ but does not exist for xenial. However, the relevant componets are part of 'ocaml' package, later ubuntu split up that package ...
RUN apt-get update \
&& DEBIAN_FRONTEND="noninteractive" \
Expand All @@ -87,7 +86,6 @@ RUN apt-get update \
gnupg \
libcurl4-openssl-dev \
liblmdb-dev \
libprotobuf-dev \
libsecp256k1-dev \
libssl-dev \
libtool \
Expand All @@ -96,7 +94,6 @@ RUN apt-get update \
ocaml \
ocamlbuild \
pkg-config \
protobuf-compiler \
python \
python3-dev \
python3-venv \
Expand Down
2 changes: 1 addition & 1 deletion docs/host_install.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ distributions will require similar packages.
```bash
sudo apt install -y cmake curl git pkg-config unzip xxd libssl-dev build-essential
sudo apt install -y swig python3 python3-dev python3-venv virtualenv
sudo apt install -y liblmdb-dev libprotobuf-dev libsecp256k1-dev protobuf-compiler libncurses5-dev
sudo apt install -y liblmdb-dev libsecp256k1-dev libncurses5-dev
```

<!--
Expand Down
7 changes: 0 additions & 7 deletions python/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,6 @@ COMMON_LIB = ../common/build/libupdo-common.a

all: $(EGG_FILE)

#$(PROTOBUF_DPATH)%_pb2.py : $(PROTOBUF_SPATH)%.proto
# protoc --python_out=$(PROTOBUF_DPATH) --proto_path=$(PROTOBUF_SPATH) $<

#$(addprefix $(PROTOBUF_DPATH),$(PROTOBUF_PYTHON)) : $(addprefix $(PROTOBUF_SPATH),$(PROTOBUF_SOURCE))

#$(EGG_FILE) : $(CRYPTO_SWIG_TARGET) $(KV_SWIG_TARGET) $(addprefix $(PROTOBUF_DPATH),$(PROTOBUF_PYTHON)) $(PYTHON_SOURCE)
$(EGG_FILE) : $(CRYPTO_SWIG_TARGET) $(KV_SWIG_TARGET) $(PYTHON_SOURCE)
@ . $(abspath $(DSTDIR)/bin/activate) && \
python setup.py bdist_egg
Expand All @@ -73,7 +67,6 @@ test: install
(cd ../common/tests/crypto && python test_cryptoWrapper.py)

clean:
#rm -f $(addprefix $(PROTOBUF_DPATH),$(PROTOBUF_PYTHON))
@ . $(abspath $(DSTDIR)/bin/activate) && \
python setup.py clean --all

Expand Down

0 comments on commit e86274a

Please sign in to comment.