Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
24523560 do not publish wireshark when BUILD_TYPE=evaluation
authorJohn Beck <John.Beck@Oracle.COM>
Thu, 25 Aug 2016 12:12:12 -0700
changeset 6697 5eee27273099
parent 6696 34fb4d9c388b
child 6698 0ecaee856756
24523560 do not publish wireshark when BUILD_TYPE=evaluation
components/wireshark/Makefile file | annotate | diff | comparison | revisions 
--- a/components/wireshark/Makefile	Thu Aug 25 12:12:02 2016 -0700
+++ b/components/wireshark/Makefile	Thu Aug 25 12:12:12 2016 -0700
@@ -36,6 +36,10 @@
 TPNO=			30387
 
 TEST_TARGET= $(NO_TESTS)
+
+# Depends on newer cairo, which cannot be updated in S11.
+include $(WS_MAKE_RULES)/no-evaluation.mk
+
 include $(WS_MAKE_RULES)/common.mk
 
 # Micro version for easy libraries packaging
upstream/oracle/userland-gate