Skip to content

Commit 11343c1

Browse files
authored
Library cleanup (#261)
* library cleanup * actually run install command * Installing ubuntu capnproto is useless * use ubuntu capnp
1 parent 67d70cb commit 11343c1

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

Dockerfile

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from ubuntu:16.04
22

3-
RUN apt-get update && apt-get install -y libzmq3-dev clang wget git autoconf libtool curl make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev llvm libncurses5-dev libncursesw5-dev xz-utils tk-dev libffi-dev liblzma-dev python-openssl
3+
RUN apt-get update && apt-get install -y libzmq3-dev capnproto libcapnp-dev clang wget git autoconf libtool curl make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev llvm libncurses5-dev libncursesw5-dev xz-utils tk-dev libffi-dev liblzma-dev python-openssl
44

55
RUN curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
66
ENV PATH="/root/.pyenv/bin:/root/.pyenv/shims:${PATH}"
@@ -13,11 +13,9 @@ RUN pip install -r /tmp/requirements.txt
1313

1414
ENV PYTHONPATH=/project
1515

16+
WORKDIR /project
1617
# TODO: Add tag to cereal
1718
RUN git clone https://github.com/commaai/cereal.git /project/cereal
18-
RUN /project/cereal/install_capnp.sh
19-
20-
WORKDIR /project
2119

2220
COPY SConstruct .
2321
COPY . /project/opendbc

can/packer_pyx_setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def get_ext_filename(self, ext_name):
3333

3434

3535
sourcefiles = ['packer_pyx.pyx']
36-
extra_compile_args = ["-std=c++11"]
36+
extra_compile_args = ["-std=c++14"]
3737
ARCH = subprocess.check_output(["uname", "-m"], encoding='utf8').rstrip() # pylint: disable=unexpected-keyword-arg
3838

3939
if ARCH == "aarch64":
@@ -54,7 +54,7 @@ def get_ext_filename(self, ext_name):
5454
extra_compile_args=extra_compile_args,
5555
include_dirs=[
5656
BASEDIR,
57-
os.path.join(BASEDIR, 'phonelibs', 'capnp-cpp/include'),
57+
os.path.join(BASEDIR, 'phonelibs'),
5858
],
5959
extra_link_args=[
6060
os.path.join(BASEDIR, 'opendbc', 'can', libdbc),

can/parser_pyx_setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def get_ext_filename(self, ext_name):
3333

3434

3535
sourcefiles = ['parser_pyx.pyx']
36-
extra_compile_args = ["-std=c++11"]
36+
extra_compile_args = ["-std=c++14"]
3737
ARCH = subprocess.check_output(["uname", "-m"], encoding='utf8').rstrip() # pylint: disable=unexpected-keyword-arg
3838

3939
if ARCH == "aarch64":
@@ -54,7 +54,7 @@ def get_ext_filename(self, ext_name):
5454
extra_compile_args=extra_compile_args,
5555
include_dirs=[
5656
BASEDIR,
57-
os.path.join(BASEDIR, 'phonelibs', 'capnp-cpp/include'),
57+
os.path.join(BASEDIR, 'phonelibs'),
5858
],
5959
extra_link_args=[
6060
os.path.join(BASEDIR, 'opendbc', 'can', libdbc),

0 commit comments

Comments
 (0)