From 9c9a490570f37c3d94d5be172939458984d65843 Mon Sep 17 00:00:00 2001 From: MORIOKA Tomohiko Date: Mon, 19 May 2014 03:20:36 +0900 Subject: [PATCH] - Use `gcc' instead of `apple-gcc42'. (IMAKECPP): Use ${brew_prefix}. (installing canna): Use "chise/misc" instead of "chise/cjkv". (CC): Use `${brew_prefix}/bin/gcc' instead of `gcc-4.2'. --- bootstrap.homebrew | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/bootstrap.homebrew b/bootstrap.homebrew index 2ca3586..041fc8e 100755 --- a/bootstrap.homebrew +++ b/bootstrap.homebrew @@ -3,10 +3,14 @@ brew update brew upgrade +brew_prefix=`brew --prefix` + #brew install https://raw.github.com/Homebrew/homebrew-dupes/master/gcc.rb \ # --use-llvm -brew install apple-gcc42 -export IMAKECPP=/usr/local/bin/cpp-4.2 +#brew install apple-gcc42 +#export IMAKECPP=/usr/local/bin/cpp-4.2 +brew install gcc +export IMAKECPP=${brew_prefix}/bin/cpp brew -v install libtiff brew -v install openjpeg @@ -14,8 +18,6 @@ brew -v install berkeley-db brew -v install xaw3d brew -v install gettext -brew_prefix=`brew --prefix` - if [ -f /Library/LaunchDaemons/homebrew.mxcl.canna.plist ] then sudo launchctl unload -w /Library/LaunchDaemons/homebrew.mxcl.canna.plist @@ -25,15 +27,8 @@ then sudo ${brew_prefix}/sbin/cannakill fi -#(cd ${brew_prefix}; git pull https://github.com/chise/homebrew/) - -#brew -v install canna -#brew upgrade - -brew tap chise/cjkv -( cd /usr/local/Library/Taps/chise-cjkv ; \ - git remote set-url origin git@github.com:chise/homebrew-cjkv.git) -brew -v install /usr/local/Library/Taps/chise-cjkv/Library/Formula/canna.rb +brew tap chise/misc +brew -v install canna sudo sh -c "sed 's/rc\.canna/rc.canna-root/' \ @@ -45,7 +40,7 @@ sudo launchctl load -w /Library/LaunchDaemons/homebrew.mxcl.canna.plist brew -v install wget -CC=gcc-4.2 ./configure \ +CC=${brew_prefix}/bin/gcc ./configure \ --with-site-includes=/usr/X11/include \ --with-site-libraries=/usr/X11/lib \ --with-canna -- 1.7.10.4