Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
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
84 changes: 42 additions & 42 deletions LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -773,6 +773,48 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------

The files in cpp/src/arrow/vendored/uriparser/ have the following license
(BSD 3-Clause License)

uriparser - RFC 3986 URI parsing library

Copyright (C) 2007, Weijia Song <songweijia@gmail.com>
Copyright (C) 2007, Sebastian Pipping <sebastian@pipping.org>
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:

* Redistributions of source code must retain the above
copyright notice, this list of conditions and the following
disclaimer.

* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials
provided with the distribution.

* Neither the name of the <ORGANIZATION> nor the names of its
contributors may be used to endorse or promote products
derived from this software without specific prior written
permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------

The files under dev/tasks/conda-recipes have the following license

BSD 3-clause license
Expand Down Expand Up @@ -1111,48 +1153,6 @@ limitations under the License.

--------------------------------------------------------------------------------

3rdparty dependency uriparser is statically linked in certain binary
distributions, like the python wheels. uriparser has the following license:

uriparser - RFC 3986 URI parsing library

Copyright (C) 2007, Weijia Song <songweijia@gmail.com>
Copyright (C) 2007, Sebastian Pipping <sebastian@pipping.org>
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:

* Redistributions of source code must retain the above
copyright notice, this list of conditions and the following
disclaimer.

* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials
provided with the distribution.

* Neither the name of the <ORGANIZATION> nor the names of its
contributors may be used to endorse or promote products
derived from this software without specific prior written
permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------

3rdparty dependency zstd is statically linked in certain binary
distributions, like the python wheels. ZSTD has the following license:

Expand Down
2 changes: 0 additions & 2 deletions ci/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ arch=("any")
url="https://arrow.apache.org/"
license=("Apache-2.0")
depends=("${MINGW_PACKAGE_PREFIX}-boost"
"${MINGW_PACKAGE_PREFIX}-double-conversion"
"${MINGW_PACKAGE_PREFIX}-thrift"
"${MINGW_PACKAGE_PREFIX}-snappy"
"${MINGW_PACKAGE_PREFIX}-zlib"
Expand Down Expand Up @@ -91,7 +90,6 @@ build() {
-DARROW_WITH_ZSTD=ON \
-DARROW_USE_GLOG=OFF \
-DARROW_BUILD_UTILITIES=OFF \
-Ddouble-conversion_ROOT="${MINGW_PREFIX}" \
-DThrift_ROOT="${MINGW_PREFIX}"

make
Expand Down
2 changes: 0 additions & 2 deletions ci/appveyor-cpp-setup-mingw.bat
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ pacman --sync --noconfirm ^
%MINGW_PACKAGE_PREFIX%-boost ^
%MINGW_PACKAGE_PREFIX%-brotli ^
%MINGW_PACKAGE_PREFIX%-cmake ^
%MINGW_PACKAGE_PREFIX%-double-conversion ^
%MINGW_PACKAGE_PREFIX%-gflags ^
%MINGW_PACKAGE_PREFIX%-gobject-introspection ^
%MINGW_PACKAGE_PREFIX%-grpc ^
Expand All @@ -52,7 +51,6 @@ pacman --sync --noconfirm ^
%MINGW_PACKAGE_PREFIX%-rapidjson ^
%MINGW_PACKAGE_PREFIX%-snappy ^
%MINGW_PACKAGE_PREFIX%-thrift ^
%MINGW_PACKAGE_PREFIX%-uriparser ^
%MINGW_PACKAGE_PREFIX%-zlib ^
%MINGW_PACKAGE_PREFIX%-zstd || exit /B

Expand Down
2 changes: 0 additions & 2 deletions ci/conda_env_cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ brotli
bzip2
c-ares
cmake
double-conversion
gflags
glog
gmock>=1.8.1
Expand All @@ -37,6 +36,5 @@ python
rapidjson
snappy
thrift-cpp>=0.11.0
uriparser
zlib
zstd
1 change: 0 additions & 1 deletion ci/docker/cuda-10.0-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ RUN apt-get update -y -q && \
libboost-system-dev \
libbrotli-dev \
libbz2-dev \
libdouble-conversion-dev \
libgflags-dev \
libgoogle-glog-dev \
liblz4-dev \
Expand Down
1 change: 0 additions & 1 deletion ci/docker/debian-10-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libbrotli-dev \
libbz2-dev \
libc-ares-dev \
libdouble-conversion-dev \
libgflags-dev \
libgmock-dev \
libgoogle-glog-dev \
Expand Down
1 change: 0 additions & 1 deletion ci/docker/fedora-29-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ RUN dnf update -y && \
ccache \
clang-devel \
cmake \
double-conversion-devel \
flatbuffers-devel \
flex \
java-openjdk-devel \
Expand Down
1 change: 0 additions & 1 deletion ci/docker/linux-apt-jni.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
g++ \
gcc \
libboost-all-dev \
libdouble-conversion-dev \
libgflags-dev \
libgoogle-glog-dev \
libgtest-dev \
Expand Down
1 change: 0 additions & 1 deletion ci/docker/ubuntu-14.04-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ RUN apt-get update -y -q && \
gcc \
git \
libbz2-dev \
libdouble-conversion-dev \
libgoogle-glog-dev \
libsnappy-dev \
libssl-dev \
Expand Down
2 changes: 0 additions & 2 deletions ci/docker/ubuntu-16.04-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ RUN apt-get update -y -q && \
libboost-all-dev \
libbrotli-dev \
libbz2-dev \
libdouble-conversion-dev \
libgoogle-glog-dev \
liblz4-dev \
libre2-dev \
Expand All @@ -63,7 +62,6 @@ RUN apt-get update -y -q && \
# - libprotobuf-dev / libprotoc-dev in Xenial too old for gRPC
# - libboost-all-dev does not include Boost.Process, needed for Flight
# unit tests, so doing vendored build by default
# - liburiparser-dev is too old (< 0.9.0)
ENV ARROW_BUILD_BENCHMARKS=OFF \
ARROW_BUILD_TESTS=ON \
ARROW_DEPENDENCY_SOURCE=SYSTEM \
Expand Down
1 change: 0 additions & 1 deletion ci/docker/ubuntu-18.04-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ RUN apt-get update -y -q && \
libboost-system-dev \
libbrotli-dev \
libbz2-dev \
libdouble-conversion-dev \
libgflags-dev \
libgoogle-glog-dev \
liblz4-dev \
Expand Down
1 change: 0 additions & 1 deletion ci/docker/ubuntu-18.04-r-sanitizer.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ RUN apt-get update -y -q && \
libboost-system-dev \
libbrotli-dev \
libbz2-dev \
libdouble-conversion-dev \
libgflags-dev \
libgoogle-glog-dev \
liblz4-dev \
Expand Down
2 changes: 0 additions & 2 deletions ci/scripts/cpp_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ cmake -G "${CMAKE_GENERATOR:-Ninja}" \
-DCMAKE_CXX_FLAGS=${CXXFLAGS:-} \
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR:-lib} \
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX:-${ARROW_HOME}} \
-Ddouble-conversion_SOURCE=${uriparser_SOURCE:-AUTO} \
-Dgflags_SOURCE=${gflags_SOURCE:-AUTO} \
-DgRPC_SOURCE=${gRPC_SOURCE:-AUTO} \
-DGTest_SOURCE=${GTest_SOURCE:-AUTO} \
Expand All @@ -109,7 +108,6 @@ cmake -G "${CMAKE_GENERATOR:-Ninja}" \
-DRapidJSON_SOURCE=${RapidJSON_SOURCE:-AUTO} \
-DRE2_SOURCE=${RE2_SOURCE:-AUTO} \
-DThrift_SOURCE=${Thrift_SOURCE:-AUTO} \
-Duriparser_SOURCE=${uriparser_SOURCE:-AUTO} \
-DZSTD_SOURCE=${ZSTD_SOURCE:-AUTO} \
${CMAKE_ARGS} \
${source_dir}
Expand Down
3 changes: 0 additions & 3 deletions ci/windows-pkg-arrow-for-r.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,6 @@ mv mingw32/lib/*.a ../${DST_DIR}/lib-4.9.3/i386
cd ..

mkdir deps40 && cd deps40
# double-conversion is only available in the Rtools4.0 builds, but apparently that's ok
wget https://dl.bintray.com/rtools/mingw64/mingw-w64-x86_64-double-conversion-3.1.2-1-any.pkg.tar.xz
wget https://dl.bintray.com/rtools/mingw32/mingw-w64-i686-double-conversion-3.1.2-1-any.pkg.tar.xz

wget https://dl.bintray.com/rtools/mingw64/mingw-w64-x86_64-openssl-1.1.1.a-1-any.pkg.tar.xz
wget https://dl.bintray.com/rtools/mingw32/mingw-w64-i686-openssl-1.1.1.a-1-any.pkg.tar.xz
Expand Down
1 change: 0 additions & 1 deletion cpp/Brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ brew "brotli"
brew "c-ares"
brew "ccache"
brew "cmake"
brew "double-conversion"
brew "flatbuffers"
brew "git"
brew "glog"
Expand Down
5 changes: 0 additions & 5 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -592,11 +592,6 @@ set(ARROW_LINK_LIBS)
set(ARROW_STATIC_LINK_LIBS)
set(ARROW_STATIC_INSTALL_INTERFACE_LIBS)

if(ARROW_WITH_URIPARSER)
list(APPEND ARROW_STATIC_LINK_LIBS uriparser::uriparser)
list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS uriparser::uriparser)
endif()

if(ARROW_USE_OPENSSL)
set(ARROW_OPENSSL_LIBS OpenSSL::Crypto OpenSSL::SSL)
list(APPEND ARROW_LINK_LIBS ${ARROW_OPENSSL_LIBS})
Expand Down
96 changes: 0 additions & 96 deletions cpp/cmake_modules/FinduriparserAlt.cmake

This file was deleted.

Loading