Diff for /embedaddon/dnsmasq/bld/pkg-wrapper between versions 1.1.1.2 and 1.1.1.4

version 1.1.1.2, 2014/06/15 16:31:38 version 1.1.1.4, 2021/03/17 00:56:46
Line 1 Line 1
 #!/bin/sh  #!/bin/sh
   
 search=$1  
 shift  
 pkg=$1  
 shift  
 op=$1  
 shift  
   
 in=`cat`  in=`cat`
   
if grep "^\#[[:space:]]*define[[:space:]]*$search" config.h >/dev/null 2>&1 || \search()
    echo $in | grep $search >/dev/null 2>&1; then{
     grep "^\#[[:space:]]*define[[:space:]]*$1" config.h >/dev/null 2>&1 || \
     echo $in | grep $1 >/dev/null 2>&1
 }
   
   while [ "$#" -gt 0 ]; do
       search=$1
       pkg=$2
       op=$3
       lib=$4
       shift 4
   if search "$search"; then
   
   # Nasty, nasty, in --copy, arg 2 (if non-empty) is another config to search for, used with NO_GMP
     if [ $op = "--copy" ]; then      if [ $op = "--copy" ]; then
        pkg="$*"        if [ -z "$pkg" ]; then
    elif grep "^\#[[:space:]]*define[[:space:]]*${search}_STATIC" config.h >/dev/null 2>&1 || \            pkg="$lib"
              echo $in | grep ${search}_STATIC >/dev/null 2>&1; then        elif search "$pkg"; then
        pkg=`$pkg  --static $op $*`            pkg=""
         else 
             pkg="$lib"
         fi
     elif search "${search}_STATIC"; then
         pkg=`$pkg  --static $op $lib`
     else      else
        pkg=`$pkg $op $*`        pkg=`$pkg $op $lib`
     fi      fi
    
    if grep "^\#[[:space:]]*define[[:space:]]*${search}_STATIC" config.h >/dev/null 2>&1 || \    if search "${search}_STATIC"; then
        echo $in | grep ${search}_STATIC >/dev/null 2>&1; then 
         if [ $op = "--libs" ] || [ $op = "--copy" ]; then          if [ $op = "--libs" ] || [ $op = "--copy" ]; then
             echo "-Wl,-Bstatic $pkg -Wl,-Bdynamic"              echo "-Wl,-Bstatic $pkg -Wl,-Bdynamic"
         else          else
Line 33  if grep "^\#[[:space:]]*define[[:space:]]*$search" con Line 42  if grep "^\#[[:space:]]*define[[:space:]]*$search" con
     fi      fi
 fi  fi
   
   done

Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.4


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>