aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders <anders.broman@ericsson.com>2018-04-04 10:00:06 +0200
committerAnders Broman <a.broman58@gmail.com>2018-04-04 17:02:02 +0000
commit9e02a0b65b87349814ab6aa9a1df9d6a930d0a3c (patch)
tree510ceca1c390a7ddd8388124fcd8116c1fdaf936
parent1dd1b507d1f11a25b7726bfeb2dd75b06af61539 (diff)
CMake RPM build: Try to get rid of %globals in favor of %bcond.
Change-Id: I051fb722b0c4161b373f04a79288faa41a61c3cc Reviewed-on: https://code.wireshark.org/review/26735 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--CMakeLists.txt12
-rw-r--r--packaging/rpm/wireshark.spec.in34
2 files changed, 22 insertions, 24 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0dde32c88..092c4c6eb5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3046,22 +3046,22 @@ if(RPMBUILD_EXECUTABLE AND GIT_EXECUTABLE)
list(APPEND _rpmbuild_with_args --with lua)
endif()
if (LZ4_FOUND AND SNAPPY_FOUND)
- list(APPEND _rpmbuild_with_args --define "with_lz4_and_snappy 1")
+ list(APPEND _rpmbuild_with_args --with lz4_and_snappy)
endif()
if (CARES_FOUND)
- list(APPEND _rpmbuild_with_args --define "with_c_ares 1")
+ list(APPEND _rpmbuild_with_args --with c_ares)
endif()
if (SPANDSP_FOUND)
- list(APPEND _rpmbuild_with_args --define "with_spandsp 1")
+ list(APPEND _rpmbuild_with_args --with spandsp)
endif()
if (BCG729_FOUND)
- list(APPEND _rpmbuild_with_args --define "with_bcg729 1")
+ list(APPEND _rpmbuild_with_args --with bcg729)
endif()
if (LIBXML2_FOUND)
- list(APPEND _rpmbuild_with_args --define "with_libxml2 1")
+ list(APPEND _rpmbuild_with_args --with libxml2)
endif()
if (NGHTTP2_FOUND)
- list(APPEND _rpmbuild_with_args --define "with_nghttp2 1")
+ list(APPEND _rpmbuild_with_args --with nghttp2)
endif()
execute_process(
diff --git a/packaging/rpm/wireshark.spec.in b/packaging/rpm/wireshark.spec.in
index de4c346eb5..69c4627224 100644
--- a/packaging/rpm/wireshark.spec.in
+++ b/packaging/rpm/wireshark.spec.in
@@ -13,16 +13,14 @@
%bcond_with lua
%bcond_with mmdbresolve
%bcond_with ninja
-# To do: Add bcond_with clang
+%bcond_with lz4_and_snappy
+%bcond_with c_ares
+%bcond_without spandsp
+%bcond_without bcg729
+%bcond_with libxml2
+%bcond_with nghttp2
-# Set these to 1 if you want to ensure your package includes support for them:
-# Should we use bcond_with and bcond_without here?
-%global with_lz4_and_snappy 1
-%global with_c_ares 1
-%global with_spandsp 0
-%global with_bcg729 0
-%global with_libxml2 1
-%global with_nghttp2 1
+# To do: Add bcond_with clang
# Set at most one of these two:
# Note that setcap requires rpmbuild 4.7.0 or later.
@@ -71,7 +69,7 @@ Requires: zlib
BuildRequires: libgcrypt-devel
Requires: libgcrypt
-%if %{with_lz4_and_snappy}
+%if %{with lz4_and_snappy}
%if 0%{?suse_version}
BuildRequires: liblz4-devel
BuildRequires: snappy-devel
@@ -85,7 +83,7 @@ Requires: lz4
%endif
%endif
-%if %{with_c_ares}
+%if %{with c_ares}
%if 0%{?suse_version}
# SuSE uses these package names (yes 2!):
BuildRequires: libcares-devel
@@ -103,7 +101,7 @@ BuildRequires: lua-devel < 5.3
Requires: lua < 5.3
%endif
-%if %{with_nghttp2}
+%if %{with nghttp2}
BuildRequires: libnghttp2-devel
Requires: libnghttp2
%endif
@@ -224,34 +222,34 @@ Requires: libmaxminddb
%else
-DBUILD_mmdbresolve=OFF \
%endif
-%if %{with_lz4_and_snappy}
+%if %{with lz4_and_snappy}
-DENABLE_LZ4=ON \
-DENABLE_SNAPPY=ON \
%else
-DENABLE_LZ4=OFF \
-DENABLE_SNAPPY=OFF \
%endif
-%if %{with_c_ares}
+%if %{with c_ares}
-DENABLE_CARES=ON \
%else
-DENABLE_CARES=OFF \
%endif
-%if %{with_spandsp}
+%if %{with spandsp}
-DENABLE_SPANDSP=ON \
%else
-DENABLE_SPANDSP=OFF \
%endif
-%if %{with_bcg729}
+%if %{with bcg729}
-DENABLE_BCG729=ON \
%else
-DENABLE_BCG729=OFF \
%endif
-%if %{with_libxml2}
+%if %{with libxml2}
-DENABLE_LIBXML2=ON \
%else
-ENABLE_LIBXML2=OFF \
%endif
-%if %{with_nghttp2}
+%if %{with nghttp2}
-DENABLE_NGHTTP2=ON \
%else
-DENABLE_NGHTTP2=OFF \