summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2015-12-25 12:55:43 +0100
committerJeroen Roovers <jer@gentoo.org>2015-12-25 12:56:00 +0100
commit189c9e43fcd26e41ab4e8958c2d90e55246e159c (patch)
treea592654189a5c19c207d40212a9393b3f0341e7c /net-analyzer
parentsci-mathematics/maxima: linguas_de support (diff)
downloadgentoo-189c9e43fcd26e41ab4e8958c2d90e55246e159c.tar.gz
gentoo-189c9e43fcd26e41ab4e8958c2d90e55246e159c.tar.bz2
gentoo-189c9e43fcd26e41ab4e8958c2d90e55246e159c.zip
net-analyzer/wireshark: Update sse4_2 patch.
Package-Manager: portage-2.2.26
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2.patch20
-rw-r--r--net-analyzer/wireshark/wireshark-99999999.ebuild8
2 files changed, 24 insertions, 4 deletions
diff --git a/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2.patch b/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2.patch
new file mode 100644
index 00000000000..1f80be9f4fa
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2.patch
@@ -0,0 +1,20 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1101,6 +1101,7 @@
+ AC_SUBST(PIE_CFLAGS)
+ AC_SUBST(PIE_LDFLAGS)
+
++AC_ARG_ENABLE(sse4_2,[ --enable-sse4_2 Support SSE4.2 (Streaming SIMD Extensions 4.2) instructions],[
+ WS_CHECKED_CFLAGS_before_simd="$WS_CHECKED_CFLAGS"
+ AC_WIRESHARK_COMPILER_FLAGS_CHECK(-msse4.2, C)
+ if test "x$can_add_to_cflags" = "xyes"
+@@ -1132,6 +1133,9 @@
+ ac_sse4_2_flag=-xarch=sse4_2
+ fi
+ fi
++],[
++AC_MSG_RESULT(no)
++])
+
+ #
+ # All AC_WIRESHARK_COMPILER_FLAGS_CHECK are done, do not call it again!
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 4a25e68d4ed..26e146ccdf2 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -13,8 +13,8 @@ LICENSE="GPL-2"
SLOT="0/${PV}"
KEYWORDS=""
IUSE="
- adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap
- portaudio +qt4 qt5 sbc selinux smi cpu_flags_x86_sse4_2 ssl zlib
+ adns +caps cpu_flags_x86_sse4_2 crypt doc doc-pdf geoip +gtk3 ipv6 kerberos
+ lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi ssl zlib
"
REQUIRED_USE="
ssl? ( crypt )
@@ -97,9 +97,9 @@ src_prepare() {
epatch \
"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
"${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
- "${FILESDIR}"/${PN}-1.99.0.1975-sse4_2.patch \
"${FILESDIR}"/${PN}-99999999-pkgconfig.patch \
- "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
+ "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \
+ "${FILESDIR}"/${PN}-2.1.0-sse4_2.patch
epatch_user