This is an automated email from the ASF dual-hosted git repository.
yangzhg pushed a commit to branch libhdfs3
in repository https://gitbox.apache.org/repos/asf/doris-thirdparty.git
commit 34adc8db9bc5dcf8cc1922c603deaf5255c6bbeb
Author: yangzhg <yangz...@gmail.com>
AuthorDate: Tue Jun 7 13:06:25 2022 +0800
remove libuuid
---
CMakeLists.txt | 5 -----
debian/build.sh | 2 +-
debian/control | 2 +-
rpms/build.sh | 2 +-
rpms/libhdfs3.spec | 3 +--
test/function/CMakeLists.txt | 5 -----
test/unit/CMakeLists.txt | 5 -----
7 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 608fb82..3fdc3fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,11 +28,6 @@ ENDIF(BUILD_TEST)
INCLUDE_DIRECTORIES(${GoogleTest_INCLUDE_DIR})
LINK_LIBRARIES(${GoogleTest_LIBRARIES})
-IF(OS_LINUX)
- FIND_PACKAGE(LibUUID REQUIRED)
-ENDIF(OS_LINUX)
-
-
ADD_SUBDIRECTORY(src)
IF(BUILD_TEST)
ADD_SUBDIRECTORY(mock)
diff --git a/debian/build.sh b/debian/build.sh
index dc95425..d6cd446 100755
--- a/debian/build.sh
+++ b/debian/build.sh
@@ -30,7 +30,7 @@ install_depends() {
add-apt-repository -y ppa:ubuntu-toolchain-r/test || die "cannot add
repository"
apt-get update || die "cannot update repository"
apt-get install -qq \
- dpkg-dev debhelper g++ cmake libxml2-dev uuid-dev protobuf-compiler \
+ dpkg-dev debhelper g++ cmake libxml2-dev protobuf-compiler \
libprotobuf-dev libgsasl7-dev libkrb5-dev libboost-all-dev || die
"cannot install dependencies"
}
diff --git a/debian/control b/debian/control
index 5aa30c4..a83604a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,6 @@
Source: libhdfs3
Priority: optional
-Build-Depends: debhelper (>= 9), cmake, libprotobuf-dev, protobuf-compiler,
libxml2-dev, libkrb5-dev, uuid-dev, libgsasl7-dev
+Build-Depends: debhelper (>= 9), cmake, libprotobuf-dev, protobuf-compiler,
libxml2-dev, libkrb5-dev, libgsasl7-dev
Standards-Version: 3.9.5
Section: libs
diff --git a/rpms/build.sh b/rpms/build.sh
index 48c5de6..6b8c9a9 100755
--- a/rpms/build.sh
+++ b/rpms/build.sh
@@ -26,7 +26,7 @@ die() {
install_depends() {
yum install -y epel-release || die "cannot install epel"
yum install -y \
- which make rpmdevtools gcc-c++ cmake boost-devel libxml2-devel
libuuid-devel krb5-devel libgsasl-devel \
+ which make rpmdevtools gcc-c++ cmake boost-devel libxml2-devel
krb5-devel libgsasl-devel \
protobuf-devel || die "cannot install dependencies"
}
diff --git a/rpms/libhdfs3.spec b/rpms/libhdfs3.spec
index 9192f3b..93fb6d7 100644
--- a/rpms/libhdfs3.spec
+++ b/rpms/libhdfs3.spec
@@ -31,7 +31,6 @@ BuildRoot: %(mktemp -ud
%{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: gcc-c++
BuildRequires: make
BuildRequires: cmake
-BuildRequires: libuuid-devel
BuildRequires: libxml2-devel
BuildRequires: krb5-devel
BuildRequires: libgsasl-devel
@@ -50,7 +49,7 @@ Summary: Native C/C++ HDFS Client - development files
Requires: %{name} = %{version}-%{release}
Group: Development/Libraries
Requires: libhdfs3 = %{version}-%{release}
-Requires: libuuid-devel libxml2-devel krb5-devel libgsasl-devel protobuf-devel
pkgconfig
+Requires: libxml2-devel krb5-devel libgsasl-devel protobuf-devel pkgconfig
%description devel
Libhdfs3, designed as an alternative implementation of libhdfs,
diff --git a/test/function/CMakeLists.txt b/test/function/CMakeLists.txt
index 8faa259..f690d80 100644
--- a/test/function/CMakeLists.txt
+++ b/test/function/CMakeLists.txt
@@ -56,11 +56,6 @@ IF(NEED_GCCEH)
TARGET_LINK_LIBRARIES(function gcc_eh)
ENDIF(NEED_GCCEH)
-IF(OS_LINUX)
- TARGET_LINK_LIBRARIES(function ${LIBUUID_LIBRARIES})
- INCLUDE_DIRECTORIES(${LIBUUID_INCLUDE_DIRS})
-ENDIF(OS_LINUX)
-
TARGET_LINK_LIBRARIES(function ${PROTOBUF_LIBRARIES})
TARGET_LINK_LIBRARIES(function ${LIBXML2_LIBRARIES})
TARGET_LINK_LIBRARIES(function ${KERBEROS_LIBRARIES})
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
index 46f62ab..d96a87d 100644
--- a/test/unit/CMakeLists.txt
+++ b/test/unit/CMakeLists.txt
@@ -50,11 +50,6 @@ IF(NEED_GCCEH)
TARGET_LINK_LIBRARIES(unit gcc_eh)
ENDIF(NEED_GCCEH)
-IF(OS_LINUX)
- TARGET_LINK_LIBRARIES(unit ${LIBUUID_LIBRARIES})
- INCLUDE_DIRECTORIES(${LIBUUID_INCLUDE_DIRS})
-ENDIF(OS_LINUX)
-
TARGET_LINK_LIBRARIES(unit ${PROTOBUF_LIBRARIES})
TARGET_LINK_LIBRARIES(unit ${LIBXML2_LIBRARIES})
TARGET_LINK_LIBRARIES(unit ${KERBEROS_LIBRARIES})
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
