/[packages]/updates/8/libpcap/current/SOURCES/libpcap-multilib.patch
ViewVC logotype

Diff of /updates/8/libpcap/current/SOURCES/libpcap-multilib.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1930599 by umeabot, Wed Feb 24 21:28:17 2021 UTC revision 1930600 by ns80, Fri Jan 6 09:54:43 2023 UTC
# Line 1  Line 1 
1  diff -Nru a/pcap-config.in b/pcap-config.in  --- libpcap-1.10.2/pcap-config.in.orig  2023-01-03 13:08:17.213734355 -0500
2  --- a/pcap-config.in    2018-06-24 19:54:20.000000000 +0200  +++ libpcap-1.10.2/pcap-config.in       2023-01-03 13:10:51.125222216 -0500
3  +++ b/pcap-config.in    2018-08-16 07:10:09.254672902 +0200  @@ -111,16 +111,16 @@ then
 @@ -41,16 +41,6 @@  
         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 +49,16 @@  
4          #          #
5          if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]          if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
6          then          then
7  -               echo "-I$includedir -L$libdir -lpcap $LIBS"  -               echo "-I$includedir $LPATH -l@PACKAGE_NAME@ $LIBS"
8  +               echo "-lpcap @LIBS@"  +               echo "-l@PACKAGE_NAME@ $LIBS"
9          elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]          elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
10          then          then
11  -               echo "-I$includedir -L$libdir $LIBS"  -               echo "-I$includedir $LPATH $LIBS"
12  +               echo "@LIBS@"  +               echo "$LIBS"
13          elif [ "$show_cflags" = 1 ]          elif [ "$show_cflags" = 1 ]
14          then          then
15  -               echo "-I$includedir"  -               echo "-I$includedir"
16  +               echo ""  +               echo ""
17          elif [ "$show_libs" = 1 ]          elif [ "$show_libs" = 1 ]
18          then          then
19  -               echo "-L$libdir -lpcap $LIBS"  -               echo "$LPATH -l@PACKAGE_NAME@ $LIBS"
20  +               echo "-lpcap @LIBS@"  +               echo "-l@PACKAGE_NAME@ $LIBS"
21          elif [ "$show_additional_libs" = 1 ]          elif [ "$show_additional_libs" = 1 ]
22          then          then
23                  echo "$LIBS"                  echo "$LIBS"
24  @@ -80,15 +70,15 @@  @@ -138,15 +138,15 @@ else
25          #          #
26          if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]          if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
27          then          then
28  -               echo "-I$includedir -L$libdir $RPATH -l$PACKAGE_NAME"  -               echo "-I$includedir $LPATH @RPATH@ -l@PACKAGE_NAME@"
29  +               echo "-lpcap"  +               echo "-l@PACKAGE_NAME@"
30          elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]          elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
31          then          then
32  -               echo "-I$includedir"  -               echo "-I$includedir"
# Line 55  diff -Nru a/pcap-config.in b/pcap-config Line 37  diff -Nru a/pcap-config.in b/pcap-config
37  +               echo ""  +               echo ""
38          elif [ "$show_libs" = 1 ]          elif [ "$show_libs" = 1 ]
39          then          then
40  -               echo "-L$libdir $RPATH -l$PACKAGE_NAME"  -               echo "$LPATH @RPATH@ -l@PACKAGE_NAME@"
41  +               echo "-lpcap"  +               echo "-l@PACKAGE_NAME@"
42          fi          fi
43   fi   fi
Legend:
Removed from v.1930599  
changed lines
  Added in v.1930600
  ViewVC Help
Powered by ViewVC 1.1.30