diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
| commit | f1af93971b7490792d8541bc790e0d8c6d787059 (patch) | |
| tree | a38046712bbc3a3844d77452d16c84e716caa3d4 /net-libs/libpcap/files | |
| parent | fc637fb28da700da71ec2064d65ca5a7a31b9c6c (diff) | |
gentoo resync : 06.08.2019
Diffstat (limited to 'net-libs/libpcap/files')
| -rw-r--r-- | net-libs/libpcap/files/libpcap-1.9.0-os.patch (renamed from net-libs/libpcap/files/libpcap-9999-prefix-solaris.patch) | 8 | ||||
| -rw-r--r-- | net-libs/libpcap/files/libpcap-1.9.0-pcap-config-includedir.patch | 36 |
2 files changed, 39 insertions, 5 deletions
diff --git a/net-libs/libpcap/files/libpcap-9999-prefix-solaris.patch b/net-libs/libpcap/files/libpcap-1.9.0-os.patch index 358cb123ff2b..d3ec8014084f 100644 --- a/net-libs/libpcap/files/libpcap-9999-prefix-solaris.patch +++ b/net-libs/libpcap/files/libpcap-1.9.0-os.patch @@ -1,13 +1,11 @@ -Prefix' Solaris uses GNU ld - --- a/aclocal.m4 +++ b/aclocal.m4 @@ -415,7 +415,7 @@ aix*) ;; -- freebsd*|netbsd*|openbsd*|dragonfly*|linux*|osf*|haiku*|midipix*) -+ freebsd*|netbsd*|openbsd*|dragonfly*|linux*|osf*|haiku*|midipix*|solaris*) +- 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 @@ -20,7 +18,7 @@ Prefix' Solaris uses GNU ld case "$host_os" in - freebsd*|openbsd*) -+ freebsd*|solaris*|openbsd*) ++ freebsd*|solaris*|openbsd*|linux*) PIC_OPT=-fPIC ;; esac diff --git a/net-libs/libpcap/files/libpcap-1.9.0-pcap-config-includedir.patch b/net-libs/libpcap/files/libpcap-1.9.0-pcap-config-includedir.patch new file mode 100644 index 000000000000..cd2c9fe61f2f --- /dev/null +++ b/net-libs/libpcap/files/libpcap-1.9.0-pcap-config-includedir.patch @@ -0,0 +1,36 @@ +--- a/pcap-config.in ++++ b/pcap-config.in +@@ -59,13 +59,13 @@ + # + if [ "$show_cflags" = 1 -a "$show_libs" = 1 ] + then +- echo "-I$includedir -L$libdir -lpcap $LIBS" ++ echo "-L$libdir -lpcap $LIBS" + elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ] + then +- echo "-I$includedir -L$libdir $LIBS" ++ echo "-L$libdir $LIBS" + elif [ "$show_cflags" = 1 ] + then +- echo "-I$includedir" ++ echo "" + elif [ "$show_libs" = 1 ] + then + echo "-L$libdir -lpcap $LIBS" +@@ -80,13 +80,13 @@ + # + if [ "$show_cflags" = 1 -a "$show_libs" = 1 ] + then +- echo "-I$includedir -L$libdir $RPATH -l$PACKAGE_NAME" ++ echo "-L$libdir $RPATH -l$PACKAGE_NAME" + elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ] + then +- echo "-I$includedir" ++ echo "" + elif [ "$show_cflags" = 1 ] + then +- echo "-I$includedir" ++ echo "" + elif [ "$show_libs" = 1 ] + then + echo "-L$libdir $RPATH -l$PACKAGE_NAME" |