Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ARROW-3539: [CI/Packaging] Update scripts to build against vendored jemalloc #2779

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion c_glib/Brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ brew "cmake"
brew "git"
brew "gobject-introspection"
brew "gtk-doc"
brew "jemalloc"
brew "libtool"
brew "lua"
brew "luarocks"
Expand Down
1 change: 0 additions & 1 deletion ci/conda_env_cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ flatbuffers
gflags
glog
gtest
jemalloc
libprotobuf
lz4-c
python
Expand Down
2 changes: 1 addition & 1 deletion ci/travis_install_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

sudo apt-get install -y -q \
gdb binutils ccache libboost-dev libboost-filesystem-dev \
libboost-system-dev libboost-regex-dev libjemalloc-dev
libboost-system-dev libboost-regex-dev

if [ "$CXX" == "g++-4.9" ]; then
sudo apt-get install -y -q g++-4.9
Expand Down
3 changes: 1 addition & 2 deletions dev/container/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,8 @@ ENV PATH="/miniconda/bin:$PATH"
RUN conda create -y -q -n pyarrow-dev \
python=3.6 numpy six setuptools cython pandas pytest \
cmake flatbuffers rapidjson boost-cpp thrift-cpp snappy zlib \
gflags brotli jemalloc lz4-c zstd -c conda-forge \
gflags brotli lz4-c zstd -c conda-forge \
&& conda clean --all

ADD script ./script
RUN chmod u=rwx ./script/*.sh

1 change: 0 additions & 1 deletion dev/docker_common/Dockerfile.xenial.base
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ RUN wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -
gtest \
re2 \
brotli \
jemalloc \
lz4-c \
zstd \
setuptools \
Expand Down
1 change: 0 additions & 1 deletion dev/spark_integration/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ RUN conda create -y -q -c conda-forge -n pyarrow-dev \
zlib \
gflags \
brotli \
jemalloc \
lz4-c \
zstd \
setuptools \
Expand Down
1 change: 0 additions & 1 deletion dev/tasks/linux-packages/apt/debian-stretch/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ RUN \
libboost-system-dev \
libgirepository1.0-dev \
libglib2.0-doc \
libjemalloc-dev \
libprotobuf-dev \
libprotoc-dev \
lsb-release \
Expand Down
1 change: 0 additions & 1 deletion dev/tasks/linux-packages/apt/ubuntu-bionic/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ RUN \
libboost-system-dev \
libgirepository1.0-dev \
libglib2.0-doc \
libjemalloc-dev \
libprotobuf-dev \
libprotoc-dev \
lsb-release \
Expand Down
1 change: 0 additions & 1 deletion dev/tasks/linux-packages/apt/ubuntu-trusty/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ RUN \
libboost-system-dev \
libgirepository1.0-dev \
libglib2.0-doc \
libjemalloc-dev \
lsb-release \
pkg-config && \
apt-get clean && \
Expand Down
1 change: 0 additions & 1 deletion dev/tasks/linux-packages/apt/ubuntu-xenial/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ RUN \
libboost-system-dev \
libgirepository1.0-dev \
libglib2.0-doc \
libjemalloc-dev \
libprotobuf-dev \
libprotoc-dev \
lsb-release \
Expand Down
1 change: 0 additions & 1 deletion dev/tasks/linux-packages/debian.ubuntu-trusty/control
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ Build-Depends:
libboost-regex-dev,
libboost-system-dev,
libgirepository1.0-dev,
libjemalloc-dev,
pkg-config
Build-Depends-Indep: libglib2.0-doc
Standards-Version: 3.9.6
Expand Down
1 change: 0 additions & 1 deletion dev/tasks/linux-packages/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ Build-Depends:
libboost-regex-dev,
libboost-system-dev,
libgirepository1.0-dev,
libjemalloc-dev,
libprotobuf-dev,
libprotoc-dev,
nvidia-cuda-toolkit,
Expand Down
2 changes: 0 additions & 2 deletions dev/tasks/linux-packages/yum/arrow.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ BuildRequires: gcc-c++
BuildRequires: cmake3
BuildRequires: boost-devel
BuildRequires: git
BuildRequires: jemalloc-devel
%if %{use_python}
BuildRequires: python34-devel
BuildRequires: python34-numpy
Expand Down Expand Up @@ -112,7 +111,6 @@ License: Apache-2.0
Requires: boost-system
Requires: boost-filesystem
Requires: boost-regex
Requires: jemalloc

%description libs
This package contains the libraries for Apache Arrow C++.
Expand Down
1 change: 0 additions & 1 deletion dev/tasks/linux-packages/yum/centos-6/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ RUN \
git \
gobject-introspection-devel \
gtk-doc \
jemalloc-devel \
pkg-config \
python34 \
python34-devel \
Expand Down
1 change: 0 additions & 1 deletion dev/tasks/linux-packages/yum/centos-7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ RUN \
git \
gobject-introspection-devel \
gtk-doc \
jemalloc-devel \
pkg-config \
python34 \
python34-devel \
Expand Down
1 change: 0 additions & 1 deletion python/Brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,5 @@
# under the License.

brew "ccache"
brew "jemalloc"
brew "boost"
brew "thrift"