| 1 |
commit: a180b5ef646998ef5a52ff1cec1365db512af63b |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jun 3 02:44:29 2019 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 3 02:44:44 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a180b5ef |
| 7 |
|
| 8 |
net-libs/libpcap: Update live ebuild |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.67, Repoman-2.3.13 |
| 11 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
| 12 |
|
| 13 |
.../libpcap/files/libpcap-9999-prefix-darwin.patch | 5 ++-- |
| 14 |
.../files/libpcap-9999-prefix-solaris.patch | 35 ++++++++++++++++++++++ |
| 15 |
net-libs/libpcap/libpcap-9999.ebuild | 4 +-- |
| 16 |
3 files changed, 39 insertions(+), 5 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-libs/libpcap/files/libpcap-9999-prefix-darwin.patch b/net-libs/libpcap/files/libpcap-9999-prefix-darwin.patch |
| 19 |
index 9bcbfe92ee0..5ac34fd4648 100644 |
| 20 |
--- a/net-libs/libpcap/files/libpcap-9999-prefix-darwin.patch |
| 21 |
+++ b/net-libs/libpcap/files/libpcap-9999-prefix-darwin.patch |
| 22 |
@@ -1,13 +1,12 @@ |
| 23 |
Prefix' Darwin systems are single arch, hijack Darwin7 case which assumes this setup |
| 24 |
-Check for bluetooth/mgmt.h before use |
| 25 |
|
| 26 |
--- a/configure.ac |
| 27 |
+++ b/configure.ac |
| 28 |
-@@ -1271,7 +1267,7 @@ |
| 29 |
+@@ -1860,7 +1860,7 @@ |
| 30 |
if test "$enable_universal" != "no"; then |
| 31 |
case "$host_os" in |
| 32 |
|
| 33 |
-- darwin[0-7].*) |
| 34 |
+- darwin[[0-7]].*) |
| 35 |
+ darwin**) |
| 36 |
# |
| 37 |
# Pre-Tiger. Build only for 32-bit PowerPC; no |
| 38 |
|
| 39 |
diff --git a/net-libs/libpcap/files/libpcap-9999-prefix-solaris.patch b/net-libs/libpcap/files/libpcap-9999-prefix-solaris.patch |
| 40 |
new file mode 100644 |
| 41 |
index 00000000000..358cb123ff2 |
| 42 |
--- /dev/null |
| 43 |
+++ b/net-libs/libpcap/files/libpcap-9999-prefix-solaris.patch |
| 44 |
@@ -0,0 +1,35 @@ |
| 45 |
+Prefix' Solaris uses GNU ld |
| 46 |
+ |
| 47 |
+--- a/aclocal.m4 |
| 48 |
++++ b/aclocal.m4 |
| 49 |
+@@ -415,7 +415,7 @@ |
| 50 |
+ aix*) |
| 51 |
+ ;; |
| 52 |
+ |
| 53 |
+- freebsd*|netbsd*|openbsd*|dragonfly*|linux*|osf*|haiku*|midipix*) |
| 54 |
++ freebsd*|netbsd*|openbsd*|dragonfly*|linux*|osf*|haiku*|midipix*|solaris*) |
| 55 |
+ # |
| 56 |
+ # Platforms where the linker is the GNU linker |
| 57 |
+ # or accepts command-line arguments like |
| 58 |
+@@ -429,10 +429,10 @@ |
| 59 |
+ PIC_OPT=-fpic |
| 60 |
+ case "$host_cpu" in |
| 61 |
+ |
| 62 |
+- sparc64*) |
| 63 |
++ sparc64*|sparcv9*) |
| 64 |
+ case "$host_os" in |
| 65 |
+ |
| 66 |
+- freebsd*|openbsd*) |
| 67 |
++ freebsd*|solaris*|openbsd*) |
| 68 |
+ PIC_OPT=-fPIC |
| 69 |
+ ;; |
| 70 |
+ esac |
| 71 |
+@@ -497,7 +497,7 @@ |
| 72 |
+ V_SHLIB_OPT="-G -bnoentry -bexpall" |
| 73 |
+ ;; |
| 74 |
+ |
| 75 |
+- freebsd*|netbsd*|openbsd*|dragonfly*|linux*) |
| 76 |
++ freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*) |
| 77 |
+ # |
| 78 |
+ # "cc" is GCC. |
| 79 |
+ # |
| 80 |
|
| 81 |
diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild |
| 82 |
index ad1d9345153..45652829cdd 100644 |
| 83 |
--- a/net-libs/libpcap/libpcap-9999.ebuild |
| 84 |
+++ b/net-libs/libpcap/libpcap-9999.ebuild |
| 85 |
@@ -1,4 +1,4 @@ |
| 86 |
-# Copyright 1999-2018 Gentoo Foundation |
| 87 |
+# Copyright 1999-2019 Gentoo Authors |
| 88 |
# Distributed under the terms of the GNU General Public License v2 |
| 89 |
|
| 90 |
EAPI=6 |
| 91 |
@@ -30,8 +30,8 @@ DEPEND=" |
| 92 |
" |
| 93 |
|
| 94 |
PATCHES=( |
| 95 |
- "${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch |
| 96 |
"${FILESDIR}"/${PN}-9999-prefix-darwin.patch |
| 97 |
+ "${FILESDIR}"/${PN}-9999-prefix-solaris.patch |
| 98 |
) |
| 99 |
|
| 100 |
src_prepare() { |
Archives