You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ph...@apache.org on 2019/06/28 18:19:47 UTC
[nifi-minifi-cpp] branch master updated: MINIFICPP-939: Install
deps up front on certian systems. Change centos LIBDIR as the version
change of cmake enforced a different dir
This is an automated email from the ASF dual-hosted git repository.
phrocker pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
The following commit(s) were added to refs/heads/master by this push:
new c9d9b78 MINIFICPP-939: Install deps up front on certian systems. Change centos LIBDIR as the version change of cmake enforced a different dir
c9d9b78 is described below
commit c9d9b788f0856e86f60665664d22d329da883979
Author: Marc Parisi <ph...@apache.org>
AuthorDate: Fri Jun 28 09:28:12 2019 -0400
MINIFICPP-939: Install deps up front on certian systems. Change centos LIBDIR as the version change of cmake enforced a different dir
This closes #602.
Signed-off-by: Marc Parisi <ph...@apache.org>
---
bootstrap.sh | 2 +-
docker/bionic/Dockerfile | 2 +-
docker/centos/Dockerfile | 3 +--
docker/fedora/Dockerfile | 2 +-
docker/xenial/Dockerfile | 2 +-
extensions/librdkafka/CMakeLists.txt | 15 +--------------
6 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/bootstrap.sh b/bootstrap.sh
index df553ac..9bc864d 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -270,7 +270,7 @@ add_dependency GPS_ENABLED "gpsd"
add_disabled_option AWS_ENABLED ${TRUE} "ENABLE_AWS"
-add_disabled_option KAFKA_ENABLED ${FALSE} "ENABLE_LIBRDKAFKA" "3.4.0"
+add_disabled_option KAFKA_ENABLED ${FALSE} "ENABLE_LIBRDKAFKA"
add_disabled_option MQTT_ENABLED ${FALSE} "ENABLE_MQTT"
diff --git a/docker/bionic/Dockerfile b/docker/bionic/Dockerfile
index 0154f5b..e33f0fc 100644
--- a/docker/bionic/Dockerfile
+++ b/docker/bionic/Dockerfile
@@ -35,7 +35,7 @@ ENV MINIFI_BASE_DIR /opt/minifi
RUN mkdir -p $MINIFI_BASE_DIR
USER $USER
-RUN apt-get update && apt-get install -y openjdk-8-jdk openjdk-8-source sudo git maven
+RUN apt-get update && apt-get install -y openjdk-8-jdk openjdk-8-source sudo git maven autogen autoconf automake
ADD $MINIFI_SOURCE_CODE $MINIFI_BASE_DIR
diff --git a/docker/centos/Dockerfile b/docker/centos/Dockerfile
index 864ce03..e54631a 100644
--- a/docker/centos/Dockerfile
+++ b/docker/centos/Dockerfile
@@ -35,7 +35,7 @@ ENV MINIFI_BASE_DIR /opt/minifi
RUN mkdir -p $MINIFI_BASE_DIR
USER $USER
-RUN yum -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel sudo git which maven
+RUN yum -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel gcc g++ sudo git which maven
ADD $MINIFI_SOURCE_CODE $MINIFI_BASE_DIR
@@ -55,4 +55,3 @@ RUN cd $MINIFI_BASE_DIR \
&& cmake3 -DUSE_SHARED_LIBS= -DENABLE_MQTT=ON -DENABLE_LIBRDKAFKA=ON -DPORTABLE=ON -DENABLE_COAP=ON -DCMAKE_BUILD_TYPE=Release -DSKIP_TESTS=true -DENABLE_JNI=$ENABLE_JNI .. \
&& make -j8 package
-#COPY $MINIFI_BASE_DIR/build/nifi-minifi-cpp-$MINIFI_VERSION-bin.tar.gz $DUMP_LOCATION/nifi-minifi-cpp-centos7-$MINIFI_VERSION-bin.tar.gz
\ No newline at end of file
diff --git a/docker/fedora/Dockerfile b/docker/fedora/Dockerfile
index 612e897..d102349 100644
--- a/docker/fedora/Dockerfile
+++ b/docker/fedora/Dockerfile
@@ -35,7 +35,7 @@ ENV MINIFI_BASE_DIR /opt/minifi
RUN mkdir -p $MINIFI_BASE_DIR
USER $USER
-RUN yum -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel flex bison make patch sudo git which maven
+RUN yum -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel flex bison make patch sudo git which maven libtool autoconf automake
ADD $MINIFI_SOURCE_CODE $MINIFI_BASE_DIR
diff --git a/docker/xenial/Dockerfile b/docker/xenial/Dockerfile
index 152cabc..248dd7c 100644
--- a/docker/xenial/Dockerfile
+++ b/docker/xenial/Dockerfile
@@ -34,7 +34,7 @@ ENV MINIFI_BASE_DIR /opt/minifi
RUN mkdir -p $MINIFI_BASE_DIR
USER $USER
-RUN apt-get update && apt-get install -y openjdk-8-jdk openjdk-8-source sudo git maven
+RUN apt-get update && apt-get install -y openjdk-8-jdk openjdk-8-source sudo git maven autogen autoconf automake
ADD $MINIFI_SOURCE_CODE $MINIFI_BASE_DIR
diff --git a/extensions/librdkafka/CMakeLists.txt b/extensions/librdkafka/CMakeLists.txt
index e1f4247..8d96666 100644
--- a/extensions/librdkafka/CMakeLists.txt
+++ b/extensions/librdkafka/CMakeLists.txt
@@ -55,6 +55,7 @@ ExternalProject_Add(
"-DENABLE_LZ4_EXT=OFF"
"-DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH_PASSTHROUGH_LIST}"
"-DCMAKE_C_FLAGS=${CURL_C_FLAGS}"
+ "-DCMAKE_INSTALL_LIBDIR=lib"
"-DCMAKE_CXX_FLAGS=${CURL_CXX_FLAGS}"
EXCLUDE_FROM_ALL TRUE
)
@@ -66,20 +67,6 @@ add_dependencies(minifi-rdkafka-extensions kafka-external)
include_directories(${ZLIB_INCLUDE_DIRS})
include_directories(${KAFKA_INCLUDE})
target_link_libraries (minifi-rdkafka-extensions ${BYPRODUCT})
-if (WIN32)
- set_target_properties(minifi-rdkafka-extensions PROPERTIES
- LINK_FLAGS "/WHOLERDKAFKA"
- )
-elseif (APPLE)
- set_target_properties(minifi-rdkafka-extensions PROPERTIES
- LINK_FLAGS "-Wl,-all_load"
- )
-else ()
- set_target_properties(minifi-rdkafka-extensions PROPERTIES
- LINK_FLAGS "-Wl,--whole-rdkafka"
- )
-endif ()
-
SET (RDKAFKA-EXTENSIONS minifi-rdkafka-extensions PARENT_SCOPE)