Branch: Tag:

2005-06-23

2005-06-23 13:20:06 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Use a directory as patch source instead of *.ptar.gz.
This makes the patches easier to verify.

Rev: src/configure.in:1.905

1: - AC_REVISION("$Id: configure.in,v 1.904 2005/06/18 09:38:03 grubba Exp $") + AC_REVISION("$Id: configure.in,v 1.905 2005/06/23 13:20:06 grubba Exp $")   AC_INIT(interpret.c)   AC_CONFIG_HEADER(machine.h)   
458:    #    AC_SYS_COMPILER_FLAG(-q64, q64, CC)    AC_SYS_COMPILER_FLAG(-m64, m64, CC) +  # Sun Studio 10    AC_SYS_COMPILER_FLAG(-xtarget=generic64, xtarget_generic64, CC) -  if test "$pike_cv_option_q64:$pike_cv_option_m64:$pike_cv_option_xtarget_generic64" = "no:no:no"; then +  AC_SYS_COMPILER_FLAG(-xarch=generic64, xarch_generic64, CC) +  if test "$pike_cv_option_q64:$pike_cv_option_m64:$pike_cv_option_xtarget_generic64:$pike_cv_option_xarch_generic64" = "no:no:no:no"; then    AC_SYS_COMPILER_FLAG(-q32, q32, CC)    AC_SYS_COMPILER_FLAG(-m32, m32, CC)    AC_SYS_COMPILER_FLAG(-xtarget=generic32, xtarget_generic32, CC) -  if test "$pike_cv_option_q32:$pike_cv_option_m32:$pike_cv_option_xtarget_generic32" = "no:no:no"; then -  AC_MSG_WARN([Found no option to force 64 bit ABI.]) +  AC_SYS_COMPILER_FLAG(-xarch=generic32, xarch_generic32, CC) +  if test "$pike_cv_option_q32:$pike_cv_option_m32:$pike_cv_option_xtarget_generic32:$pike_cv_option_xarch_generic32" = "no:no:no:no"; then +  PIKE_MSG_WARN([Found no option to force 64 bit ABI.])    else -  AC_MSG_WARN([$CC does not support 64 bit ABI.]) +  PIKE_MSG_WARN([$CC does not support 64 bit ABI.])    with_abi=32    fi    fi
477:    AC_SYS_COMPILER_FLAG(-q32, q32, CC)    AC_SYS_COMPILER_FLAG(-m32, m32, CC)    AC_SYS_COMPILER_FLAG(-xtarget=generic32, xtarget_generic32, CC) -  if test "$pike_cv_option_q32:$pike_cv_option_m32:$pike_cv_option_xtarget_generic32" = "no:no:no"; then +  AC_SYS_COMPILER_FLAG(-xarch=generic32, xarch_generic32, CC) +  if test "$pike_cv_option_q32:$pike_cv_option_m32:$pike_cv_option_xtarget_generic32:$pike_cv_option_xarch_generic64" = "no:no:no:no"; then    AC_SYS_COMPILER_FLAG(-q64, q64, CC)    AC_SYS_COMPILER_FLAG(-m64, m64, CC)    AC_SYS_COMPILER_FLAG(-xtarget=generic64, xtarget_generic64, CC) -  if test "$pike_cv_option_q64:$pike_cv_option_m64:$pike_cv_option_xtarget_generic64" = "no:no:no"; then -  AC_MSG_WARN([Found no option to force 32 bit ABI.]) +  AC_SYS_COMPILER_FLAG(-xarch=generic64, arch_generic64, CC) +  if test "$pike_cv_option_q64:$pike_cv_option_m64:$pike_cv_option_xtarget_generic64:$pike_cv_option_xarch_generic64" = "no:no:no:no"; then +  PIKE_MSG_WARN([Found no option to force 32 bit ABI.])    else -  AC_MSG_WARN([$CC does not support 32 bit ABI.]) +  PIKE_MSG_WARN([$CC does not support 32 bit ABI.])    with_abi=64    fi    fi
1872:    AC_SYS_COMPILER_FLAG(-ftest-coverage, ftest_coverage, CFLAGS)    else :; fi    +  if test "x$with_cdebug" = "xyes" ; then +  AC_SYS_COMPILER_FLAG(-ggdb3,ggdb3,CFLAGS) +  fi +     ##    ## -fomit-frame-pointer does not work with egcs 1.1.1    ## /Hubbe 1998-12-20
2111:   ### Non-gcc thingies. This should probably be enhanced...       +  if test "x$with_cdebug" = "xyes" ; then +  # FIXME: +  # Maybe should remove the -g flag if this succeeds. +  AC_SYS_COMPILER_FLAG(-g3,g3,CFLAGS) +  AC_SYS_COMPILER_FLAG(-trapuv,trapuv,WARN) +  fi +     # Solaris    DO_IF_OS(Solaris,    [
2118:    if test "x$with_abi" = "x64"; then    # -fast implies -xarch=native, which implies 32-bit ABI.    AC_SYS_COMPILER_FLAG(-xtarget=generic64, xtarget_generic64, OPTIMIZE) +  AC_SYS_COMPILER_FLAG(-xarch=generic64, xarch_generic64, OPTIMIZE)    fi    ])    AC_SYS_COMPILER_FLAG(-xdepend,xdepend,OPTIMIZE)
2220:    assume_aligned_objects,OPTIMIZE)    AC_SYS_COMPILER_FLAG(-no_misalign,no_misalign,OPTIMIZE)    -  if test "x$with_cdebug" = "xyes" ; then -  # FIXME: -  # Maybe should remove the -g flag if this succeeds. -  AC_SYS_COMPILER_FLAG(-g3,g3,CFLAGS) -  AC_SYS_COMPILER_FLAG(-trapuv,trapuv,WARN) -  fi +     AC_SYS_COMPILER_FLAG(-host,host,OPTIMIZE)       # Flags that cause errors or change compiler behaviour
2378:    # MinGW system.    cat <<\EOF   #!/bin/sh - # Automatically generated by $Id: configure.in,v 1.904 2005/06/18 09:38:03 grubba Exp $. + # Automatically generated by $Id: configure.in,v 1.905 2005/06/23 13:20:06 grubba Exp $.   # MinGW-version. Do NOT edit.   posix_name="`cat`"   posix_prefix="/"
2416:    # Native POSIX system.    cat <<\EOF   #!/bin/sh - # Automatically generated by $Id: configure.in,v 1.904 2005/06/18 09:38:03 grubba Exp $. + # Automatically generated by $Id: configure.in,v 1.905 2005/06/23 13:20:06 grubba Exp $.   # POSIX-version. Do NOT edit.   cat   EOF
2425:    # rntcl-style    cat <<\EOF   #!/bin/sh - # Automatically generated by $Id: configure.in,v 1.904 2005/06/18 09:38:03 grubba Exp $. + # Automatically generated by $Id: configure.in,v 1.905 2005/06/23 13:20:06 grubba Exp $.   # RNTCL-version. Do NOT edit.   sed -e "$PIKE_PATH_TRANSLATE"   EOF
4236:    nanosleep \    thr_yield \    prctl \ +  sync_instruction_memory \   )      # SunOS 4 realloc() returns NULL when reallocing NULL.
7849:    gzip -cd "$dist_file" | tar xf -    )    fi -  # Use ptar.gz instead of tar.gz to avoid problems with globbing. -  if test -f "${bundle_source_dir}.ptar.gz"; then -  # There's a patch file. +  patch_dir=`echo "${bundle_source_dir}" | sed -e "s@^${pike_bundle_dir}@${pike_bundle_dir}/patches@"` +  if test -d "${patch_dir}/."; then +  # There are patches.    if test -f "${bundle_source_dir}/pike-patch.stamp"; then :; else    echo "Patching bundle $dist_file..." -  ( cd "$pike_bundle_dir" && \ -  gzip -cd "${bundle_source_dir}.ptar.gz" | tar xf - +  ( cd "${patch_dir}" && tar cf - ) | \ +  ( cd "${bundle_source_dir}" && tar xf -)    touch "${bundle_source_dir}/pike-patch.stamp" -  ) +     fi    fi    if test -d "bundles/$bundle.build" || \