[BACK]Return to mkpkg CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / sudo

Diff for /embedaddon/sudo/mkpkg between versions 1.1.1.4 and 1.1.1.5

version 1.1.1.4, 2013/07/22 10:46:11 version 1.1.1.5, 2013/10/14 07:56:33
Line 226  case "$osversion" in Line 226  case "$osversion" in
         esac          esac
         if test "${osversion}" != "`$top_srcdir/pp --probe`"; then          if test "${osversion}" != "`$top_srcdir/pp --probe`"; then
             sdkvers=`echo "${osversion}" | sed 's/^macos\([0-9][0-9]\)\([0-9]*\)-.*$/\1.\2/'`              sdkvers=`echo "${osversion}" | sed 's/^macos\([0-9][0-9]\)\([0-9]*\)-.*$/\1.\2/'`
            SDK_FLAGS="-isysroot /Developer/SDKs/MacOSX${sdkvers}.sdk -mmacosx-version-min=${sdkvers}"            # Newer Xcode puts /Developer under the app Contents dir.
             SDK_DIR="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs"
             if test -d "${SDK_DIR}/MacOSX${sdkvers}.sdk"; then
                 SDK_DIR="${SDK_DIR}/MacOSX${sdkvers}.sdk"
             elif test -d "/Developer/SDKs/MacOSX${sdkvers}.sdk"; then
                 SDK_DIR="/Developer/SDKs/MacOSX${sdkvers}.sdk"
             fi
             SDK_FLAGS="-isysroot ${SDK_DIR} -mmacosx-version-min=${sdkvers}"
         fi          fi
         export CFLAGS="-O2 -g $ARCH_FLAGS $SDK_FLAGS"          export CFLAGS="-O2 -g $ARCH_FLAGS $SDK_FLAGS"
         export LDFLAGS="$ARCH_FLAGS $SDK_FLAGS"          export LDFLAGS="$ARCH_FLAGS $SDK_FLAGS"
         # Note, must indent with tabs, not spaces due to IFS trickery          # Note, must indent with tabs, not spaces due to IFS trickery
         configure_opts="--with-pam          configure_opts="--with-pam
                   --with-bsm-audit
                 --without-tty-tickets                  --without-tty-tickets
                 --enable-zlib=system                  --enable-zlib=system
                 --with-ldap                  --with-ldap
Line 243  case "$osversion" in Line 251  case "$osversion" in
                 $configure_opts"                  $configure_opts"
         ;;          ;;
     aix*)      aix*)
           # Use -gxcoff with gcc instead of -g for dbx-style debugging symbols.
           if test -z "$CC" && gcc -v >/dev/null 2>&1; then
               CFLAGS=-gxcoff; export CFLAGS
           fi
         # Note, must indent with tabs, not spaces due to IFS trickery          # Note, must indent with tabs, not spaces due to IFS trickery
         # Note: we include our own zlib instead of relying on the          # Note: we include our own zlib instead of relying on the
         #       AIX freeware version being installed.          #       AIX freeware version being installed.
Line 264  case "$osversion" in Line 276  case "$osversion" in
         # For Solaris, add project support and use let configure choose zlib.          # For Solaris, add project support and use let configure choose zlib.
         # For all others, use the builtin zlib and disable NLS support.          # For all others, use the builtin zlib and disable NLS support.
         case "$osversion" in          case "$osversion" in
            sol*) configure_opts="${configure_opts}${configure_opts+$tab}--with-project";;            sol*)
            *) configure_opts="${configure_opts}${configure_opts+$tab}--enable-zlib=builtin${tab}--disable-nls";;                configure_opts="${configure_opts}${configure_opts+$tab}--with-project"
 
                 if [ $osrelease -ge 11 ]; then
                     configure_opts="${configure_opts}${configure_opts+$tab}--with-bsm-audit"
                 fi
                 ;;
             *)
                 configure_opts="${configure_opts}${configure_opts+$tab}--enable-zlib=builtin${tab}--disable-nls"
                 ;;
         esac          esac
         if test "$flavor" = "ldap"; then          if test "$flavor" = "ldap"; then
             configure_opts="${configure_opts}${configure_opts+$tab}--with-ldap"              configure_opts="${configure_opts}${configure_opts+$tab}--with-ldap"
Removed from v.1.1.1.4  
changed lines
  Added in v.1.1.1.5

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