From c6d065d781058013287482f3547a245ed303bb88 Mon Sep 17 00:00:00 2001 From: rpm-build Date: Aug 25 2020 09:02:44 +0000 Subject: 0002-pcap-config-mitigate-multilib-conflict.patch patch_name: 0002-pcap-config-mitigate-multilib-conflict.patch present_in_specfile: true location_in_specfile: 2 --- diff --git a/pcap-config.in b/pcap-config.in index 54ca42f..6f656d4 100644 --- a/pcap-config.in +++ b/pcap-config.in @@ -11,7 +11,6 @@ prefix="@prefix@" exec_prefix="@exec_prefix@" includedir="@includedir@" -libdir="@libdir@" V_RPATH_OPT="@V_RPATH_OPT@" LIBS="@LIBS@" PACKAGE_NAME="@PACKAGE_NAME@" @@ -41,16 +40,6 @@ do esac shift done -if [ "$V_RPATH_OPT" != "" ] -then - # - # If libdir isn't /usr/lib, add it to the run-time linker path. - # - if [ "$libdir" != "/usr/lib" ] - then - RPATH=$V_RPATH_OPT$libdir - fi -fi if [ "$static" = 1 ] then # @@ -59,16 +48,16 @@ then # if [ "$show_cflags" = 1 -a "$show_libs" = 1 ] then - echo "-I$includedir -L$libdir -lpcap $LIBS" + echo "-lpcap @LIBS@" elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ] then - echo "-I$includedir -L$libdir $LIBS" + echo "@LIBS@" elif [ "$show_cflags" = 1 ] then - echo "-I$includedir" + echo "" elif [ "$show_libs" = 1 ] then - echo "-L$libdir -lpcap $LIBS" + echo "-lpcap @LIBS@" elif [ "$show_additional_libs" = 1 ] then echo "$LIBS" @@ -80,15 +69,15 @@ else # if [ "$show_cflags" = 1 -a "$show_libs" = 1 ] then - echo "-I$includedir -L$libdir $RPATH -l$PACKAGE_NAME" + echo "-lpcap" 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" + echo "-lpcap" fi fi