|
 |
6a9a48 |
From 5b80ca39b1f01177e98c78bbc622dfda6f7a7e71 Mon Sep 17 00:00:00 2001
|
|
|
6a9a48 |
From: Michal Sekletar <msekleta@redhat.com>
|
|
|
6a9a48 |
Date: Mon, 29 Sep 2014 08:27:15 +0200
|
|
|
6a9a48 |
Subject: [PATCH 2/4] pcap-config: mitigate multilib conflict
|
|
|
6a9a48 |
|
|
|
6a9a48 |
libdir path is different on 64bit and 32bit arches. Hence when installing both
|
|
|
6a9a48 |
multilib versions on the system yum complains about conflicting pcap-config
|
|
|
6a9a48 |
file.
|
|
|
6a9a48 |
|
|
|
6a9a48 |
Hence remove libdir references from pcap-config, libdir is in dynamic linker
|
|
|
6a9a48 |
path anyway.
|
|
|
6a9a48 |
---
|
|
|
6a9a48 |
pcap-config.in | 27 ++++++++-------------------
|
|
|
6a9a48 |
1 file changed, 8 insertions(+), 19 deletions(-)
|
|
|
6a9a48 |
|
|
|
6a9a48 |
diff --git a/pcap-config.in b/pcap-config.in
|
|
|
6a9a48 |
index 206be3b..75f2c9f 100644
|
|
|
6a9a48 |
--- a/pcap-config.in
|
|
|
6a9a48 |
+++ b/pcap-config.in
|
|
|
6a9a48 |
@@ -7,7 +7,6 @@
|
|
|
6a9a48 |
prefix="@prefix@"
|
|
|
6a9a48 |
exec_prefix="@exec_prefix@"
|
|
|
6a9a48 |
includedir="@includedir@"
|
|
|
6a9a48 |
-libdir="@libdir@"
|
|
|
6a9a48 |
V_RPATH_OPT="@V_RPATH_OPT@"
|
|
|
6a9a48 |
LIBS="@LIBS@"
|
|
|
6a9a48 |
PACKAGE_NAME="@PACKAGE_NAME@"
|
|
|
6a9a48 |
@@ -36,16 +35,6 @@ do
|
|
|
6a9a48 |
esac
|
|
|
6a9a48 |
shift
|
|
|
6a9a48 |
done
|
|
|
6a9a48 |
-if [ "$V_RPATH_OPT" != "" ]
|
|
|
6a9a48 |
-then
|
|
|
6a9a48 |
- #
|
|
|
6a9a48 |
- # If libdir isn't /usr/lib, add it to the run-time linker path.
|
|
|
6a9a48 |
- #
|
|
|
6a9a48 |
- if [ "$libdir" != "/usr/lib" ]
|
|
|
6a9a48 |
- then
|
|
|
6a9a48 |
- RPATH=$V_RPATH_OPT$libdir
|
|
|
6a9a48 |
- fi
|
|
|
6a9a48 |
-fi
|
|
|
6a9a48 |
if [ "$static" = 1 ]
|
|
|
6a9a48 |
then
|
|
|
6a9a48 |
#
|
|
|
6a9a48 |
@@ -54,16 +43,16 @@ then
|
|
|
6a9a48 |
#
|
|
|
6a9a48 |
if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
|
|
|
6a9a48 |
then
|
|
|
6a9a48 |
- echo "-I$includedir -L$libdir -lpcap $LIBS"
|
|
|
6a9a48 |
+ echo "-lpcap @LIBS@"
|
|
|
6a9a48 |
elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
|
|
|
6a9a48 |
then
|
|
|
6a9a48 |
- echo "-I$includedir -L$libdir $LIBS"
|
|
|
6a9a48 |
+ echo "@LIBS@"
|
|
|
6a9a48 |
elif [ "$show_cflags" = 1 ]
|
|
|
6a9a48 |
then
|
|
|
6a9a48 |
- echo "-I$includedir"
|
|
|
6a9a48 |
+ echo ""
|
|
|
6a9a48 |
elif [ "$show_libs" = 1 ]
|
|
|
6a9a48 |
then
|
|
|
6a9a48 |
- echo "-L$libdir -lpcap $LIBS"
|
|
|
6a9a48 |
+ echo "-lpcap @LIBS@"
|
|
|
6a9a48 |
elif [ "$show_additional_libs" = 1 ]
|
|
|
6a9a48 |
then
|
|
|
6a9a48 |
echo "$LIBS"
|
|
|
6a9a48 |
@@ -75,15 +64,15 @@ else
|
|
|
6a9a48 |
#
|
|
|
6a9a48 |
if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
|
|
|
6a9a48 |
then
|
|
|
6a9a48 |
- echo "-I$includedir -L$libdir $RPATH -l$PACKAGE_NAME"
|
|
|
6a9a48 |
+ echo "-lpcap"
|
|
|
6a9a48 |
elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
|
|
|
6a9a48 |
then
|
|
|
6a9a48 |
- echo "-I$includedir"
|
|
|
6a9a48 |
+ echo ""
|
|
|
6a9a48 |
elif [ "$show_cflags" = 1 ]
|
|
|
6a9a48 |
then
|
|
|
6a9a48 |
- echo "-I$includedir"
|
|
|
6a9a48 |
+ echo ""
|
|
|
6a9a48 |
elif [ "$show_libs" = 1 ]
|
|
|
6a9a48 |
then
|
|
|
6a9a48 |
- echo "-L$libdir $RPATH -l$PACKAGE_NAME"
|
|
|
6a9a48 |
+ echo "-lpcap"
|
|
|
6a9a48 |
fi
|
|
|
6a9a48 |
fi
|
|
|
6a9a48 |
--
|
|
|
6a9a48 |
1.8.3.1
|
|
|
6a9a48 |
|