security/mit-krb5/patches/patch-aa

   1 $NetBSD: patch-aa,v 1.3 2011/03/22 23:31:04 tez Exp $
   2
   3 Don't make sunpro warnings into errors (warnings are seen in gcc too)
   4 Add --enable-pkgsrc-libtool option
   5
   6 --- aclocal.m4.orig     2012-05-31 23:49:44.000000000 +0000
   7 +++ aclocal.m4
   8 @@ -611,7 +611,7 @@ else
   9      # works, but it also means that declaration-in-code warnings won't
  10      # be issued.
  11      # -v -fd -errwarn=E_DECLARATION_IN_CODE ...
  12 -    WARN_CFLAGS="-errtags=yes -errwarn=E_BAD_PTR_INT_COMBINATION,E_BAD_PTR_INT_COMB_ARG,E_PTR_TO_VOID_IN_ARITHMETIC,E_NO_IMPLICIT_DECL_ALLOWED,E_ATTRIBUTE_PARAM_UNDEFINED"
  13 +    WARN_CFLAGS="-errtags=yes"
  14      WARN_CXXFLAGS="-errtags=yes +w +w2 -xport64"
  15    fi
  16  fi
  17 @@ -1038,6 +1038,9 @@ AC_SUBST(SHLIBVEXT)
  18  AC_SUBST(SHLIBSEXT)
  19  AC_SUBST(DEPLIBEXT)
  20  AC_SUBST(PFLIBEXT)
  21 +AC_SUBST(LALIBEXT)
  22 +AC_SUBST(LALIB_EXPFLAGS)
  23 +AC_SUBST(LIBTOOL_TAIL)
  24  AC_SUBST(LIBINSTLIST)
  25  AC_SUBST(DYNOBJEXT)
  26  AC_SUBST(MAKE_DYNOBJ_COMMAND)
  27 @@ -1054,6 +1057,7 @@ AC_SUBST(OBJLISTS)
  28  AC_SUBST(STOBJEXT)
  29  AC_SUBST(SHOBJEXT)
  30  AC_SUBST(PFOBJEXT)
  31 +AC_SUBST(LAOBJEXT)
  32  AC_SUBST(PICFLAGS)
  33  AC_SUBST(PROFFLAGS)])
  34
  35 @@ -1168,11 +1172,42 @@ else
  36         KDB5_PLUGIN_DEPLIBS=
  37         KDB5_PLUGIN_LIBS=
  38  fi
  39 +DEPSTLIBEXT=$STLIBEXT
  40 +AC_SUBST(DEPSTLIBEXT)
  41  CC_LINK="$CC_LINK_SHARED"
  42  CXX_LINK="$CXX_LINK_SHARED"
  43
  44 +# Check whether to build libtool archives.
  45 +AC_ARG_ENABLE([pkgsrc-libtool],
  46 +[  --enable-pkgsrc-libtool build libtool archives],
  47 +[
  48 +       case $enableval in
  49 +       /*)     LIBTOOL=$enableval ;;
  50 +       *)      LIBTOOL=libtool ;;
  51 +       esac
  52 +       AC_MSG_RESULT([Enabling libtool archives.])
  53 +       LIBLIST='lib$(LIBBASE)$(LALIBEXT)'
  54 +       LIBLINKS='$(TOPLIBD)/lib$(LIBBASE)$(LALIBEXT)'
  55 +       OBJLISTS=OBJS.LA
  56 +       LIBINSTLIST=install-libtool
  57 +       DEPLIBEXT=$LALIBEXT
  58 +       DEPSTLIBEXT=$LALIBEXT
  59 +       PLUGIN='lib$(LIBBASE)$(LALIBEXT)'
  60 +       PLUGININST=install-libtool
  61 +       CC_LINK="$CC_LINK_LIBTOOL"
  62 +       INSTALL_LIBTOOL='$(LIBTOOL) --mode=install'
  63 +       if test "$krb5_force_static" = yes; then
  64 +               LIBTOOL_TAIL=
  65 +       fi
  66 +], [
  67 +       LIBTOOL=:
  68 +       INSTALL_LIBTOOL=
  69 +])
  70 +AC_SUBST(LIBTOOL)
  71 +AC_SUBST(INSTALL_LIBTOOL)
  72 +
  73  if test -z "$LIBLIST"; then
  74 -       AC_MSG_ERROR([must enable one of shared or static libraries])
  75 +       AC_MSG_ERROR([must enable one of shared, libtool or static libraries])
  76  fi
  77
  78  # Check whether to build profiled libraries.