jer 14/07/22 11:11:55
Added: libpcap-1.6.1-configure.patch
libpcap-1.6.1-prefix-solaris.patch
Log:
Check for bluetooth/mgmt.h (net-wireless/bluez-4) before use (bug #517772).
Convert sed scripts to patches.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
A792A613)
Revision Changes Path
1.1 net-libs/libpcap/files/libpcap-1.6.1-configure.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libpcap/files/libpcap-1.6.1-configure.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libpcap/files/libpcap-1.6.1-configure.patch?rev=1.1&content-type=text/plain
Index: libpcap-1.6.1-configure.patch
===================================================================
Prefix' Darwin systems are single arch, hijack Darwin7 case which assumes this
setup
Check for bluetooth/mgmt.h before use
--- a/configure.in
+++ b/configure.in
@@ -1117,7 +1117,7 @@
if test "$enable_universal" != "no"; then
case "$host_os" in
- darwin[0-7].*)
+ darwin**)
#
# Pre-Tiger. Build only for 32-bit PowerPC; no
# need for any special compiler or linker flags.
@@ -1508,7 +1508,11 @@
if test $ac_cv_lbl_hci_channel_monitor_is_defined = yes ;
then
AC_DEFINE(PCAP_SUPPORT_BT_MONITOR,,
[target host supports Bluetooth Monitor])
- BT_MONITOR_SRC=pcap-bt-monitor-linux.c
+ AC_CHECK_HEADER([bluetooth/mgmt.h],
+ BT_MONITOR_SRC=pcap-bt-monitor-linux.c,
+ AC_MSG_WARN([no support for pcap bt monitor]),
+ [#include <bluetooth/bluetooth.h>
+ #include <bluetooth/hci.h>])
fi
fi
ac_lbl_bluetooth_available=yes
1.1 net-libs/libpcap/files/libpcap-1.6.1-prefix-solaris.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libpcap/files/libpcap-1.6.1-prefix-solaris.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libpcap/files/libpcap-1.6.1-prefix-solaris.patch?rev=1.1&content-type=text/plain
Index: libpcap-1.6.1-prefix-solaris.patch
===================================================================
Prefix' Solaris uses GNU ld
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -415,7 +415,7 @@
aix*)
;;
- freebsd*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
+ freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
#
# Platforms where the linker is the GNU linker
# or accepts command-line arguments like
@@ -429,10 +429,10 @@
PIC_OPT=-fpic
case "$host_cpu" in
- sparc64*)
+ sparc64*|sparcv9*)
case "$host_os" in
- freebsd*|openbsd*)
+ freebsd*|solaris*|openbsd*)
PIC_OPT=-fPIC
;;
esac
@@ -497,7 +497,7 @@
V_SHLIB_OPT="-G -bnoentry -bexpall"
;;
- freebsd*|netbsd*|openbsd*|dragonfly*|linux*)
+ freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*)
#
# "cc" is GCC.
#
