Skip to content
This repository was archived by the owner on Mar 3, 2023. It is now read-only.

Commit c2d7f14

Browse files
huijunwuhuijunw
andauthored
Remove cppunit-dev dependency (#3680)
Co-authored-by: Huijun Wu <[email protected]>
1 parent 2956293 commit c2d7f14

12 files changed

+5
-14
lines changed

docker/compile/Dockerfile.centos7

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ RUN yum -y install \
2525
ant \
2626
automake \
2727
curl \
28-
cppunit-devel \
2928
cmake \
3029
openssl-devel \
3130
file \

docker/compile/Dockerfile.debian10

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ RUN apt-get update && apt-get -y install \
2727
cmake \
2828
curl \
2929
git \
30-
libcppunit-dev \
3130
libssl-dev \
3231
libtool \
3332
libtool-bin \

docker/compile/Dockerfile.ubuntu18.04

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ RUN apt-get update && apt-get -y install \
2727
automake \
2828
libtool-bin \
2929
libunwind8 \
30-
libcppunit-dev \
3130
patch \
3231
python3-dev \
3332
python3-venv \

docker/compile/Dockerfile.ubuntu20.04

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ RUN apt-get update && apt-get -y install \
2929
automake \
3030
libtool-bin \
3131
libunwind8 \
32-
libcppunit-dev \
3332
patch \
3433
python-is-python3 \
3534
python3-dev \

docker/test/Dockerfile.centos7

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ RUN yum -y install \
3232
git \
3333
kernel-devel \
3434
libtool \
35-
cppunit-devel \
3635
make \
3736
patch \
3837
python3-devel \

docker/test/Dockerfile.ubuntu18.04

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ RUN apt-get update && apt-get -y install \
2626
automake \
2727
libtool-bin \
2828
libunwind8 \
29-
libcppunit-dev \
3029
patch \
3130
python3-dev \
3231
python3-venv \

third_party/zookeeper/BUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ genrule(
3131
"ant compile_jute",
3232
"cd $$TMP_DIR/zookeeper-client/zookeeper-client-c",
3333
"autoreconf -if",
34-
"./configure --prefix=$$INSTALL_DIR --enable-shared=no",
34+
"./configure --prefix=$$INSTALL_DIR --disable-shared --without-cppunit",
3535
"make install",
3636
"rm -rf $$TMP_DIR",
3737
]),
@@ -46,7 +46,7 @@ genrule(
4646
"ant compile_jute",
4747
"cd $$TMP_DIR/zookeeper-client/zookeeper-client-c",
4848
"autoreconf -if",
49-
"./configure --prefix=$$INSTALL_DIR --enable-shared=no",
49+
"./configure --prefix=$$INSTALL_DIR --disable-shared --without-cppunit",
5050
"make install",
5151
"rm -rf $$TMP_DIR",
5252
]),

vagrant/init.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ REMOVED
103103
apt-get -qy update
104104

105105
# install deps
106-
apt-get install -qy ant vim zip mc curl wget openjdk-11-jdk scala git python3-setuptools python3-venv python3-dev libtool-bin libcppunit-dev python-is-python3
106+
apt-get install -qy ant vim zip mc curl wget openjdk-11-jdk scala git python3-setuptools python3-venv python3-dev libtool-bin python-is-python3
107107

108108
# install_mesos $mode
109109
if [ $mode == "master" ]; then

website2/docs/compiling-linux.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ $ sudo apt-get upgrade -y
4040

4141
```bash
4242
$ sudo apt-get install git build-essential automake cmake libtool-bin zip ant \
43-
libunwind-setjmp0-dev zlib1g-dev unzip pkg-config python3-setuptools libcppunit-dev -y
43+
libunwind-setjmp0-dev zlib1g-dev unzip pkg-config python3-setuptools -y
4444
```
4545

4646
#### Step 3 --- Set the following environment variables
@@ -154,7 +154,7 @@ To build Heron on a fresh CentOS 7 installation:
154154
### Step 1 --- Install the required dependencies
155155

156156
```bash
157-
$ sudo yum install gcc gcc-c++ kernel-devel wget unzip zlib-devel zip git automake cmake patch libtool cppunit-devel ant pkg-config -y
157+
$ sudo yum install gcc gcc-c++ kernel-devel wget unzip zlib-devel zip git automake cmake patch libtool ant pkg-config -y
158158
```
159159

160160
### Step 2 --- Install libunwind from source

website2/docs/compiling-osx.md

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ brew install automake
4646
brew install cmake
4747
brew install libtool
4848
brew install ant
49-
brew install cppunit
5049
brew install pkg-config
5150
```
5251

website2/docs/compiling-overview.md

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ You must have the following installed to compile Heron:
5353
* [Python](https://www.python.org/) >= 3.8
5454
* [Perl](https://www.perl.org/) >= 5.8.8
5555
* [Ant] (https://ant.apache.org/) >= 1.10.0
56-
* [CppUnit] (https://freedesktop.org/wiki/Software/cppunit/) >= 1.10.1
5756
* [Pkg-Config] (https://www.freedesktop.org/wiki/Software/pkg-config/) >= 0.29.2
5857

5958
Export the `CC` and `CXX` environment variables with a path specific to your

website2/website/scripts/Dockerfile.ubuntu18.04

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ RUN apt-get update && apt-get -y install \
2828
curl \
2929
g++ \
3030
git \
31-
libcppunit-dev \
3231
libtool-bin \
3332
libunwind8 \
3433
openjdk-11-jdk-headless \

0 commit comments

Comments
 (0)