wireshark: enable x86_64.

This commit is contained in:
Jerome Duval
2017-01-24 20:53:24 +01:00
parent b90293044a
commit 0aaab32e19
2 changed files with 36 additions and 15 deletions

View File

@@ -0,0 +1,22 @@
From 18b6cf8a0bdab1dc663d2df00eb1fdccd80663b6 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 24 Jan 2017 20:21:08 +0100
Subject: use data/aclocal
diff --git a/aclocal-flags b/aclocal-flags
index 49af718..62508e5 100755
--- a/aclocal-flags
+++ b/aclocal-flags
@@ -107,7 +107,7 @@ if [ -z "$glib_prefix" ]
then
glib_aclocal_dir=""
else
- glib_aclocal_dir=$glib_prefix/share/aclocal
+ glib_aclocal_dir=$glib_prefix/data/aclocal
fi
#
--
2.10.2

View File

@@ -10,16 +10,17 @@ code as Wireshark, and with editcap, which is a program to read capture \
files and write the packets from that capture file, possibly in a \
different capture file format, and with some packets possibly removed \
from the capture."
HOMEPAGE="http://www.wireshark.org"
SOURCE_URI="https://github.com/wireshark/wireshark/archive/wireshark-$portVersion.tar.gz"
SOURCE_DIR="wireshark-wireshark-$portVersion"
CHECKSUM_SHA256="5e01962638b7ecfce30d3970c909b9dcac4ef4299cdcd77a2bba0ebb85ef94e6"
ADDITIONAL_FILES="wireshark.rdef"
LICENSE="GNU GPL v2"
COPYRIGHT="1998-2015 Gerald Combs"
REVISION="1"
HOMEPAGE="http://www.wireshark.org"
REVISION="2"
SOURCE_URI="https://github.com/wireshark/wireshark/archive/wireshark-$portVersion.tar.gz"
CHECKSUM_SHA256="5e01962638b7ecfce30d3970c909b9dcac4ef4299cdcd77a2bba0ebb85ef94e6"
SOURCE_DIR="wireshark-wireshark-$portVersion"
PATCHES="wireshark-$portVersion.patchset"
ADDITIONAL_FILES="wireshark.rdef"
ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
@@ -42,12 +43,13 @@ PROVIDES="
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libgcrypt$secondaryArchSuffix
lib:libgpg_error$secondaryArchSuffix
lib:libglib_2.0${secondaryArchSuffix}
lib:libqt5$secondaryArchSuffix
lib:libz$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
lib:libintl$secondaryArchSuffix
# lib:libpcap$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
@@ -74,13 +76,10 @@ BUILD_PREREQUIRES="
BUILD()
{
libtoolize --force --copy --install
aclocal
autoheader
automake --add-missing
autoconf
LIBS=-lnetwork runConfigure ./configure --without-gtk3 --with-pcap=no
make
autoreconf -fi
LIBS=-lnetwork CXXFLAGS=-fPIC runConfigure ./configure \
--without-gtk3 --with-pcap=no
make $jobArgs
}
INSTALL()