aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/rpm
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2018-09-24 15:45:18 -0400
committerGerald Combs <gerald@wireshark.org>2018-09-24 20:41:56 +0000
commit074f8c492c64ad15a5db6ea12820867685da37ee (patch)
tree5033affee4da9f3b23145b52241ef148f61d046e /packaging/rpm
parentab53831abd962d4fc57e58fe3a7cc18c523c543c (diff)
RPM: optionally use ccache to speed up (re)builds.
Installing and enabling ccache makes testing RPM builds (which always do a complete build) much less painful. Change-Id: Ie9ab1794614701cdbe261089f81398c2b7d1f027 Reviewed-on: https://code.wireshark.org/review/29812 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging/rpm')
-rw-r--r--packaging/rpm/wireshark.spec.in9
1 files changed, 8 insertions, 1 deletions
diff --git a/packaging/rpm/wireshark.spec.in b/packaging/rpm/wireshark.spec.in
index c0f44d484f..70f2bc1dfc 100644
--- a/packaging/rpm/wireshark.spec.in
+++ b/packaging/rpm/wireshark.spec.in
@@ -9,10 +9,11 @@
# - Find a better way to sync with git-export-release.sh.
# - We currently install into /usr/local.
+%bcond_with ninja
+%bcond_with ccache
%bcond_without qt5
%bcond_with lua
%bcond_with mmdbresolve
-%bcond_with ninja
%bcond_with lz4_and_snappy
%bcond_with c_ares
%bcond_without spandsp
@@ -221,6 +222,9 @@ cmake3 \
%else
%cmake \
%endif
+%if %{with ccache}
+ -DENABLE_CCACHE=ON \
+%endif
%if %{with qt5}
-DBUILD_wireshark=ON \
%else
@@ -435,6 +439,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog
* Mon Sep 24 2018 Jeff Morriss
+- Allow using ccache to (greatly) speed up rebuilds.
+
+* Mon Sep 24 2018 Jeff Morriss
- Make the (optional) maxminddb dependencies actually work.
* Wed Apr 11 2018 Gerald Combs