Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libpcap/, net-libs/libpcap/files/
Date: Fri, 30 Aug 2019 17:29:32
Message-Id: 1567186168.4f9ec75b4ecdcfa44e9b242d5feab6975df42912.jer@gentoo
1 commit: 4f9ec75b4ecdcfa44e9b242d5feab6975df42912
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 30 17:27:25 2019 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 30 17:29:28 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f9ec75b
7
8 net-libs/libpcap: Fix compiling on sparc64-linux-*
9
10 Package-Manager: Portage-2.3.73, Repoman-2.3.17
11 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
12
13 net-libs/libpcap/files/libpcap-1.9.0-os.patch | 33 +++++++++++++++++++++++++++
14 net-libs/libpcap/libpcap-1.9.0-r1.ebuild | 2 +-
15 2 files changed, 34 insertions(+), 1 deletion(-)
16
17 diff --git a/net-libs/libpcap/files/libpcap-1.9.0-os.patch b/net-libs/libpcap/files/libpcap-1.9.0-os.patch
18 new file mode 100644
19 index 00000000000..d3ec8014084
20 --- /dev/null
21 +++ b/net-libs/libpcap/files/libpcap-1.9.0-os.patch
22 @@ -0,0 +1,33 @@
23 +--- a/aclocal.m4
24 ++++ b/aclocal.m4
25 +@@ -415,7 +415,7 @@
26 + aix*)
27 + ;;
28 +
29 +- freebsd*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
30 ++ freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
31 + #
32 + # Platforms where the linker is the GNU linker
33 + # or accepts command-line arguments like
34 +@@ -429,10 +429,10 @@
35 + PIC_OPT=-fpic
36 + case "$host_cpu" in
37 +
38 +- sparc64*)
39 ++ sparc64*|sparcv9*)
40 + case "$host_os" in
41 +
42 +- freebsd*|openbsd*)
43 ++ freebsd*|solaris*|openbsd*|linux*)
44 + PIC_OPT=-fPIC
45 + ;;
46 + esac
47 +@@ -497,7 +497,7 @@
48 + V_SHLIB_OPT="-G -bnoentry -bexpall"
49 + ;;
50 +
51 +- freebsd*|netbsd*|openbsd*|dragonfly*|linux*)
52 ++ freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*)
53 + #
54 + # "cc" is GCC.
55 + #
56
57 diff --git a/net-libs/libpcap/libpcap-1.9.0-r1.ebuild b/net-libs/libpcap/libpcap-1.9.0-r1.ebuild
58 index 4d5a0121e31..38b37dbc6db 100644
59 --- a/net-libs/libpcap/libpcap-1.9.0-r1.ebuild
60 +++ b/net-libs/libpcap/libpcap-1.9.0-r1.ebuild
61 @@ -33,10 +33,10 @@ DEPEND="
62 S=${WORKDIR}/${PN}-${P/_}
63
64 PATCHES=(
65 - "${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch
66 "${FILESDIR}"/${PN}-1.8.1-darwin.patch
67 "${FILESDIR}"/${PN}-1.8.1-usbmon.patch
68 "${FILESDIR}"/${PN}-1.9.0-pcap-config-includedir.patch
69 + "${FILESDIR}"/${PN}-1.9.0-os.patch
70 )
71
72 src_prepare() {