Loading ...
Sorry, an error occurred while loading the content.

Re: PATCH: vim7 compile fix for Intel Macs

Expand Messages
  • Kaya Bekiroglu
    Let s try that without the attachment, which was mysteriously eaten: Index: src/INSTALLmac.txt
    Message 1 of 2 , Mar 20, 2006
    • 0 Attachment
      Let's try that without the attachment, which was mysteriously eaten:

      Index: src/INSTALLmac.txt
      ===================================================================
      RCS file: /cvsroot/vim/vim7/src/INSTALLmac.txt,v
      retrieving revision 1.4
      diff -u -p -r1.4 INSTALLmac.txt
      --- src/INSTALLmac.txt 1 Mar 2006 22:09:11 -0000 1.4
      +++ src/INSTALLmac.txt 21 Mar 2006 02:13:48 -0000
      @@ -43,7 +43,7 @@ MacOS Classic is no longer supported. I
      To overrule the architecture do this before running make:
      - ./configure --with-mac-arch=intel
      + ./configure --with-mac-arch=i386
      or
      ./configure --with-mac-arch=ppc
      Index: src/configure.in
      ===================================================================
      RCS file: /cvsroot/vim/vim7/src/configure.in,v
      retrieving revision 1.36
      diff -u -p -r1.36 configure.in
      --- src/configure.in 18 Mar 2006 21:36:25 -0000 1.36
      +++ src/configure.in 21 Mar 2006 02:13:51 -0000
      @@ -103,7 +103,7 @@ if test "`(uname) 2>/dev/null`" = Darwin
      fi
      AC_MSG_CHECKING(--with-mac-arch argument)
      - AC_ARG_WITH(mac-arch, [ --with-mac-arch=ARCH intel, ppc or both],
      + AC_ARG_WITH(mac-arch, [ --with-mac-arch=ARCH i386, ppc or both],
      MACARCH="$withval"; AC_MSG_RESULT($MACARCH),
      MACARCH="both"; AC_MSG_RESULT(defaulting to $MACARCH))
      @@ -128,14 +128,14 @@ if test "`(uname) 2>/dev/null`" = Darwin
      CPPFLAGS="$CPPFLAGS -arch i386"
      LDFLAGS="$save_ldflags -arch i386"
      AC_TRY_LINK([ ], [ ],
      - AC_MSG_RESULT(yes); MACARCH="intel",
      + AC_MSG_RESULT(yes); MACARCH="i386",
      AC_MSG_RESULT(no, using PowerPC)
      MACARCH="ppc"
      CPPFLAGS="$save_cppflags -arch ppc"
      LDFLAGS="$save_ldflags -arch ppc"))
      - elif test "x$MACARCH" = "xintel"; then
      - CPPFLAGS="$CPPFLAGS -arch intel"
      - LDFLAGS="$LDFLAGS -arch intel"
      + elif test "x$MACARCH" = "xi386"; then
      + CPPFLAGS="$CPPFLAGS -arch i386"
      + LDFLAGS="$LDFLAGS -arch i386"
      else
      CPPFLAGS="$CPPFLAGS -arch ppc"
      LDFLAGS="$LDFLAGS -arch ppc"
      @@ -172,7 +172,7 @@ if test "`(uname) 2>/dev/null`" = Darwin
      dnl Avoid a bug with -O2 with gcc 4.0. Symptom: malloc() reports
      double
      dnl free. This happens in expand_filename(), because the
      optimizer swaps
      dnl two blocks of code that use "repl" that can't be swapped.
      - if test "$MACARCH" = "intel" -o "$MACARCH" = "both"; then
      + if test "$MACARCH" = "i386" -o "$MACARCH" = "both"; then
      CFLAGS=`echo "$CFLAGS" | sed 's/-O[[23456789]]/-Oz/'`
      fi
      Index: src/auto/configure
      ===================================================================
      RCS file: /cvsroot/vim/vim7/src/auto/configure,v
      retrieving revision 1.34
      diff -u -p -r1.34 configure
      --- src/auto/configure 18 Mar 2006 21:35:42 -0000 1.34
      +++ src/auto/configure 21 Mar 2006 02:14:00 -0000
      @@ -876,7 +876,7 @@ Optional Features:
      Optional Packages:
      --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
      --without-PACKAGE do not use PACKAGE (same as --with-
      PACKAGE=no)
      - --with-mac-arch=ARCH intel, ppc or both
      + --with-mac-arch=ARCH i386, ppc or both
      --with-vim-name=NAME what to call the Vim executable
      --with-ex-name=NAME what to call the Ex executable
      --with-view-name=NAME what to call the View executable
      @@ -2973,7 +2973,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
      echo "$as_me:$LINENO: \$? = $ac_status" >&5
      (exit $ac_status); }; }; then
      echo "$as_me:$LINENO: result: yes" >&5
      -echo "${ECHO_T}yes" >&6; MACARCH="intel"
      +echo "${ECHO_T}yes" >&6; MACARCH="i386"
      else
      echo "$as_me: failed program was:" >&5
      sed 's/^/| /' conftest.$ac_ext >&5
      @@ -2989,9 +2989,9 @@ rm -f conftest.err conftest.$ac_objext \
      fi
      rm -f conftest.err conftest.$ac_objext \
      conftest$ac_exeext conftest.$ac_ext
      - elif test "x$MACARCH" = "xintel"; then
      - CPPFLAGS="$CPPFLAGS -arch intel"
      - LDFLAGS="$LDFLAGS -arch intel"
      + elif test "x$MACARCH" = "xi386"; then
      + CPPFLAGS="$CPPFLAGS -arch i386"
      + LDFLAGS="$LDFLAGS -arch i386"
      else
      CPPFLAGS="$CPPFLAGS -arch ppc"
      LDFLAGS="$LDFLAGS -arch ppc"
      @@ -3399,7 +3399,7 @@ fi
      fi
      fi
      - if test "$MACARCH" = "intel" -o "$MACARCH" = "both"; then
      + if test "$MACARCH" = "i386" -o "$MACARCH" = "both"; then
      CFLAGS=`echo "$CFLAGS" | sed 's/-O[23456789]/-Oz/'`
      fi
    Your message has been successfully submitted and would be delivered to recipients shortly.