21 # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. |
21 # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. |
22 # |
22 # |
23 include ../../make-rules/shared-macros.mk |
23 include ../../make-rules/shared-macros.mk |
24 |
24 |
25 COMPONENT_NAME= wireshark |
25 COMPONENT_NAME= wireshark |
26 COMPONENT_VERSION= 1.12.4 |
26 COMPONENT_VERSION= 1.12.5 |
27 COMPONENT_PROJECT_URL= http://www.wireshark.org/ |
27 COMPONENT_PROJECT_URL= http://www.wireshark.org/ |
28 COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) |
28 COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) |
29 COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2 |
29 COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2 |
30 COMPONENT_ARCHIVE_HASH= \ |
30 COMPONENT_ARCHIVE_HASH= \ |
31 sha256:de804e98e252e4b795d28d6ac2d48d7f5aacd9b046ee44d44266983795ebc312 |
31 sha256:d0f177b2ef49e4deae4ff7d3299bdd295ba558a3934ce8ae489b2f13927cbd82 |
32 COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)download/src/all-versions/$(COMPONENT_ARCHIVE) |
32 COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)download/src/all-versions/$(COMPONENT_ARCHIVE) |
33 COMPONENT_BUGDB= utility/wireshark |
33 COMPONENT_BUGDB= utility/wireshark |
34 |
34 |
35 TPNO= 21830 |
35 TPNO= 22659 |
36 |
36 |
37 include $(WS_MAKE_RULES)/prep.mk |
37 include $(WS_MAKE_RULES)/prep.mk |
38 include $(WS_MAKE_RULES)/configure.mk |
38 include $(WS_MAKE_RULES)/configure.mk |
39 include $(WS_MAKE_RULES)/ips.mk |
39 include $(WS_MAKE_RULES)/ips.mk |
40 |
40 |
61 CONFIGURE_OPTIONS += PATH="/usr/perl5/bin:/usr/gnu/bin:$(PATH)" |
61 CONFIGURE_OPTIONS += PATH="/usr/perl5/bin:/usr/gnu/bin:$(PATH)" |
62 |
62 |
63 # Use the 64-bit versions of pkg-config files |
63 # Use the 64-bit versions of pkg-config files |
64 CONFIGURE_ENV += PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" |
64 CONFIGURE_ENV += PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" |
65 |
65 |
66 # Workaround for Bug 19143303 |
|
67 studio_OPT = -xO3 |
|
68 |
|
69 # We need to avoid RPATH=/usr/lib in Wireshark libraries so that we can |
66 # We need to avoid RPATH=/usr/lib in Wireshark libraries so that we can |
70 # create successfully IPS package of different Wireshark branch than is |
67 # create successfully IPS package of different Wireshark branch than is |
71 # installed on build system without dependency errors. |
68 # installed on build system without dependency errors. |
72 COMPONENT_POST_CONFIGURE_ACTION = \ |
69 COMPONENT_POST_CONFIGURE_ACTION = \ |
73 (cd $(@D); \ |
70 (cd $(@D); \ |
76 -e 's,-R\$$libdir,,' \ |
73 -e 's,-R\$$libdir,,' \ |
77 config.status > config.status.new; \ |
74 config.status > config.status.new; \ |
78 mv config.status.new config.status; \ |
75 mv config.status.new config.status; \ |
79 chmod 755 config.status; \ |
76 chmod 755 config.status; \ |
80 ./config.status) |
77 ./config.status) |
81 |
|
82 # During install libtool will relink libwireshark library so that it |
|
83 # requires libwiretap version from system and not from proto area. |
|
84 # This shall be removed once CBE is updated to contain Wireshark 1.12 |
|
85 # (see Bug 20627618). |
|
86 COMPONENT_POST_INSTALL_ACTION = \ |
|
87 (/usr/bin/elfdump -d $(PROTO_DIR)/usr/lib/$(MACH64)/libwireshark.so.5.0.4 | \ |
|
88 grep 'libwiretap.so.3' && /usr/bin/elfedit \ |
|
89 -e 'dyn:value -s -with-valstr libwiretap.so.3 libwiretap.so.4' \ |
|
90 $(PROTO_DIR)/usr/lib/$(MACH64)/libwireshark.so.5.0.4; true) |
|
91 |
78 |
92 configure: $(CONFIGURE_64) |
79 configure: $(CONFIGURE_64) |
93 |
80 |
94 build: $(BUILD_64) |
81 build: $(BUILD_64) |
95 |
82 |