net/updatedd/patches/004-fix_liberty_dep.patch

   1 diff -Nur updatedd-2.6/config.h.in updatedd-2.6.lx2/config.h.in
   2 --- updatedd-2.6/config.h.in    2006-09-15 18:19:37.000000000 +0400
   3 +++ updatedd-2.6.lx2/config.h.in        2009-11-25 11:00:14.000000000 +0300
   4 @@ -36,9 +36,6 @@
   5  /* Define to 1 if you have the `dl' library (-ldl). */
   6  #undef HAVE_LIBDL
   7
   8 -/* Define to 1 if you have the `iberty' library (-liberty). */
   9 -#undef HAVE_LIBIBERTY
  10 -
  11  /* Define to 1 if you have the `nsl' library (-lnsl). */
  12  #undef HAVE_LIBNSL
  13
  14 diff -Nur updatedd-2.6/configure updatedd-2.6.lx2/configure
  15 --- updatedd-2.6/configure      2006-09-15 18:19:10.000000000 +0400
  16 +++ updatedd-2.6.lx2/configure  2009-11-25 11:02:02.000000000 +0300
  17 @@ -20596,93 +20596,6 @@
  18  fi
  19
  20
  21 -{ echo "$as_me:$LINENO: checking for vasprintf in -liberty" >&5
  22 -echo $ECHO_N "checking for vasprintf in -liberty... $ECHO_C" >&6; }
  23 -if test "${ac_cv_lib_iberty_vasprintf+set}" = set; then
  24 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  25 -else
  26 -  ac_check_lib_save_LIBS=$LIBS
  27 -LIBS="-liberty  $LIBS"
  28 -cat >conftest.$ac_ext <<_ACEOF
  29 -/* confdefs.h.  */
  30 -_ACEOF
  31 -cat confdefs.h >>conftest.$ac_ext
  32 -cat >>conftest.$ac_ext <<_ACEOF
  33 -/* end confdefs.h.  */
  34 -
  35 -/* Override any GCC internal prototype to avoid an error.
  36 -   Use char because int might match the return type of a GCC
  37 -   builtin and then its argument prototype would still apply.  */
  38 -#ifdef __cplusplus
  39 -extern "C"
  40 -#endif
  41 -char vasprintf ();
  42 -int
  43 -main ()
  44 -{
  45 -return vasprintf ();
  46 -  ;
  47 -  return 0;
  48 -}
  49 -_ACEOF
  50 -rm -f conftest.$ac_objext conftest$ac_exeext
  51 -if { (ac_try="$ac_link"
  52 -case "(($ac_try" in
  53 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  54 -  *) ac_try_echo=$ac_try;;
  55 -esac
  56 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  57 -  (eval "$ac_link") 2>conftest.er1
  58 -  ac_status=$?
  59 -  grep -v '^ *+' conftest.er1 >conftest.err
  60 -  rm -f conftest.er1
  61 -  cat conftest.err >&5
  62 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  63 -  (exit $ac_status); } &&
  64 -        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
  65 -  { (case "(($ac_try" in
  66 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  67 -  *) ac_try_echo=$ac_try;;
  68 -esac
  69 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  70 -  (eval "$ac_try") 2>&5
  71 -  ac_status=$?
  72 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  73 -  (exit $ac_status); }; } &&
  74 -        { ac_try='test -s conftest$ac_exeext'
  75 -  { (case "(($ac_try" in
  76 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  77 -  *) ac_try_echo=$ac_try;;
  78 -esac
  79 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  80 -  (eval "$ac_try") 2>&5
  81 -  ac_status=$?
  82 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  83 -  (exit $ac_status); }; }; then
  84 -  ac_cv_lib_iberty_vasprintf=yes
  85 -else
  86 -  echo "$as_me: failed program was:" >&5
  87 -sed 's/^/| /' conftest.$ac_ext >&5
  88 -
  89 -       ac_cv_lib_iberty_vasprintf=no
  90 -fi
  91 -
  92 -rm -f core conftest.err conftest.$ac_objext \
  93 -      conftest$ac_exeext conftest.$ac_ext
  94 -LIBS=$ac_check_lib_save_LIBS
  95 -fi
  96 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_iberty_vasprintf" >&5
  97 -echo "${ECHO_T}$ac_cv_lib_iberty_vasprintf" >&6; }
  98 -if test $ac_cv_lib_iberty_vasprintf = yes; then
  99 -  cat >>confdefs.h <<_ACEOF
 100 -#define HAVE_LIBIBERTY 1
 101 -_ACEOF
 102 -
 103 -  LIBS="-liberty $LIBS"
 104 -
 105 -fi
 106 -
 107 -
 108  # ------------------] GETOPT_LONG [
 109
 110
 111 diff -Nur updatedd-2.6/configure.ac updatedd-2.6.lx2/configure.ac
 112 --- updatedd-2.6/configure.ac   2006-09-15 18:18:44.000000000 +0400
 113 +++ updatedd-2.6.lx2/configure.ac       2009-11-25 11:00:33.000000000 +0300
 114 @@ -74,8 +74,6 @@
 115  AC_CHECK_LIB([c], [dlopen])
 116  dnl Linux distributes dlopen() in libdl.
 117  AC_CHECK_LIB([dl], [dlopen])
 118 -dnl Tru64 distributes vasprintf() in -liberty
 119 -AC_CHECK_LIB([iberty], [vasprintf])
 120
 121  # ------------------] GETOPT_LONG [
 122