From a02be9eea204264ce48827ac365c8b53b986d66a Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 15 Jul 2016 19:03:45 +0100 Subject: ENV: move to new paths. (#507) Move some stuff formerly in `Library/ENV` around: - Move `Library/ENV/$XCODE_VERSION` to `Library/Homebrew/env/super` as they are all superenv wrappers and all symlinks to the same version. We never needed the "separate shims for separate versions" functionality and it just adds confusion. - Move `Library/ENV/pkgconfig` to `Library/Homebrew/env/pkgconfig` to get more things under `Library/Homebrew` - Move `Library/ENV/scm` to `Library/scm` as these wrappers are not actually used by or related to superenv (or stdenv) in any way.--- Library/ENV/3.2.6 | 1 - Library/ENV/4.2 | 1 - Library/ENV/4.3/ant | 5 - Library/ENV/4.3/apr-1-config | 15 - Library/ENV/4.3/bsdmake | 3 - Library/ENV/4.3/c++ | 1 - Library/ENV/4.3/c89 | 1 - Library/ENV/4.3/c99 | 1 - Library/ENV/4.3/cc | 364 --------------------- Library/ENV/4.3/clang | 1 - Library/ENV/4.3/clang++ | 1 - Library/ENV/4.3/cpp | 1 - Library/ENV/4.3/g++ | 1 - Library/ENV/4.3/g++-4.2 | 1 - Library/ENV/4.3/g++-4.3 | 1 - Library/ENV/4.3/g++-4.4 | 1 - Library/ENV/4.3/g++-4.5 | 1 - Library/ENV/4.3/g++-4.6 | 1 - Library/ENV/4.3/g++-4.7 | 1 - Library/ENV/4.3/g++-4.8 | 1 - Library/ENV/4.3/g++-4.9 | 1 - Library/ENV/4.3/g++-5 | 1 - Library/ENV/4.3/g++-6 | 1 - Library/ENV/4.3/gcc | 1 - Library/ENV/4.3/gcc-4.2 | 1 - Library/ENV/4.3/gcc-4.3 | 1 - Library/ENV/4.3/gcc-4.4 | 1 - Library/ENV/4.3/gcc-4.5 | 1 - Library/ENV/4.3/gcc-4.6 | 1 - Library/ENV/4.3/gcc-4.7 | 1 - Library/ENV/4.3/gcc-4.8 | 1 - Library/ENV/4.3/gcc-4.9 | 1 - Library/ENV/4.3/gcc-5 | 1 - Library/ENV/4.3/gcc-6 | 1 - Library/ENV/4.3/git | 1 - Library/ENV/4.3/gmake | 1 - Library/ENV/4.3/i686-apple-darwin11-llvm-g++-4.2 | 1 - Library/ENV/4.3/i686-apple-darwin11-llvm-gcc-4.2 | 1 - Library/ENV/4.3/ld | 1 - Library/ENV/4.3/llvm-g++ | 1 - Library/ENV/4.3/llvm-g++-4.2 | 1 - Library/ENV/4.3/llvm-gcc | 1 - Library/ENV/4.3/llvm-gcc-4.2 | 1 - Library/ENV/4.3/make | 3 - Library/ENV/4.3/mig | 3 - Library/ENV/4.3/pod2man | 3 - Library/ENV/4.3/sed | 7 - Library/ENV/4.3/svn | 1 - Library/ENV/4.3/xcrun | 57 ---- Library/ENV/pkgconfig/10.10/libcurl.pc | 39 --- Library/ENV/pkgconfig/10.10/libexslt.pc | 12 - Library/ENV/pkgconfig/10.10/libxml-2.0.pc | 13 - Library/ENV/pkgconfig/10.10/libxslt.pc | 12 - Library/ENV/pkgconfig/10.10/sqlite3.pc | 11 - Library/ENV/pkgconfig/10.10/zlib.pc | 13 - Library/ENV/pkgconfig/10.11/libcurl.pc | 39 --- Library/ENV/pkgconfig/10.11/libexslt.pc | 12 - Library/ENV/pkgconfig/10.11/libxml-2.0.pc | 13 - Library/ENV/pkgconfig/10.11/libxslt.pc | 12 - Library/ENV/pkgconfig/10.11/sqlite3.pc | 11 - Library/ENV/pkgconfig/10.11/zlib.pc | 13 - Library/ENV/pkgconfig/10.12/libcurl.pc | 39 --- Library/ENV/pkgconfig/10.12/libexslt.pc | 12 - Library/ENV/pkgconfig/10.12/libxml-2.0.pc | 13 - Library/ENV/pkgconfig/10.12/libxslt.pc | 12 - Library/ENV/pkgconfig/10.12/sqlite3.pc | 11 - Library/ENV/pkgconfig/10.12/zlib.pc | 13 - Library/ENV/pkgconfig/10.4 | 1 - Library/ENV/pkgconfig/10.5/libcrypto.pc | 11 - Library/ENV/pkgconfig/10.5/libcurl.pc | 12 - Library/ENV/pkgconfig/10.6/sqlite3.pc | 11 - Library/ENV/pkgconfig/10.6/zlib.pc | 13 - Library/ENV/pkgconfig/10.7/sqlite3.pc | 11 - Library/ENV/pkgconfig/10.7/zlib.pc | 13 - Library/ENV/pkgconfig/10.8/libcurl.pc | 39 --- Library/ENV/pkgconfig/10.8/libexslt.pc | 12 - Library/ENV/pkgconfig/10.8/libxml-2.0.pc | 13 - Library/ENV/pkgconfig/10.8/libxslt.pc | 12 - Library/ENV/pkgconfig/10.8/sqlite3.pc | 11 - Library/ENV/pkgconfig/10.8/zlib.pc | 13 - Library/ENV/pkgconfig/10.9/libcurl.pc | 39 --- Library/ENV/pkgconfig/10.9/libexslt.pc | 12 - Library/ENV/pkgconfig/10.9/libxml-2.0.pc | 13 - Library/ENV/pkgconfig/10.9/libxslt.pc | 12 - Library/ENV/pkgconfig/10.9/sqlite3.pc | 11 - Library/ENV/pkgconfig/10.9/zlib.pc | 13 - Library/ENV/pkgconfig/fuse/fuse.pc | 1 - Library/ENV/pkgconfig/fuse/osxfuse.pc | 1 - Library/ENV/scm/git | 120 ------- Library/ENV/scm/svn | 1 - Library/Homebrew/cmd/update.sh | 2 +- Library/Homebrew/config.rb | 4 +- Library/Homebrew/extend/os/mac/extend/ENV/std.rb | 2 +- Library/Homebrew/extend/os/mac/extend/ENV/super.rb | 6 +- Library/Homebrew/os/mac/pkgconfig/10.10/libcurl.pc | 39 +++ .../Homebrew/os/mac/pkgconfig/10.10/libexslt.pc | 12 + .../Homebrew/os/mac/pkgconfig/10.10/libxml-2.0.pc | 13 + Library/Homebrew/os/mac/pkgconfig/10.10/libxslt.pc | 12 + Library/Homebrew/os/mac/pkgconfig/10.10/sqlite3.pc | 11 + Library/Homebrew/os/mac/pkgconfig/10.10/zlib.pc | 13 + Library/Homebrew/os/mac/pkgconfig/10.11/libcurl.pc | 39 +++ .../Homebrew/os/mac/pkgconfig/10.11/libexslt.pc | 12 + .../Homebrew/os/mac/pkgconfig/10.11/libxml-2.0.pc | 13 + Library/Homebrew/os/mac/pkgconfig/10.11/libxslt.pc | 12 + Library/Homebrew/os/mac/pkgconfig/10.11/sqlite3.pc | 11 + Library/Homebrew/os/mac/pkgconfig/10.11/zlib.pc | 13 + Library/Homebrew/os/mac/pkgconfig/10.12/libcurl.pc | 39 +++ .../Homebrew/os/mac/pkgconfig/10.12/libexslt.pc | 12 + .../Homebrew/os/mac/pkgconfig/10.12/libxml-2.0.pc | 13 + Library/Homebrew/os/mac/pkgconfig/10.12/libxslt.pc | 12 + Library/Homebrew/os/mac/pkgconfig/10.12/sqlite3.pc | 11 + Library/Homebrew/os/mac/pkgconfig/10.12/zlib.pc | 13 + Library/Homebrew/os/mac/pkgconfig/10.4 | 1 + .../Homebrew/os/mac/pkgconfig/10.5/libcrypto.pc | 11 + Library/Homebrew/os/mac/pkgconfig/10.5/libcurl.pc | 12 + Library/Homebrew/os/mac/pkgconfig/10.6/sqlite3.pc | 11 + Library/Homebrew/os/mac/pkgconfig/10.6/zlib.pc | 13 + Library/Homebrew/os/mac/pkgconfig/10.7/sqlite3.pc | 11 + Library/Homebrew/os/mac/pkgconfig/10.7/zlib.pc | 13 + Library/Homebrew/os/mac/pkgconfig/10.8/libcurl.pc | 39 +++ Library/Homebrew/os/mac/pkgconfig/10.8/libexslt.pc | 12 + .../Homebrew/os/mac/pkgconfig/10.8/libxml-2.0.pc | 13 + Library/Homebrew/os/mac/pkgconfig/10.8/libxslt.pc | 12 + Library/Homebrew/os/mac/pkgconfig/10.8/sqlite3.pc | 11 + Library/Homebrew/os/mac/pkgconfig/10.8/zlib.pc | 13 + Library/Homebrew/os/mac/pkgconfig/10.9/libcurl.pc | 39 +++ Library/Homebrew/os/mac/pkgconfig/10.9/libexslt.pc | 12 + .../Homebrew/os/mac/pkgconfig/10.9/libxml-2.0.pc | 13 + Library/Homebrew/os/mac/pkgconfig/10.9/libxslt.pc | 12 + Library/Homebrew/os/mac/pkgconfig/10.9/sqlite3.pc | 11 + Library/Homebrew/os/mac/pkgconfig/10.9/zlib.pc | 13 + Library/Homebrew/os/mac/pkgconfig/fuse/fuse.pc | 1 + Library/Homebrew/os/mac/pkgconfig/fuse/osxfuse.pc | 1 + Library/Homebrew/shims/scm/git | 120 +++++++ Library/Homebrew/shims/scm/svn | 1 + Library/Homebrew/shims/super/ant | 5 + Library/Homebrew/shims/super/apr-1-config | 15 + Library/Homebrew/shims/super/bsdmake | 3 + Library/Homebrew/shims/super/c++ | 1 + Library/Homebrew/shims/super/c89 | 1 + Library/Homebrew/shims/super/c99 | 1 + Library/Homebrew/shims/super/cc | 364 +++++++++++++++++++++ Library/Homebrew/shims/super/clang | 1 + Library/Homebrew/shims/super/clang++ | 1 + Library/Homebrew/shims/super/cpp | 1 + Library/Homebrew/shims/super/g++ | 1 + Library/Homebrew/shims/super/g++-4.2 | 1 + Library/Homebrew/shims/super/g++-4.3 | 1 + Library/Homebrew/shims/super/g++-4.4 | 1 + Library/Homebrew/shims/super/g++-4.5 | 1 + Library/Homebrew/shims/super/g++-4.6 | 1 + Library/Homebrew/shims/super/g++-4.7 | 1 + Library/Homebrew/shims/super/g++-4.8 | 1 + Library/Homebrew/shims/super/g++-4.9 | 1 + Library/Homebrew/shims/super/g++-5 | 1 + Library/Homebrew/shims/super/g++-6 | 1 + Library/Homebrew/shims/super/gcc | 1 + Library/Homebrew/shims/super/gcc-4.2 | 1 + Library/Homebrew/shims/super/gcc-4.3 | 1 + Library/Homebrew/shims/super/gcc-4.4 | 1 + Library/Homebrew/shims/super/gcc-4.5 | 1 + Library/Homebrew/shims/super/gcc-4.6 | 1 + Library/Homebrew/shims/super/gcc-4.7 | 1 + Library/Homebrew/shims/super/gcc-4.8 | 1 + Library/Homebrew/shims/super/gcc-4.9 | 1 + Library/Homebrew/shims/super/gcc-5 | 1 + Library/Homebrew/shims/super/gcc-6 | 1 + Library/Homebrew/shims/super/git | 1 + Library/Homebrew/shims/super/gmake | 1 + .../shims/super/i686-apple-darwin11-llvm-g++-4.2 | 1 + .../shims/super/i686-apple-darwin11-llvm-gcc-4.2 | 1 + Library/Homebrew/shims/super/ld | 1 + Library/Homebrew/shims/super/llvm-g++ | 1 + Library/Homebrew/shims/super/llvm-g++-4.2 | 1 + Library/Homebrew/shims/super/llvm-gcc | 1 + Library/Homebrew/shims/super/llvm-gcc-4.2 | 1 + Library/Homebrew/shims/super/make | 3 + Library/Homebrew/shims/super/mig | 3 + Library/Homebrew/shims/super/pod2man | 3 + Library/Homebrew/shims/super/sed | 7 + Library/Homebrew/shims/super/svn | 1 + Library/Homebrew/shims/super/xcrun | 57 ++++ Library/Homebrew/test/lib/config.rb | 2 +- Library/Homebrew/utils/git.rb | 6 +- Library/brew.rb | 2 +- Library/brew.sh | 2 +- 186 files changed, 1206 insertions(+), 1208 deletions(-) delete mode 120000 Library/ENV/3.2.6 delete mode 120000 Library/ENV/4.2 delete mode 100755 Library/ENV/4.3/ant delete mode 100755 Library/ENV/4.3/apr-1-config delete mode 100755 Library/ENV/4.3/bsdmake delete mode 120000 Library/ENV/4.3/c++ delete mode 120000 Library/ENV/4.3/c89 delete mode 120000 Library/ENV/4.3/c99 delete mode 100755 Library/ENV/4.3/cc delete mode 120000 Library/ENV/4.3/clang delete mode 120000 Library/ENV/4.3/clang++ delete mode 120000 Library/ENV/4.3/cpp delete mode 120000 Library/ENV/4.3/g++ delete mode 120000 Library/ENV/4.3/g++-4.2 delete mode 120000 Library/ENV/4.3/g++-4.3 delete mode 120000 Library/ENV/4.3/g++-4.4 delete mode 120000 Library/ENV/4.3/g++-4.5 delete mode 120000 Library/ENV/4.3/g++-4.6 delete mode 120000 Library/ENV/4.3/g++-4.7 delete mode 120000 Library/ENV/4.3/g++-4.8 delete mode 120000 Library/ENV/4.3/g++-4.9 delete mode 120000 Library/ENV/4.3/g++-5 delete mode 120000 Library/ENV/4.3/g++-6 delete mode 120000 Library/ENV/4.3/gcc delete mode 120000 Library/ENV/4.3/gcc-4.2 delete mode 120000 Library/ENV/4.3/gcc-4.3 delete mode 120000 Library/ENV/4.3/gcc-4.4 delete mode 120000 Library/ENV/4.3/gcc-4.5 delete mode 120000 Library/ENV/4.3/gcc-4.6 delete mode 120000 Library/ENV/4.3/gcc-4.7 delete mode 120000 Library/ENV/4.3/gcc-4.8 delete mode 120000 Library/ENV/4.3/gcc-4.9 delete mode 120000 Library/ENV/4.3/gcc-5 delete mode 120000 Library/ENV/4.3/gcc-6 delete mode 120000 Library/ENV/4.3/git delete mode 120000 Library/ENV/4.3/gmake delete mode 120000 Library/ENV/4.3/i686-apple-darwin11-llvm-g++-4.2 delete mode 120000 Library/ENV/4.3/i686-apple-darwin11-llvm-gcc-4.2 delete mode 120000 Library/ENV/4.3/ld delete mode 120000 Library/ENV/4.3/llvm-g++ delete mode 120000 Library/ENV/4.3/llvm-g++-4.2 delete mode 120000 Library/ENV/4.3/llvm-gcc delete mode 120000 Library/ENV/4.3/llvm-gcc-4.2 delete mode 100755 Library/ENV/4.3/make delete mode 100755 Library/ENV/4.3/mig delete mode 100755 Library/ENV/4.3/pod2man delete mode 100755 Library/ENV/4.3/sed delete mode 120000 Library/ENV/4.3/svn delete mode 100755 Library/ENV/4.3/xcrun delete mode 100644 Library/ENV/pkgconfig/10.10/libcurl.pc delete mode 100644 Library/ENV/pkgconfig/10.10/libexslt.pc delete mode 100644 Library/ENV/pkgconfig/10.10/libxml-2.0.pc delete mode 100644 Library/ENV/pkgconfig/10.10/libxslt.pc delete mode 100644 Library/ENV/pkgconfig/10.10/sqlite3.pc delete mode 100644 Library/ENV/pkgconfig/10.10/zlib.pc delete mode 100644 Library/ENV/pkgconfig/10.11/libcurl.pc delete mode 100644 Library/ENV/pkgconfig/10.11/libexslt.pc delete mode 100644 Library/ENV/pkgconfig/10.11/libxml-2.0.pc delete mode 100644 Library/ENV/pkgconfig/10.11/libxslt.pc delete mode 100644 Library/ENV/pkgconfig/10.11/sqlite3.pc delete mode 100644 Library/ENV/pkgconfig/10.11/zlib.pc delete mode 100644 Library/ENV/pkgconfig/10.12/libcurl.pc delete mode 100644 Library/ENV/pkgconfig/10.12/libexslt.pc delete mode 100644 Library/ENV/pkgconfig/10.12/libxml-2.0.pc delete mode 100644 Library/ENV/pkgconfig/10.12/libxslt.pc delete mode 100644 Library/ENV/pkgconfig/10.12/sqlite3.pc delete mode 100644 Library/ENV/pkgconfig/10.12/zlib.pc delete mode 120000 Library/ENV/pkgconfig/10.4 delete mode 100644 Library/ENV/pkgconfig/10.5/libcrypto.pc delete mode 100644 Library/ENV/pkgconfig/10.5/libcurl.pc delete mode 100644 Library/ENV/pkgconfig/10.6/sqlite3.pc delete mode 100644 Library/ENV/pkgconfig/10.6/zlib.pc delete mode 100644 Library/ENV/pkgconfig/10.7/sqlite3.pc delete mode 100644 Library/ENV/pkgconfig/10.7/zlib.pc delete mode 100644 Library/ENV/pkgconfig/10.8/libcurl.pc delete mode 100644 Library/ENV/pkgconfig/10.8/libexslt.pc delete mode 100644 Library/ENV/pkgconfig/10.8/libxml-2.0.pc delete mode 100644 Library/ENV/pkgconfig/10.8/libxslt.pc delete mode 100644 Library/ENV/pkgconfig/10.8/sqlite3.pc delete mode 100644 Library/ENV/pkgconfig/10.8/zlib.pc delete mode 100644 Library/ENV/pkgconfig/10.9/libcurl.pc delete mode 100644 Library/ENV/pkgconfig/10.9/libexslt.pc delete mode 100644 Library/ENV/pkgconfig/10.9/libxml-2.0.pc delete mode 100644 Library/ENV/pkgconfig/10.9/libxslt.pc delete mode 100644 Library/ENV/pkgconfig/10.9/sqlite3.pc delete mode 100644 Library/ENV/pkgconfig/10.9/zlib.pc delete mode 120000 Library/ENV/pkgconfig/fuse/fuse.pc delete mode 120000 Library/ENV/pkgconfig/fuse/osxfuse.pc delete mode 100755 Library/ENV/scm/git delete mode 120000 Library/ENV/scm/svn create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.10/libcurl.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.10/libexslt.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.10/libxml-2.0.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.10/libxslt.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.10/sqlite3.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.10/zlib.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.11/libcurl.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.11/libexslt.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.11/libxml-2.0.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.11/libxslt.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.11/sqlite3.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.11/zlib.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.12/libcurl.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.12/libexslt.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.12/libxml-2.0.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.12/libxslt.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.12/sqlite3.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.12/zlib.pc create mode 120000 Library/Homebrew/os/mac/pkgconfig/10.4 create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.5/libcrypto.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.5/libcurl.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.6/sqlite3.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.6/zlib.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.7/sqlite3.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.7/zlib.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.8/libcurl.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.8/libexslt.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.8/libxml-2.0.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.8/libxslt.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.8/sqlite3.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.8/zlib.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.9/libcurl.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.9/libexslt.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.9/libxml-2.0.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.9/libxslt.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.9/sqlite3.pc create mode 100644 Library/Homebrew/os/mac/pkgconfig/10.9/zlib.pc create mode 120000 Library/Homebrew/os/mac/pkgconfig/fuse/fuse.pc create mode 120000 Library/Homebrew/os/mac/pkgconfig/fuse/osxfuse.pc create mode 100755 Library/Homebrew/shims/scm/git create mode 120000 Library/Homebrew/shims/scm/svn create mode 100755 Library/Homebrew/shims/super/ant create mode 100755 Library/Homebrew/shims/super/apr-1-config create mode 100755 Library/Homebrew/shims/super/bsdmake create mode 120000 Library/Homebrew/shims/super/c++ create mode 120000 Library/Homebrew/shims/super/c89 create mode 120000 Library/Homebrew/shims/super/c99 create mode 100755 Library/Homebrew/shims/super/cc create mode 120000 Library/Homebrew/shims/super/clang create mode 120000 Library/Homebrew/shims/super/clang++ create mode 120000 Library/Homebrew/shims/super/cpp create mode 120000 Library/Homebrew/shims/super/g++ create mode 120000 Library/Homebrew/shims/super/g++-4.2 create mode 120000 Library/Homebrew/shims/super/g++-4.3 create mode 120000 Library/Homebrew/shims/super/g++-4.4 create mode 120000 Library/Homebrew/shims/super/g++-4.5 create mode 120000 Library/Homebrew/shims/super/g++-4.6 create mode 120000 Library/Homebrew/shims/super/g++-4.7 create mode 120000 Library/Homebrew/shims/super/g++-4.8 create mode 120000 Library/Homebrew/shims/super/g++-4.9 create mode 120000 Library/Homebrew/shims/super/g++-5 create mode 120000 Library/Homebrew/shims/super/g++-6 create mode 120000 Library/Homebrew/shims/super/gcc create mode 120000 Library/Homebrew/shims/super/gcc-4.2 create mode 120000 Library/Homebrew/shims/super/gcc-4.3 create mode 120000 Library/Homebrew/shims/super/gcc-4.4 create mode 120000 Library/Homebrew/shims/super/gcc-4.5 create mode 120000 Library/Homebrew/shims/super/gcc-4.6 create mode 120000 Library/Homebrew/shims/super/gcc-4.7 create mode 120000 Library/Homebrew/shims/super/gcc-4.8 create mode 120000 Library/Homebrew/shims/super/gcc-4.9 create mode 120000 Library/Homebrew/shims/super/gcc-5 create mode 120000 Library/Homebrew/shims/super/gcc-6 create mode 120000 Library/Homebrew/shims/super/git create mode 120000 Library/Homebrew/shims/super/gmake create mode 120000 Library/Homebrew/shims/super/i686-apple-darwin11-llvm-g++-4.2 create mode 120000 Library/Homebrew/shims/super/i686-apple-darwin11-llvm-gcc-4.2 create mode 120000 Library/Homebrew/shims/super/ld create mode 120000 Library/Homebrew/shims/super/llvm-g++ create mode 120000 Library/Homebrew/shims/super/llvm-g++-4.2 create mode 120000 Library/Homebrew/shims/super/llvm-gcc create mode 120000 Library/Homebrew/shims/super/llvm-gcc-4.2 create mode 100755 Library/Homebrew/shims/super/make create mode 100755 Library/Homebrew/shims/super/mig create mode 100755 Library/Homebrew/shims/super/pod2man create mode 100755 Library/Homebrew/shims/super/sed create mode 120000 Library/Homebrew/shims/super/svn create mode 100755 Library/Homebrew/shims/super/xcrun (limited to 'Library') diff --git a/Library/ENV/3.2.6 b/Library/ENV/3.2.6 deleted file mode 120000 index 89f71c74c..000000000 --- a/Library/ENV/3.2.6 +++ /dev/null @@ -1 +0,0 @@ -4.3 \ No newline at end of file diff --git a/Library/ENV/4.2 b/Library/ENV/4.2 deleted file mode 120000 index 89f71c74c..000000000 --- a/Library/ENV/4.2 +++ /dev/null @@ -1 +0,0 @@ -4.3 \ No newline at end of file diff --git a/Library/ENV/4.3/ant b/Library/ENV/4.3/ant deleted file mode 100755 index f54bc2747..000000000 --- a/Library/ENV/4.3/ant +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -export HOMEBREW_CCCFG="O$HOMEBREW_CCCFG" -ant=/usr/bin/ant -[ -x "$ant" ] || ant="$(${HOMEBREW_BREW_FILE} --prefix ant)/bin/ant" -exec "$ant" "$@" diff --git a/Library/ENV/4.3/apr-1-config b/Library/ENV/4.3/apr-1-config deleted file mode 100755 index 40ad6478e..000000000 --- a/Library/ENV/4.3/apr-1-config +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -if [[ "$HOMEBREW_CCCFG" == *a* ]]; then - case "$1" in - --cc) echo "cc";; - --cpp) echo "cpp";; - --includedir) echo "$HOMEBREW_SDKROOT/usr/include/apr-1";; - --includes) echo "-isystem$HOMEBREW_SDKROOT/usr/include/apr-1";; - --apr-libtool) echo "glibtool";; - *) - exec xcrun apr-1-config "$@";; - esac -else - exec /usr/bin/apr-1-config "$@" -fi diff --git a/Library/ENV/4.3/bsdmake b/Library/ENV/4.3/bsdmake deleted file mode 100755 index b61e1b2bc..000000000 --- a/Library/ENV/4.3/bsdmake +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -export HOMEBREW_CCCFG="O$HOMEBREW_CCCFG" -exec xcrun bsdmake "$@" diff --git a/Library/ENV/4.3/c++ b/Library/ENV/4.3/c++ deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/c++ +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/c89 b/Library/ENV/4.3/c89 deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/c89 +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/c99 b/Library/ENV/4.3/c99 deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/c99 +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/cc b/Library/ENV/4.3/cc deleted file mode 100755 index e7ab6500f..000000000 --- a/Library/ENV/4.3/cc +++ /dev/null @@ -1,364 +0,0 @@ -#!/bin/sh -# Make sure this shim uses the same Ruby interpreter that is used by Homebrew. -unset RUBYLIB -unset RUBYOPT -if [ -z "$HOMEBREW_RUBY_PATH" ] -then - echo "${0##*/}: The build tool has reset ENV; --env=std required." >&2 - exit 1 -fi -exec "$HOMEBREW_RUBY_PATH" -x "$0" "$@" -#!/usr/bin/env ruby -W0 - -require "pathname" -require "set" - -class Cmd - attr_reader :config, :prefix, :cellar, :opt, :tmpdir, :sysroot, :deps - attr_reader :archflags, :optflags, :keg_regex, :formula_prefix - - def initialize(arg0, args) - @arg0 = arg0 - @args = args.freeze - @config = ENV.fetch("HOMEBREW_CCCFG") { "" } - @prefix = ENV["HOMEBREW_PREFIX"] - @cellar = ENV["HOMEBREW_CELLAR"] - @opt = ENV["HOMEBREW_OPT"] - @tmpdir = ENV["HOMEBREW_TEMP"] - @sysroot = ENV["HOMEBREW_SDKROOT"] - @archflags = ENV.fetch("HOMEBREW_ARCHFLAGS") { "" }.split(" ") - @optflags = ENV.fetch("HOMEBREW_OPTFLAGS") { "" }.split(" ") - @deps = Set.new(ENV.fetch("HOMEBREW_DEPENDENCIES") { "" }.split(",")) - @formula_prefix = ENV["HOMEBREW_FORMULA_PREFIX"] - # matches opt or cellar prefix and formula name - @keg_regex = %r[(#{Regexp.escape(opt)}|#{Regexp.escape(cellar)})/([\w\-_\+]+)] - end - - def mode - if @arg0 == "cpp" || @arg0 == "ld" - @arg0.to_sym - elsif @args.include? "-c" - if @arg0 =~ /(?:c|g|clang)\+\+/ - :cxx - else - :cc - end - elsif @args.include? "-E" - :ccE - else - if @arg0 =~ /(?:c|g|clang)\+\+/ - :cxxld - else - :ccld - end - end - end - - def tool - @tool ||= case @arg0 - when "ld" then "ld" - when "cpp" then "cpp" - when /\w\+\+(-\d(\.\d)?)?$/ - case ENV["HOMEBREW_CC"] - when /clang/ - "clang++" - when /llvm-gcc/ - "llvm-g++-4.2" - when /gcc(-\d(\.\d)?)?$/ - "g++" + $1.to_s - end - else - # Note that this is a universal fallback, so that we'll always invoke - # HOMEBREW_CC regardless of what name under which the tool was invoked. - ENV["HOMEBREW_CC"] - end - end - - def args - if @args.length == 1 && @args[0] == "-v" - # Don't add linker arguments if -v passed as sole option. This stops gcc - # -v with no other arguments from outputting a linker error. Some - # software uses gcc -v (wrongly) to sniff the GCC version. - return @args.dup - end - - if !refurbish_args? || tool == "ld" || configure? - args = @args.dup - else - args = refurbished_args - end - - if sysroot - if tool == "ld" - args << "-syslibroot" << sysroot - else - args << "-isysroot" << sysroot << "--sysroot=#{sysroot}" - end - end - - case mode - when :ccld - cflags + args + cppflags + ldflags - when :cxxld - cxxflags + args + cppflags + ldflags - when :cc - cflags + args + cppflags - when :cxx - cxxflags + args + cppflags - when :ccE - args + cppflags - when :cpp - args + cppflags - when :ld - ldflags + args - end - end - - def refurbished_args - @lset = Set.new(library_paths + system_library_paths) - @iset = Set.new(isystem_paths + include_paths) - - args = [] - enum = @args.each - - loop do - case arg = enum.next - when "-arch" - if permit_arch_flags? - args << arg << enum.next - else - enum.next - end - when "-m32", "-m64" - args << arg if permit_arch_flags? - when /^-Xarch_/ - refurbished = refurbish_arg(enum.next, enum) - unless refurbished.empty? - args << arg - args += refurbished - end - else - args += refurbish_arg(arg, enum) - end - end - - args - end - - def refurbish_arg(arg, enum) - args = [] - - case arg - when /^-g\d?$/, /^-gstabs\d+/, "-gstabs+", /^-ggdb\d?/, - /^-march=.+/, /^-mtune=.+/, /^-mcpu=.+/, - /^-O[0-9zs]?$/, "-fast", "-no-cpp-precomp", - "-pedantic", "-pedantic-errors", "-Wno-long-double", - "-Wno-unused-but-set-variable" - when "-fopenmp", "-lgomp", "-mno-fused-madd", "-fforce-addr", "-fno-defer-pop", - "-mno-dynamic-no-pic", "-fearly-inlining", /^-f(?:no-)?inline-functions-called-once/, - /^-finline-limit/, /^-f(?:no-)?check-new/, "-fno-delete-null-pointer-checks", - "-fcaller-saves", "-fthread-jumps", "-fno-reorder-blocks", "-fcse-skip-blocks", - "-frerun-cse-after-loop", "-frerun-loop-opt", "-fcse-follow-jumps", - "-fno-regmove", "-fno-for-scope", "-fno-tree-pre", "-fno-tree-dominator-opts", - "-fuse-linker-plugin" - # clang doesn't support these flags - args << arg unless tool =~ /^clang/ - when "--fast-math" - arg = "-ffast-math" if tool =~ /^clang/ - args << arg - when "-Wno-deprecated-register" - # older gccs don't support these flags - args << arg unless tool =~ /^g..-4.[02]/ - when /^-W[alp],/, /^-Wno-/ - args << arg - when /^-W.*/ - # prune warnings - when "-macosx_version_min", "-dylib_install_name" - args << "-Wl,#{arg},#{enum.next}" - when "-multiply_definedsuppress" - args << "-Wl,-multiply_defined,suppress" - when "-undefineddynamic_lookup" - args << "-Wl,-undefined,dynamic_lookup" - when /^-isysroot/, /^--sysroot/ - sdk = enum.next - # We set the sysroot for OS X SDKs - args << "-isysroot" << sdk unless sdk.downcase.include? "osx" - when "-dylib" - args << "-Wl,#{arg}" - when /^-I(.+)?/ - # Support both "-Ifoo" (one argument) and "-I foo" (two arguments) - val = chuzzle($1) || enum.next - path = canonical_path(val) - args << "-I#{val}" if keep?(path) && @iset.add?(path) - when /^-L(.+)?/ - val = chuzzle($1) || enum.next - path = canonical_path(val) - args << "-L#{val}" if keep?(path) && @lset.add?(path) - else - args << arg - end - - args - end - - def keep?(path) - # The logic in this method will eventually become the default, - # but is currently opt-in. - return keep_orig?(path) unless ENV["HOMEBREW_EXPERIMENTAL_FILTER_FLAGS_ON_DEPS"] - - # Allow references to self - if formula_prefix && path.start_with?("#{formula_prefix}/") - true - # first two paths: reject references to Cellar or opt paths - # for unspecified dependencies - elsif path.start_with?(cellar) || path.start_with?(opt) - dep = path[keg_regex, 2] - dep && @deps.include?(dep) - elsif path.start_with?(prefix) - true - else - # ignore MacPorts, Boxen's Homebrew, X11, fink - !path.start_with?("/opt/local", "/opt/boxen/homebrew", "/opt/X11", "/sw", "/usr/X11") - end - end - - # The original less-smart version of keep_orig; will eventually be removed - def keep_orig?(path) - path.start_with?(prefix, cellar, tmpdir) || !path.start_with?("/opt/local", "/opt/boxen/homebrew", "/opt/X11", "/sw", "/usr/X11") - end - - def cflags - args = [] - - return args unless refurbish_args? || configure? - - args << "-pipe" - args << "-w" unless configure? - args << "-#{ENV["HOMEBREW_OPTIMIZATION_LEVEL"]}" - args.concat(optflags) - args.concat(archflags) - args << "-std=#{@arg0}" if @arg0 =~ /c[89]9/ - args - end - - def cxxflags - args = cflags - args << "-std=c++11" if cxx11? - args << "-stdlib=libc++" if libcxx? - args << "-stdlib=libstdc++" if libstdcxx? - args - end - - def cppflags - path_flags("-isystem", isystem_paths) + path_flags("-I", include_paths) - end - - def ldflags - args = path_flags("-L", library_paths) - case mode - when :ld - args << "-headerpad_max_install_names" - when :ccld, :cxxld - args << "-Wl,-headerpad_max_install_names" - end - args - end - - def isystem_paths - path_split("HOMEBREW_ISYSTEM_PATHS") - end - - def include_paths - path_split("HOMEBREW_INCLUDE_PATHS") - end - - def library_paths - path_split("HOMEBREW_LIBRARY_PATHS") - end - - def system_library_paths - %W[#{sysroot}/usr/lib /usr/local/lib] - end - - def configure? - # configure scripts generated with autoconf 2.61 or later export as_nl - ENV.key? "as_nl" - end - - def refurbish_args? - config.include?("O") - end - - def cxx11? - config.include?("x") - end - - def libcxx? - config.include?("g") - end - - def libstdcxx? - config.include?("h") - end - - def permit_arch_flags? - config.include?("K") - end - - def canonical_path(path) - path = Pathname.new(path) - path = path.realpath if path.exist? - path.to_s - end - - def path_flags(prefix, paths) - paths = paths.uniq.select { |path| File.directory?(path) } - paths.map! { |path| prefix + path } - end - - def path_split(key) - ENV.fetch(key) { "" }.split(File::PATH_SEPARATOR) - end - - def chuzzle(val) - return val if val.nil? - val = val.chomp - return val unless val.empty? - end -end - -def log(basename, argv, tool, args) - return unless ENV.key?("HOMEBREW_CC_LOG_PATH") - - adds = args - argv - dels = argv - args - - s = "" - s << "#{basename} called with: #{argv.join(" ")}\n" - s << "superenv removed: #{dels.join(" ")}\n" unless dels.empty? - s << "superenv added: #{adds.join(" ")}\n" unless adds.empty? - s << "superenv executed: #{tool} #{args.join(" ")}\n\n" - File.open("#{ENV["HOMEBREW_CC_LOG_PATH"]}.cc", "a+") { |f| f.write(s) } -end - -if __FILE__ == $PROGRAM_NAME - ##################################################################### sanity - - if (cc = ENV["HOMEBREW_CC"]).nil? || cc.empty? || cc == "cc" - # those values are not allowed - ENV["HOMEBREW_CC"] = "clang" - end - - ####################################################################### main - - dirname, basename = File.split($0) - - cmd = Cmd.new(basename, ARGV) - tool = cmd.tool - args = cmd.args - - log(basename, ARGV, tool, args) - - args << { :close_others => false } if RUBY_VERSION >= "2.0" - exec "#{dirname}/xcrun", tool, *args -end diff --git a/Library/ENV/4.3/clang b/Library/ENV/4.3/clang deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/clang +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/clang++ b/Library/ENV/4.3/clang++ deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/clang++ +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/cpp b/Library/ENV/4.3/cpp deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/cpp +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/g++ b/Library/ENV/4.3/g++ deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/g++ +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/g++-4.2 b/Library/ENV/4.3/g++-4.2 deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/g++-4.2 +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/g++-4.3 b/Library/ENV/4.3/g++-4.3 deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/g++-4.3 +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/g++-4.4 b/Library/ENV/4.3/g++-4.4 deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/g++-4.4 +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/g++-4.5 b/Library/ENV/4.3/g++-4.5 deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/g++-4.5 +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/g++-4.6 b/Library/ENV/4.3/g++-4.6 deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/g++-4.6 +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/g++-4.7 b/Library/ENV/4.3/g++-4.7 deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/g++-4.7 +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/g++-4.8 b/Library/ENV/4.3/g++-4.8 deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/g++-4.8 +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/g++-4.9 b/Library/ENV/4.3/g++-4.9 deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/g++-4.9 +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/g++-5 b/Library/ENV/4.3/g++-5 deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/g++-5 +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/g++-6 b/Library/ENV/4.3/g++-6 deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/g++-6 +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/gcc b/Library/ENV/4.3/gcc deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/gcc +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/gcc-4.2 b/Library/ENV/4.3/gcc-4.2 deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/gcc-4.2 +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/gcc-4.3 b/Library/ENV/4.3/gcc-4.3 deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/gcc-4.3 +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/gcc-4.4 b/Library/ENV/4.3/gcc-4.4 deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/gcc-4.4 +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/gcc-4.5 b/Library/ENV/4.3/gcc-4.5 deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/gcc-4.5 +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/gcc-4.6 b/Library/ENV/4.3/gcc-4.6 deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/gcc-4.6 +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/gcc-4.7 b/Library/ENV/4.3/gcc-4.7 deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/gcc-4.7 +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/gcc-4.8 b/Library/ENV/4.3/gcc-4.8 deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/gcc-4.8 +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/gcc-4.9 b/Library/ENV/4.3/gcc-4.9 deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/gcc-4.9 +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/gcc-5 b/Library/ENV/4.3/gcc-5 deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/gcc-5 +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/gcc-6 b/Library/ENV/4.3/gcc-6 deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/gcc-6 +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/git b/Library/ENV/4.3/git deleted file mode 120000 index ba71181a5..000000000 --- a/Library/ENV/4.3/git +++ /dev/null @@ -1 +0,0 @@ -../scm/git \ No newline at end of file diff --git a/Library/ENV/4.3/gmake b/Library/ENV/4.3/gmake deleted file mode 120000 index ac08cdcf9..000000000 --- a/Library/ENV/4.3/gmake +++ /dev/null @@ -1 +0,0 @@ -make \ No newline at end of file diff --git a/Library/ENV/4.3/i686-apple-darwin11-llvm-g++-4.2 b/Library/ENV/4.3/i686-apple-darwin11-llvm-g++-4.2 deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/i686-apple-darwin11-llvm-g++-4.2 +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/i686-apple-darwin11-llvm-gcc-4.2 b/Library/ENV/4.3/i686-apple-darwin11-llvm-gcc-4.2 deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/i686-apple-darwin11-llvm-gcc-4.2 +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/ld b/Library/ENV/4.3/ld deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/ld +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/llvm-g++ b/Library/ENV/4.3/llvm-g++ deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/llvm-g++ +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/llvm-g++-4.2 b/Library/ENV/4.3/llvm-g++-4.2 deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/llvm-g++-4.2 +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/llvm-gcc b/Library/ENV/4.3/llvm-gcc deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/llvm-gcc +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/llvm-gcc-4.2 b/Library/ENV/4.3/llvm-gcc-4.2 deleted file mode 120000 index 2652f5f42..000000000 --- a/Library/ENV/4.3/llvm-gcc-4.2 +++ /dev/null @@ -1 +0,0 @@ -cc \ No newline at end of file diff --git a/Library/ENV/4.3/make b/Library/ENV/4.3/make deleted file mode 100755 index f7089de36..000000000 --- a/Library/ENV/4.3/make +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -export HOMEBREW_CCCFG="O$HOMEBREW_CCCFG" -exec xcrun make "$@" diff --git a/Library/ENV/4.3/mig b/Library/ENV/4.3/mig deleted file mode 100755 index a7a12557a..000000000 --- a/Library/ENV/4.3/mig +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -pwd="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -exec xcrun mig -cc $pwd/cc "$@" diff --git a/Library/ENV/4.3/pod2man b/Library/ENV/4.3/pod2man deleted file mode 100755 index 8e83f4bcb..000000000 --- a/Library/ENV/4.3/pod2man +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -POD2MAN=$(/usr/bin/which pod2man5.18 || /usr/bin/which pod2man5.16 || /usr/bin/which pod2man5.12 || /usr/bin/which $HOMEBREW_PREFIX/opt/pod2man/bin/pod2man || echo /usr/bin/pod2man) -exec $POD2MAN "$@" diff --git a/Library/ENV/4.3/sed b/Library/ENV/4.3/sed deleted file mode 100755 index 420e39669..000000000 --- a/Library/ENV/4.3/sed +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -if [[ $HOMEBREW_CCCFG == *s* ]]; then - # Fix issue with sed barfing on unicode characters on Mountain Lion - unset LC_ALL - export LC_CTYPE='C' -fi -exec /usr/bin/sed "$@" diff --git a/Library/ENV/4.3/svn b/Library/ENV/4.3/svn deleted file mode 120000 index e1231dfaa..000000000 --- a/Library/ENV/4.3/svn +++ /dev/null @@ -1 +0,0 @@ -../scm/svn \ No newline at end of file diff --git a/Library/ENV/4.3/xcrun b/Library/ENV/4.3/xcrun deleted file mode 100755 index 128f40ba2..000000000 --- a/Library/ENV/4.3/xcrun +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh -# Historically, xcrun has had various bugs, and in some cases it didn't -# work at all (e.g. CLT-only in the Xcode 4.3 era). This script emulates -# it and attempts to avoid these issues. - -# Some build tools set DEVELOPER_DIR, so discard it -unset DEVELOPER_DIR - -if [ $# -eq 0 ]; then - exec /usr/bin/xcrun "$@" -fi - -case "$1" in - -*) exec /usr/bin/xcrun "$@" ;; -esac - -arg0=$1 -shift - -exe="/usr/bin/${arg0}" -if [ -x "$exe" ]; then - if [ -n "$HOMEBREW_PREFER_CLT_PROXIES" ]; then - exec "$exe" "$@" - elif [ -z "$HOMEBREW_SDKROOT" -o ! -d "$HOMEBREW_SDKROOT" ]; then - exec "$exe" "$@" - fi -fi - -SUPERBIN=$(cd "${0%/*}" && pwd -P) - -exe=$(/usr/bin/xcrun --find "$arg0" 2>/dev/null) -if [ -x "$exe" -a "${exe%/*}" != "$SUPERBIN" ]; then - exec "$exe" "$@" -fi - -old_IFS=$IFS -IFS=: -for path in $PATH; do - if [ "$path" = "$SUPERBIN" ]; then - continue - fi - - exe="${path}/${arg0}" - if [ -x "$exe" ]; then - exec "$exe" "$@" - fi -done -IFS=$old_IFS - -echo >&2 " -Failed to execute $arg0 $@ - -Xcode and/or the CLT appear to be misconfigured. Try one or both of the following: - xcodebuild -license - sudo xcode-select -switch /path/to/Xcode.app -" -exit 1 diff --git a/Library/ENV/pkgconfig/10.10/libcurl.pc b/Library/ENV/pkgconfig/10.10/libcurl.pc deleted file mode 100644 index c11921350..000000000 --- a/Library/ENV/pkgconfig/10.10/libcurl.pc +++ /dev/null @@ -1,39 +0,0 @@ -#*************************************************************************** -# _ _ ____ _ -# Project ___| | | | _ \| | -# / __| | | | |_) | | -# | (__| |_| | _ <| |___ -# \___|\___/|_| \_\_____| -# -# Copyright (C) 2004 - 2007, Daniel Stenberg, , et al. -# -# This software is licensed as described in the file COPYING, which -# you should have received as part of this distribution. The terms -# are also available at http://curl.haxx.se/docs/copyright.html. -# -# You may opt to use, copy, modify, merge, publish, distribute and/or sell -# copies of the Software, and permit persons to whom the Software is -# furnished to do so, under the terms of the COPYING file. -# -# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -# KIND, either express or implied. -# -########################################################################### - -# This should most probably benefit from getting a "Requires:" field added -# dynamically by configure. -# -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include -supported_protocols="DICT FILE FTP FTPS GOPHER HTTP HTTPS IMAP IMAPS LDAP LDAPS POP3 POP3S RTSP SMB SMBS SMTP SMTPS TELNET TFTP" -supported_features="SSL IPv6 UnixSockets libz AsynchDNS GSS-API SPNEGO Kerberos NTLM NTLM_WB" - -Name: libcurl -URL: http://curl.haxx.se/ -Description: Library to transfer files with ftp, http, etc. -Version: 7.43.0 -Libs: -L${libdir} -lcurl -Libs.private: -lssl -lcrypto -Wl,-weak-lldap -Wl,-weak-lgssapi_krb5 -lresolv -lssl -lcrypto -lz -lz -Cflags: -I${includedir} diff --git a/Library/ENV/pkgconfig/10.10/libexslt.pc b/Library/ENV/pkgconfig/10.10/libexslt.pc deleted file mode 100644 index 48127cca1..000000000 --- a/Library/ENV/pkgconfig/10.10/libexslt.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - - -Name: libexslt -Version: 0.8.17 -Description: EXSLT Extension library -Requires: libxml-2.0 -Libs: -L${libdir} -lexslt -lxslt -lxml2 -lz -lpthread -licucore -lm -Cflags: -I${includedir} diff --git a/Library/ENV/pkgconfig/10.10/libxml-2.0.pc b/Library/ENV/pkgconfig/10.10/libxml-2.0.pc deleted file mode 100644 index d0f1d3b96..000000000 --- a/Library/ENV/pkgconfig/10.10/libxml-2.0.pc +++ /dev/null @@ -1,13 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include -modules=1 - -Name: libXML -Version: 2.9.0 -Description: libXML library version2. -Requires: -Libs: -L${libdir} -lxml2 -Libs.private: -lpthread -lz -lm -Cflags: -I${includedir}/libxml2 diff --git a/Library/ENV/pkgconfig/10.10/libxslt.pc b/Library/ENV/pkgconfig/10.10/libxslt.pc deleted file mode 100644 index 1bba1e368..000000000 --- a/Library/ENV/pkgconfig/10.10/libxslt.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - - -Name: libxslt -Version: 1.1.28 -Description: XSLT library version 2. -Requires: libxml-2.0 -Libs: -L${libdir} -lxslt -lxml2 -lz -lpthread -licucore -lm -Cflags: -I${includedir} diff --git a/Library/ENV/pkgconfig/10.10/sqlite3.pc b/Library/ENV/pkgconfig/10.10/sqlite3.pc deleted file mode 100644 index a80a074ed..000000000 --- a/Library/ENV/pkgconfig/10.10/sqlite3.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: SQLite -Description: SQL database engine -Version: 3.8.5 -Libs: -L${libdir} -lsqlite3 -Libs.private: -Cflags: -I${includedir} diff --git a/Library/ENV/pkgconfig/10.10/zlib.pc b/Library/ENV/pkgconfig/10.10/zlib.pc deleted file mode 100644 index c7bef6a9f..000000000 --- a/Library/ENV/pkgconfig/10.10/zlib.pc +++ /dev/null @@ -1,13 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -sharedlibdir=${libdir} -includedir=${prefix}/include - -Name: zlib -Description: zlib compression library -Version: 1.2.5 - -Requires: -Libs: -L${libdir} -L${sharedlibdir} -lz -Cflags: -I${includedir} diff --git a/Library/ENV/pkgconfig/10.11/libcurl.pc b/Library/ENV/pkgconfig/10.11/libcurl.pc deleted file mode 100644 index 34002ab9e..000000000 --- a/Library/ENV/pkgconfig/10.11/libcurl.pc +++ /dev/null @@ -1,39 +0,0 @@ -#*************************************************************************** -# _ _ ____ _ -# Project ___| | | | _ \| | -# / __| | | | |_) | | -# | (__| |_| | _ <| |___ -# \___|\___/|_| \_\_____| -# -# Copyright (C) 2004 - 2007, Daniel Stenberg, , et al. -# -# This software is licensed as described in the file COPYING, which -# you should have received as part of this distribution. The terms -# are also available at http://curl.haxx.se/docs/copyright.html. -# -# You may opt to use, copy, modify, merge, publish, distribute and/or sell -# copies of the Software, and permit persons to whom the Software is -# furnished to do so, under the terms of the COPYING file. -# -# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -# KIND, either express or implied. -# -########################################################################### - -# This should most probably benefit from getting a "Requires:" field added -# dynamically by configure. -# -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include -supported_protocols="DICT FILE FTP FTPS GOPHER HTTP HTTPS IMAP IMAPS LDAP LDAPS POP3 POP3S RTSP SMB SMBS SMTP SMTPS TELNET TFTP" -supported_features="Largefile Kerberos SPNEGO SSL IPv6 libz AsynchDNS NTLM NTLM_WB GSS-API UnixSockets" - -Name: libcurl -URL: http://curl.haxx.se/ -Description: Library to transfer files with ftp, http, etc. -Version: 7.43.0 -Libs: -L${libdir} -lcurl -Libs.private: -lssl -lcrypto -Wl,-weak-lldap -Wl,-weak-lgssapi_krb5 -lresolv -lssl -lcrypto -lz -lz -Cflags: -I${includedir} diff --git a/Library/ENV/pkgconfig/10.11/libexslt.pc b/Library/ENV/pkgconfig/10.11/libexslt.pc deleted file mode 100644 index 16276f715..000000000 --- a/Library/ENV/pkgconfig/10.11/libexslt.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - - -Name: libexslt -Version: 0.8.17 -Description: EXSLT Extension library -Requires: libxml-2.0 -Libs: -L${libdir} -lexslt -lxslt -lxml2 -lz -lpthread -licucore -lm -Cflags: -I${includedir} diff --git a/Library/ENV/pkgconfig/10.11/libxml-2.0.pc b/Library/ENV/pkgconfig/10.11/libxml-2.0.pc deleted file mode 100644 index 555f6f2c3..000000000 --- a/Library/ENV/pkgconfig/10.11/libxml-2.0.pc +++ /dev/null @@ -1,13 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include -modules=1 - -Name: libXML -Version: 2.9.2 -Description: libXML library version2. -Requires: -Libs: -L${libdir} -lxml2 -Libs.private: -lpthread -lz -lm -Cflags: -I${includedir}/libxml2 diff --git a/Library/ENV/pkgconfig/10.11/libxslt.pc b/Library/ENV/pkgconfig/10.11/libxslt.pc deleted file mode 100644 index 68df2c96f..000000000 --- a/Library/ENV/pkgconfig/10.11/libxslt.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - - -Name: libxslt -Version: 1.1.28 -Description: XSLT library version 2. -Requires: libxml-2.0 -Libs: -L${libdir} -lxslt -lxml2 -lz -lpthread -licucore -lm -Cflags: -I${includedir} diff --git a/Library/ENV/pkgconfig/10.11/sqlite3.pc b/Library/ENV/pkgconfig/10.11/sqlite3.pc deleted file mode 100644 index 820f65f17..000000000 --- a/Library/ENV/pkgconfig/10.11/sqlite3.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: SQLite -Description: SQL database engine -Version: 3.8.10.2 -Libs: -L${libdir} -lsqlite3 -Libs.private: -Cflags: -I${includedir} diff --git a/Library/ENV/pkgconfig/10.11/zlib.pc b/Library/ENV/pkgconfig/10.11/zlib.pc deleted file mode 100644 index c7bef6a9f..000000000 --- a/Library/ENV/pkgconfig/10.11/zlib.pc +++ /dev/null @@ -1,13 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -sharedlibdir=${libdir} -includedir=${prefix}/include - -Name: zlib -Description: zlib compression library -Version: 1.2.5 - -Requires: -Libs: -L${libdir} -L${sharedlibdir} -lz -Cflags: -I${includedir} diff --git a/Library/ENV/pkgconfig/10.12/libcurl.pc b/Library/ENV/pkgconfig/10.12/libcurl.pc deleted file mode 100644 index 1d23afdef..000000000 --- a/Library/ENV/pkgconfig/10.12/libcurl.pc +++ /dev/null @@ -1,39 +0,0 @@ -#*************************************************************************** -# _ _ ____ _ -# Project ___| | | | _ \| | -# / __| | | | |_) | | -# | (__| |_| | _ <| |___ -# \___|\___/|_| \_\_____| -# -# Copyright (C) 2004 - 2012, Daniel Stenberg, , et al. -# -# This software is licensed as described in the file COPYING, which -# you should have received as part of this distribution. The terms -# are also available at http://curl.haxx.se/docs/copyright.html. -# -# You may opt to use, copy, modify, merge, publish, distribute and/or sell -# copies of the Software, and permit persons to whom the Software is -# furnished to do so, under the terms of the COPYING file. -# -# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -# KIND, either express or implied. -# -########################################################################### - -# This should most probably benefit from getting a "Requires:" field added -# dynamically by configure. -# -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include -supported_protocols="DICT FILE FTP FTPS GOPHER HTTP HTTPS IMAP IMAPS LDAP LDAPS POP3 POP3S RTSP SMB SMBS SMTP SMTPS TELNET TFTP" -supported_features="Largefile Kerberos SPNEGO SSL IPv6 libz AsynchDNS NTLM NTLM_WB GSS-API UnixSockets" - -Name: libcurl -URL: https://curl.haxx.se/ -Description: Library to transfer files with ftp, http, etc. -Version: 7.43.0 -Libs: -L${libdir} -lcurl -Libs.private: -lssl -lcrypto -Wl,-weak-lldap -Wl,-weak-lgssapi_krb5 -lresolv -lssl -lcrypto -lz -lz -Cflags: -I${includedir} diff --git a/Library/ENV/pkgconfig/10.12/libexslt.pc b/Library/ENV/pkgconfig/10.12/libexslt.pc deleted file mode 100644 index 16276f715..000000000 --- a/Library/ENV/pkgconfig/10.12/libexslt.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - - -Name: libexslt -Version: 0.8.17 -Description: EXSLT Extension library -Requires: libxml-2.0 -Libs: -L${libdir} -lexslt -lxslt -lxml2 -lz -lpthread -licucore -lm -Cflags: -I${includedir} diff --git a/Library/ENV/pkgconfig/10.12/libxml-2.0.pc b/Library/ENV/pkgconfig/10.12/libxml-2.0.pc deleted file mode 100644 index 9ae964548..000000000 --- a/Library/ENV/pkgconfig/10.12/libxml-2.0.pc +++ /dev/null @@ -1,13 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include -modules=1 - -Name: libXML -Version: 2.9.4 -Description: libXML library version2. -Requires: -Libs: -L${libdir} -lxml2 -Libs.private: -lpthread -lz -lm -Cflags: -I${includedir}/libxml2 diff --git a/Library/ENV/pkgconfig/10.12/libxslt.pc b/Library/ENV/pkgconfig/10.12/libxslt.pc deleted file mode 100644 index 92d07a988..000000000 --- a/Library/ENV/pkgconfig/10.12/libxslt.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - - -Name: libxslt -Version: 1.1.29 -Description: XSLT library version 2. -Requires: libxml-2.0 -Libs: -L${libdir} -lxslt -lxml2 -lz -lpthread -licucore -lm -Cflags: -I${includedir} diff --git a/Library/ENV/pkgconfig/10.12/sqlite3.pc b/Library/ENV/pkgconfig/10.12/sqlite3.pc deleted file mode 100644 index 98c1575eb..000000000 --- a/Library/ENV/pkgconfig/10.12/sqlite3.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: SQLite -Description: SQL database engine -Version: 3.13.0 -Libs: -L${libdir} -lsqlite3 -Libs.private: -Cflags: -I${includedir} diff --git a/Library/ENV/pkgconfig/10.12/zlib.pc b/Library/ENV/pkgconfig/10.12/zlib.pc deleted file mode 100644 index c7bef6a9f..000000000 --- a/Library/ENV/pkgconfig/10.12/zlib.pc +++ /dev/null @@ -1,13 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -sharedlibdir=${libdir} -includedir=${prefix}/include - -Name: zlib -Description: zlib compression library -Version: 1.2.5 - -Requires: -Libs: -L${libdir} -L${sharedlibdir} -lz -Cflags: -I${includedir} diff --git a/Library/ENV/pkgconfig/10.4 b/Library/ENV/pkgconfig/10.4 deleted file mode 120000 index 41c25a186..000000000 --- a/Library/ENV/pkgconfig/10.4 +++ /dev/null @@ -1 +0,0 @@ -10.5 \ No newline at end of file diff --git a/Library/ENV/pkgconfig/10.5/libcrypto.pc b/Library/ENV/pkgconfig/10.5/libcrypto.pc deleted file mode 100644 index 26cd08be3..000000000 --- a/Library/ENV/pkgconfig/10.5/libcrypto.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: OpenSSL-libcrypto -Description: OpenSSL cryptography library -Version: 0.9.7l -Requires: -Libs: -L${libdir} -lcrypto -lz -Cflags: -I${includedir} diff --git a/Library/ENV/pkgconfig/10.5/libcurl.pc b/Library/ENV/pkgconfig/10.5/libcurl.pc deleted file mode 100644 index a93a80294..000000000 --- a/Library/ENV/pkgconfig/10.5/libcurl.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: libcurl -URL: http://curl.haxx.se/ -Description: Library to transfer files with ftp, http, etc. -Version: 7.16.4 -Libs: -L${libdir} -lcurl -Libs.private: -lssl -lcrypto -Wl,-weak-lldap -Wl,-weak-lgssapi_krb5 -lresolv -lz -Cflags: -I${includedir} diff --git a/Library/ENV/pkgconfig/10.6/sqlite3.pc b/Library/ENV/pkgconfig/10.6/sqlite3.pc deleted file mode 100644 index 8e0269ed6..000000000 --- a/Library/ENV/pkgconfig/10.6/sqlite3.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: SQLite -Description: SQL database engine -Version: 3.6.12 -Libs: -L${libdir} -lsqlite3 -Libs.private: -Cflags: -I${includedir} diff --git a/Library/ENV/pkgconfig/10.6/zlib.pc b/Library/ENV/pkgconfig/10.6/zlib.pc deleted file mode 100644 index 47b08b1ea..000000000 --- a/Library/ENV/pkgconfig/10.6/zlib.pc +++ /dev/null @@ -1,13 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -sharedlibdir=${libdir} -includedir=${prefix}/include - -Name: zlib -Description: zlib compression library -Version: 1.2.3 - -Requires: -Libs: -L${libdir} -L${sharedlibdir} -lz -Cflags: -I${includedir} diff --git a/Library/ENV/pkgconfig/10.7/sqlite3.pc b/Library/ENV/pkgconfig/10.7/sqlite3.pc deleted file mode 100644 index 36daed3d3..000000000 --- a/Library/ENV/pkgconfig/10.7/sqlite3.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: SQLite -Description: SQL database engine -Version: 3.7.7 -Libs: -L${libdir} -lsqlite3 -Libs.private: -Cflags: -I${includedir} diff --git a/Library/ENV/pkgconfig/10.7/zlib.pc b/Library/ENV/pkgconfig/10.7/zlib.pc deleted file mode 100644 index c7bef6a9f..000000000 --- a/Library/ENV/pkgconfig/10.7/zlib.pc +++ /dev/null @@ -1,13 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -sharedlibdir=${libdir} -includedir=${prefix}/include - -Name: zlib -Description: zlib compression library -Version: 1.2.5 - -Requires: -Libs: -L${libdir} -L${sharedlibdir} -lz -Cflags: -I${includedir} diff --git a/Library/ENV/pkgconfig/10.8/libcurl.pc b/Library/ENV/pkgconfig/10.8/libcurl.pc deleted file mode 100644 index 04a729eef..000000000 --- a/Library/ENV/pkgconfig/10.8/libcurl.pc +++ /dev/null @@ -1,39 +0,0 @@ -#*************************************************************************** -# _ _ ____ _ -# Project ___| | | | _ \| | -# / __| | | | |_) | | -# | (__| |_| | _ <| |___ -# \___|\___/|_| \_\_____| -# -# Copyright (C) 2004 - 2007, Daniel Stenberg, , et al. -# -# This software is licensed as described in the file COPYING, which -# you should have received as part of this distribution. The terms -# are also available at http://curl.haxx.se/docs/copyright.html. -# -# You may opt to use, copy, modify, merge, publish, distribute and/or sell -# copies of the Software, and permit persons to whom the Software is -# furnished to do so, under the terms of the COPYING file. -# -# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -# KIND, either express or implied. -# -########################################################################### - -# This should most probably benefit from getting a "Requires:" field added -# dynamically by configure. -# -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include -supported_protocols="DICT FILE FTP FTPS GOPHER HTTP HTTPS IMAP IMAPS LDAP LDAPS POP3 POP3S RTSP SMTP SMTPS TELNET TFTP" -supported_features="SSL IPv6 libz AsynchDNS NTLM" - -Name: libcurl -URL: http://curl.haxx.se/ -Description: Library to transfer files with ftp, http, etc. -Version: 7.24.0 -Libs: -L${libdir} -lcurl -Libs.private: -lssl -lcrypto -Wl,-weak-lldap -Wl,-weak-lgssapi_krb5 -lresolv -lssl -lcrypto -lz -lz -Cflags: -I${includedir} diff --git a/Library/ENV/pkgconfig/10.8/libexslt.pc b/Library/ENV/pkgconfig/10.8/libexslt.pc deleted file mode 100644 index a4214673b..000000000 --- a/Library/ENV/pkgconfig/10.8/libexslt.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - - -Name: libexslt -Version: 0.8.15 -Description: EXSLT Extension library -Requires: libxml-2.0 -Libs: -L${libdir} -lexslt -lxslt -lxml2 -lz -lpthread -licucore -lm -Cflags: -I${includedir} diff --git a/Library/ENV/pkgconfig/10.8/libxml-2.0.pc b/Library/ENV/pkgconfig/10.8/libxml-2.0.pc deleted file mode 100644 index 02a359e55..000000000 --- a/Library/ENV/pkgconfig/10.8/libxml-2.0.pc +++ /dev/null @@ -1,13 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include -modules=1 - -Name: libXML -Version: 2.7.8 -Description: libXML library version2. -Requires: -Libs: -L${libdir} -lxml2 -Libs.private: -lpthread -lz -lm -Cflags: -I${includedir}/libxml2 diff --git a/Library/ENV/pkgconfig/10.8/libxslt.pc b/Library/ENV/pkgconfig/10.8/libxslt.pc deleted file mode 100644 index a52e9aacd..000000000 --- a/Library/ENV/pkgconfig/10.8/libxslt.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - - -Name: libxslt -Version: 1.1.26 -Description: XSLT library version 2. -Requires: libxml-2.0 -Libs: -L${libdir} -lxslt -lxml2 -lz -lpthread -licucore -lm -Cflags: -I${includedir} diff --git a/Library/ENV/pkgconfig/10.8/sqlite3.pc b/Library/ENV/pkgconfig/10.8/sqlite3.pc deleted file mode 100644 index 28a75568c..000000000 --- a/Library/ENV/pkgconfig/10.8/sqlite3.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: SQLite -Description: SQL database engine -Version: 3.7.12 -Libs: -L${libdir} -lsqlite3 -Libs.private: -Cflags: -I${includedir} diff --git a/Library/ENV/pkgconfig/10.8/zlib.pc b/Library/ENV/pkgconfig/10.8/zlib.pc deleted file mode 100644 index c7bef6a9f..000000000 --- a/Library/ENV/pkgconfig/10.8/zlib.pc +++ /dev/null @@ -1,13 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -sharedlibdir=${libdir} -includedir=${prefix}/include - -Name: zlib -Description: zlib compression library -Version: 1.2.5 - -Requires: -Libs: -L${libdir} -L${sharedlibdir} -lz -Cflags: -I${includedir} diff --git a/Library/ENV/pkgconfig/10.9/libcurl.pc b/Library/ENV/pkgconfig/10.9/libcurl.pc deleted file mode 100644 index fe7892143..000000000 --- a/Library/ENV/pkgconfig/10.9/libcurl.pc +++ /dev/null @@ -1,39 +0,0 @@ -#*************************************************************************** -# _ _ ____ _ -# Project ___| | | | _ \| | -# / __| | | | |_) | | -# | (__| |_| | _ <| |___ -# \___|\___/|_| \_\_____| -# -# Copyright (C) 2004 - 2007, Daniel Stenberg, , et al. -# -# This software is licensed as described in the file COPYING, which -# you should have received as part of this distribution. The terms -# are also available at http://curl.haxx.se/docs/copyright.html. -# -# You may opt to use, copy, modify, merge, publish, distribute and/or sell -# copies of the Software, and permit persons to whom the Software is -# furnished to do so, under the terms of the COPYING file. -# -# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -# KIND, either express or implied. -# -########################################################################### - -# This should most probably benefit from getting a "Requires:" field added -# dynamically by configure. -# -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include -supported_protocols="DICT FILE FTP FTPS GOPHER HTTP HTTPS IMAP IMAPS LDAP LDAPS POP3 POP3S RTSP SMTP SMTPS TELNET TFTP" -supported_features="SSL IPv6 libz AsynchDNS NTLM" - -Name: libcurl -URL: http://curl.haxx.se/ -Description: Library to transfer files with ftp, http, etc. -Version: 7.30.0 -Libs: -L${libdir} -lcurl -Libs.private: -lssl -lcrypto -Wl,-weak-lldap -Wl,-weak-lgssapi_krb5 -lresolv -lssl -lcrypto -lz -lz -Cflags: -I${includedir} diff --git a/Library/ENV/pkgconfig/10.9/libexslt.pc b/Library/ENV/pkgconfig/10.9/libexslt.pc deleted file mode 100644 index 48127cca1..000000000 --- a/Library/ENV/pkgconfig/10.9/libexslt.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - - -Name: libexslt -Version: 0.8.17 -Description: EXSLT Extension library -Requires: libxml-2.0 -Libs: -L${libdir} -lexslt -lxslt -lxml2 -lz -lpthread -licucore -lm -Cflags: -I${includedir} diff --git a/Library/ENV/pkgconfig/10.9/libxml-2.0.pc b/Library/ENV/pkgconfig/10.9/libxml-2.0.pc deleted file mode 100644 index d0f1d3b96..000000000 --- a/Library/ENV/pkgconfig/10.9/libxml-2.0.pc +++ /dev/null @@ -1,13 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include -modules=1 - -Name: libXML -Version: 2.9.0 -Description: libXML library version2. -Requires: -Libs: -L${libdir} -lxml2 -Libs.private: -lpthread -lz -lm -Cflags: -I${includedir}/libxml2 diff --git a/Library/ENV/pkgconfig/10.9/libxslt.pc b/Library/ENV/pkgconfig/10.9/libxslt.pc deleted file mode 100644 index 1bba1e368..000000000 --- a/Library/ENV/pkgconfig/10.9/libxslt.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - - -Name: libxslt -Version: 1.1.28 -Description: XSLT library version 2. -Requires: libxml-2.0 -Libs: -L${libdir} -lxslt -lxml2 -lz -lpthread -licucore -lm -Cflags: -I${includedir} diff --git a/Library/ENV/pkgconfig/10.9/sqlite3.pc b/Library/ENV/pkgconfig/10.9/sqlite3.pc deleted file mode 100644 index 08588adc7..000000000 --- a/Library/ENV/pkgconfig/10.9/sqlite3.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: SQLite -Description: SQL database engine -Version: 3.7.13 -Libs: -L${libdir} -lsqlite3 -Libs.private: -Cflags: -I${includedir} diff --git a/Library/ENV/pkgconfig/10.9/zlib.pc b/Library/ENV/pkgconfig/10.9/zlib.pc deleted file mode 100644 index c7bef6a9f..000000000 --- a/Library/ENV/pkgconfig/10.9/zlib.pc +++ /dev/null @@ -1,13 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -sharedlibdir=${libdir} -includedir=${prefix}/include - -Name: zlib -Description: zlib compression library -Version: 1.2.5 - -Requires: -Libs: -L${libdir} -L${sharedlibdir} -lz -Cflags: -I${includedir} diff --git a/Library/ENV/pkgconfig/fuse/fuse.pc b/Library/ENV/pkgconfig/fuse/fuse.pc deleted file mode 120000 index 30b17c659..000000000 --- a/Library/ENV/pkgconfig/fuse/fuse.pc +++ /dev/null @@ -1 +0,0 @@ -/usr/local/lib/pkgconfig/fuse.pc \ No newline at end of file diff --git a/Library/ENV/pkgconfig/fuse/osxfuse.pc b/Library/ENV/pkgconfig/fuse/osxfuse.pc deleted file mode 120000 index 153a5d6e2..000000000 --- a/Library/ENV/pkgconfig/fuse/osxfuse.pc +++ /dev/null @@ -1 +0,0 @@ -/usr/local/lib/pkgconfig/osxfuse.pc \ No newline at end of file diff --git a/Library/ENV/scm/git b/Library/ENV/scm/git deleted file mode 100755 index f277f6bb9..000000000 --- a/Library/ENV/scm/git +++ /dev/null @@ -1,120 +0,0 @@ -#!/bin/bash - -# This script because we support $GIT, $HOMEBREW_SVN, etc., Xcode-only and -# no Xcode/CLT configurations. Order is careful to be what the user would want. - -set +o posix - -quiet_safe_cd() { - cd "$1" >/dev/null || { echo "Error: failed to cd to $1" >&2; exit 1; } -} - -realpath() { - local path="$1" - local dir - local base - local dest - - dir="$(quiet_safe_cd "${path%/*}/" && pwd -P)" - base="${path##*/}" - path="$dir/$base" - - while [[ -L "$path" ]] - do - dest="$(readlink "$path")" - if [[ "$dest" = "/"* ]] - then - path="$dest" - else - path="$dir/$dest" - fi - dir="$(quiet_safe_cd "${path%/*}/" && pwd -P)" - base="${path##*/}" - path="$dir/$base" - done - - echo "$path" -} - -executable() { - local file="$1" - [[ -f "$file" && -x "$file" ]] -} - -lowercase() { - echo "$1" | tr '[:upper:]' '[:lower:]' -} - -safe_exec() { - local arg0="$1" - if ! executable "$arg0" - then - return - fi - # prevent fork-bombs - if [[ "$(lowercase "$arg0")" = "$SCM_FILE" || "$(realpath "$arg0")" = "$SCM_REAL" ]] - then - return - fi - if [[ "$HOMEBREW" = "print-path" ]] - then - echo "$arg0" - exit - fi - exec "$@" -} - -SCM_FILE="${0##*/}" -SCM_DIR="$(quiet_safe_cd "${0%/*}/" && pwd -P)" -SCM_REAL="$(realpath "$0")" - -if [[ "$1" = --homebrew=* ]] -then - HOMEBREW="${1:11}" - shift -fi - -case "$(lowercase "$SCM_FILE")" in - git) - [[ -n "$HOMEBREW_GIT" ]] && safe_exec "$(which "$HOMEBREW_GIT")" "$@" - [[ -n "$GIT" ]] && safe_exec "$(which "$GIT")" "$@" - ;; - svn) - [[ -n "$HOMEBREW_SVN" ]] && safe_exec "$(which "$HOMEBREW_SVN")" "$@" - ;; -esac - -brew_version="$(quiet_safe_cd "$SCM_DIR/../../../bin" && pwd -P)/$SCM_FILE" -safe_exec "$brew_version" "$@" - -IFS=$'\n' -for path in $(/usr/bin/which -a "$SCM_FILE" 2>/dev/null) -do - if [[ "$path" != "/usr/bin/$SCM_FILE" ]] - then - safe_exec "$path" "$@" - fi -done - -if executable "/usr/bin/xcode-select" -then - # xcode-select will return empty on no Xcode/CLT configuration. - # /usr/bin/ will be a popup stub under such configuration. - # xcrun hangs if xcode-select is set to "/" - xcode_path="$(/usr/bin/xcode-select -print-path 2>/dev/null)" - [[ -n "$xcode_path" ]] || popup_stub=1 - if [[ -z "$popup_stub" && "$xcode_path" != "/" ]] - then - path="$(/usr/bin/xcrun -find "$SCM_FILE" 2>/dev/null)" - safe_exec "$path" "$@" - fi -fi - -path="/Applications/Xcode.app/Contents/Developer/usr/bin/$SCM_FILE" -safe_exec "$path" "$@" - -path="/usr/bin/$SCM_FILE" -[[ -z "$popup_stub" ]] && safe_exec "$path" "$@" - -echo "You must: brew install $SCM_FILE" >&2 -exit 1 diff --git a/Library/ENV/scm/svn b/Library/ENV/scm/svn deleted file mode 120000 index 0899c2993..000000000 --- a/Library/ENV/scm/svn +++ /dev/null @@ -1 +0,0 @@ -git \ No newline at end of file diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh index 0d6a0fc06..49a15864f 100644 --- a/Library/Homebrew/cmd/update.sh +++ b/Library/Homebrew/cmd/update.sh @@ -14,7 +14,7 @@ source "$HOMEBREW_LIBRARY/Homebrew/utils/lock.sh" git() { if [[ -z "$GIT_EXECUTABLE" ]] then - GIT_EXECUTABLE="$("$HOMEBREW_LIBRARY/ENV/scm/git" --homebrew=print-path)" + GIT_EXECUTABLE="$("$HOMEBREW_LIBRARY/Homebrew/scm/git" --homebrew=print-path)" fi "$GIT_EXECUTABLE" "$@" } diff --git a/Library/Homebrew/config.rb b/Library/Homebrew/config.rb index 5ba079394..70a2386a9 100644 --- a/Library/Homebrew/config.rb +++ b/Library/Homebrew/config.rb @@ -14,8 +14,8 @@ HOMEBREW_REPOSITORY = Pathname.new(ENV["HOMEBREW_REPOSITORY"]) # Where we store most of Homebrew, taps, and various metadata HOMEBREW_LIBRARY = Pathname.new(ENV["HOMEBREW_LIBRARY"]) -# Where wrapper scripts for Git, Subversion, and various build tools are stored -HOMEBREW_ENV_PATH = HOMEBREW_LIBRARY/"ENV" +# Where shim scripts for various build and SCM tools are stored +HOMEBREW_SHIMS_PATH = HOMEBREW_LIBRARY/"Homebrew/shims" # Where we store lock files HOMEBREW_LOCK_DIR = HOMEBREW_LIBRARY/"Locks" diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/std.rb b/Library/Homebrew/extend/os/mac/extend/ENV/std.rb index 3485e2ce7..0b60e2472 100644 --- a/Library/Homebrew/extend/os/mac/extend/ENV/std.rb +++ b/Library/Homebrew/extend/os/mac/extend/ENV/std.rb @@ -31,7 +31,7 @@ module Stdenv end def homebrew_extra_pkg_config_paths - ["#{HOMEBREW_ENV_PATH}/pkgconfig/#{MacOS.version}"] + ["#{HOMEBREW_LIBRARY_PATH}/Homebrew/os/mac/pkgconfig/#{MacOS.version}"] end # Sets architecture-specific flags for every environment variable diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb index 77625f455..acd2efa62 100644 --- a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb +++ b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb @@ -3,8 +3,7 @@ module Superenv def self.bin return unless DevelopmentTools.installed? - bin = HOMEBREW_ENV_PATH.subdirs.reject { |d| d.basename.to_s > MacOS::Xcode.version }.max - bin.realpath unless bin.nil? + (HOMEBREW_SHIMS_PATH/"super").realpath end def effective_sysroot @@ -26,7 +25,8 @@ module Superenv # @private def homebrew_extra_pkg_config_paths - paths = ["#{HOMEBREW_ENV_PATH}/pkgconfig/#{MacOS.version}"] + paths = \ + ["#{HOMEBREW_LIBRARY_PATH}/Homebrew/os/mac/pkgconfig/#{MacOS.version}"] paths << "#{MacOS::X11.lib}/pkgconfig" << "#{MacOS::X11.share}/pkgconfig" if x11? paths end diff --git a/Library/Homebrew/os/mac/pkgconfig/10.10/libcurl.pc b/Library/Homebrew/os/mac/pkgconfig/10.10/libcurl.pc new file mode 100644 index 000000000..c11921350 --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.10/libcurl.pc @@ -0,0 +1,39 @@ +#*************************************************************************** +# _ _ ____ _ +# Project ___| | | | _ \| | +# / __| | | | |_) | | +# | (__| |_| | _ <| |___ +# \___|\___/|_| \_\_____| +# +# Copyright (C) 2004 - 2007, Daniel Stenberg, , et al. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://curl.haxx.se/docs/copyright.html. +# +# You may opt to use, copy, modify, merge, publish, distribute and/or sell +# copies of the Software, and permit persons to whom the Software is +# furnished to do so, under the terms of the COPYING file. +# +# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY +# KIND, either express or implied. +# +########################################################################### + +# This should most probably benefit from getting a "Requires:" field added +# dynamically by configure. +# +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include +supported_protocols="DICT FILE FTP FTPS GOPHER HTTP HTTPS IMAP IMAPS LDAP LDAPS POP3 POP3S RTSP SMB SMBS SMTP SMTPS TELNET TFTP" +supported_features="SSL IPv6 UnixSockets libz AsynchDNS GSS-API SPNEGO Kerberos NTLM NTLM_WB" + +Name: libcurl +URL: http://curl.haxx.se/ +Description: Library to transfer files with ftp, http, etc. +Version: 7.43.0 +Libs: -L${libdir} -lcurl +Libs.private: -lssl -lcrypto -Wl,-weak-lldap -Wl,-weak-lgssapi_krb5 -lresolv -lssl -lcrypto -lz -lz +Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.10/libexslt.pc b/Library/Homebrew/os/mac/pkgconfig/10.10/libexslt.pc new file mode 100644 index 000000000..48127cca1 --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.10/libexslt.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + + +Name: libexslt +Version: 0.8.17 +Description: EXSLT Extension library +Requires: libxml-2.0 +Libs: -L${libdir} -lexslt -lxslt -lxml2 -lz -lpthread -licucore -lm +Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.10/libxml-2.0.pc b/Library/Homebrew/os/mac/pkgconfig/10.10/libxml-2.0.pc new file mode 100644 index 000000000..d0f1d3b96 --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.10/libxml-2.0.pc @@ -0,0 +1,13 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include +modules=1 + +Name: libXML +Version: 2.9.0 +Description: libXML library version2. +Requires: +Libs: -L${libdir} -lxml2 +Libs.private: -lpthread -lz -lm +Cflags: -I${includedir}/libxml2 diff --git a/Library/Homebrew/os/mac/pkgconfig/10.10/libxslt.pc b/Library/Homebrew/os/mac/pkgconfig/10.10/libxslt.pc new file mode 100644 index 000000000..1bba1e368 --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.10/libxslt.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + + +Name: libxslt +Version: 1.1.28 +Description: XSLT library version 2. +Requires: libxml-2.0 +Libs: -L${libdir} -lxslt -lxml2 -lz -lpthread -licucore -lm +Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.10/sqlite3.pc b/Library/Homebrew/os/mac/pkgconfig/10.10/sqlite3.pc new file mode 100644 index 000000000..a80a074ed --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.10/sqlite3.pc @@ -0,0 +1,11 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: SQLite +Description: SQL database engine +Version: 3.8.5 +Libs: -L${libdir} -lsqlite3 +Libs.private: +Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.10/zlib.pc b/Library/Homebrew/os/mac/pkgconfig/10.10/zlib.pc new file mode 100644 index 000000000..c7bef6a9f --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.10/zlib.pc @@ -0,0 +1,13 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +sharedlibdir=${libdir} +includedir=${prefix}/include + +Name: zlib +Description: zlib compression library +Version: 1.2.5 + +Requires: +Libs: -L${libdir} -L${sharedlibdir} -lz +Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.11/libcurl.pc b/Library/Homebrew/os/mac/pkgconfig/10.11/libcurl.pc new file mode 100644 index 000000000..34002ab9e --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.11/libcurl.pc @@ -0,0 +1,39 @@ +#*************************************************************************** +# _ _ ____ _ +# Project ___| | | | _ \| | +# / __| | | | |_) | | +# | (__| |_| | _ <| |___ +# \___|\___/|_| \_\_____| +# +# Copyright (C) 2004 - 2007, Daniel Stenberg, , et al. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://curl.haxx.se/docs/copyright.html. +# +# You may opt to use, copy, modify, merge, publish, distribute and/or sell +# copies of the Software, and permit persons to whom the Software is +# furnished to do so, under the terms of the COPYING file. +# +# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY +# KIND, either express or implied. +# +########################################################################### + +# This should most probably benefit from getting a "Requires:" field added +# dynamically by configure. +# +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include +supported_protocols="DICT FILE FTP FTPS GOPHER HTTP HTTPS IMAP IMAPS LDAP LDAPS POP3 POP3S RTSP SMB SMBS SMTP SMTPS TELNET TFTP" +supported_features="Largefile Kerberos SPNEGO SSL IPv6 libz AsynchDNS NTLM NTLM_WB GSS-API UnixSockets" + +Name: libcurl +URL: http://curl.haxx.se/ +Description: Library to transfer files with ftp, http, etc. +Version: 7.43.0 +Libs: -L${libdir} -lcurl +Libs.private: -lssl -lcrypto -Wl,-weak-lldap -Wl,-weak-lgssapi_krb5 -lresolv -lssl -lcrypto -lz -lz +Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.11/libexslt.pc b/Library/Homebrew/os/mac/pkgconfig/10.11/libexslt.pc new file mode 100644 index 000000000..16276f715 --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.11/libexslt.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + + +Name: libexslt +Version: 0.8.17 +Description: EXSLT Extension library +Requires: libxml-2.0 +Libs: -L${libdir} -lexslt -lxslt -lxml2 -lz -lpthread -licucore -lm +Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.11/libxml-2.0.pc b/Library/Homebrew/os/mac/pkgconfig/10.11/libxml-2.0.pc new file mode 100644 index 000000000..555f6f2c3 --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.11/libxml-2.0.pc @@ -0,0 +1,13 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include +modules=1 + +Name: libXML +Version: 2.9.2 +Description: libXML library version2. +Requires: +Libs: -L${libdir} -lxml2 +Libs.private: -lpthread -lz -lm +Cflags: -I${includedir}/libxml2 diff --git a/Library/Homebrew/os/mac/pkgconfig/10.11/libxslt.pc b/Library/Homebrew/os/mac/pkgconfig/10.11/libxslt.pc new file mode 100644 index 000000000..68df2c96f --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.11/libxslt.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + + +Name: libxslt +Version: 1.1.28 +Description: XSLT library version 2. +Requires: libxml-2.0 +Libs: -L${libdir} -lxslt -lxml2 -lz -lpthread -licucore -lm +Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.11/sqlite3.pc b/Library/Homebrew/os/mac/pkgconfig/10.11/sqlite3.pc new file mode 100644 index 000000000..820f65f17 --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.11/sqlite3.pc @@ -0,0 +1,11 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: SQLite +Description: SQL database engine +Version: 3.8.10.2 +Libs: -L${libdir} -lsqlite3 +Libs.private: +Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.11/zlib.pc b/Library/Homebrew/os/mac/pkgconfig/10.11/zlib.pc new file mode 100644 index 000000000..c7bef6a9f --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.11/zlib.pc @@ -0,0 +1,13 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +sharedlibdir=${libdir} +includedir=${prefix}/include + +Name: zlib +Description: zlib compression library +Version: 1.2.5 + +Requires: +Libs: -L${libdir} -L${sharedlibdir} -lz +Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.12/libcurl.pc b/Library/Homebrew/os/mac/pkgconfig/10.12/libcurl.pc new file mode 100644 index 000000000..1d23afdef --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.12/libcurl.pc @@ -0,0 +1,39 @@ +#*************************************************************************** +# _ _ ____ _ +# Project ___| | | | _ \| | +# / __| | | | |_) | | +# | (__| |_| | _ <| |___ +# \___|\___/|_| \_\_____| +# +# Copyright (C) 2004 - 2012, Daniel Stenberg, , et al. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://curl.haxx.se/docs/copyright.html. +# +# You may opt to use, copy, modify, merge, publish, distribute and/or sell +# copies of the Software, and permit persons to whom the Software is +# furnished to do so, under the terms of the COPYING file. +# +# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY +# KIND, either express or implied. +# +########################################################################### + +# This should most probably benefit from getting a "Requires:" field added +# dynamically by configure. +# +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include +supported_protocols="DICT FILE FTP FTPS GOPHER HTTP HTTPS IMAP IMAPS LDAP LDAPS POP3 POP3S RTSP SMB SMBS SMTP SMTPS TELNET TFTP" +supported_features="Largefile Kerberos SPNEGO SSL IPv6 libz AsynchDNS NTLM NTLM_WB GSS-API UnixSockets" + +Name: libcurl +URL: https://curl.haxx.se/ +Description: Library to transfer files with ftp, http, etc. +Version: 7.43.0 +Libs: -L${libdir} -lcurl +Libs.private: -lssl -lcrypto -Wl,-weak-lldap -Wl,-weak-lgssapi_krb5 -lresolv -lssl -lcrypto -lz -lz +Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.12/libexslt.pc b/Library/Homebrew/os/mac/pkgconfig/10.12/libexslt.pc new file mode 100644 index 000000000..16276f715 --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.12/libexslt.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + + +Name: libexslt +Version: 0.8.17 +Description: EXSLT Extension library +Requires: libxml-2.0 +Libs: -L${libdir} -lexslt -lxslt -lxml2 -lz -lpthread -licucore -lm +Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.12/libxml-2.0.pc b/Library/Homebrew/os/mac/pkgconfig/10.12/libxml-2.0.pc new file mode 100644 index 000000000..9ae964548 --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.12/libxml-2.0.pc @@ -0,0 +1,13 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include +modules=1 + +Name: libXML +Version: 2.9.4 +Description: libXML library version2. +Requires: +Libs: -L${libdir} -lxml2 +Libs.private: -lpthread -lz -lm +Cflags: -I${includedir}/libxml2 diff --git a/Library/Homebrew/os/mac/pkgconfig/10.12/libxslt.pc b/Library/Homebrew/os/mac/pkgconfig/10.12/libxslt.pc new file mode 100644 index 000000000..92d07a988 --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.12/libxslt.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + + +Name: libxslt +Version: 1.1.29 +Description: XSLT library version 2. +Requires: libxml-2.0 +Libs: -L${libdir} -lxslt -lxml2 -lz -lpthread -licucore -lm +Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.12/sqlite3.pc b/Library/Homebrew/os/mac/pkgconfig/10.12/sqlite3.pc new file mode 100644 index 000000000..98c1575eb --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.12/sqlite3.pc @@ -0,0 +1,11 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: SQLite +Description: SQL database engine +Version: 3.13.0 +Libs: -L${libdir} -lsqlite3 +Libs.private: +Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.12/zlib.pc b/Library/Homebrew/os/mac/pkgconfig/10.12/zlib.pc new file mode 100644 index 000000000..c7bef6a9f --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.12/zlib.pc @@ -0,0 +1,13 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +sharedlibdir=${libdir} +includedir=${prefix}/include + +Name: zlib +Description: zlib compression library +Version: 1.2.5 + +Requires: +Libs: -L${libdir} -L${sharedlibdir} -lz +Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.4 b/Library/Homebrew/os/mac/pkgconfig/10.4 new file mode 120000 index 000000000..41c25a186 --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.4 @@ -0,0 +1 @@ +10.5 \ No newline at end of file diff --git a/Library/Homebrew/os/mac/pkgconfig/10.5/libcrypto.pc b/Library/Homebrew/os/mac/pkgconfig/10.5/libcrypto.pc new file mode 100644 index 000000000..26cd08be3 --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.5/libcrypto.pc @@ -0,0 +1,11 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: OpenSSL-libcrypto +Description: OpenSSL cryptography library +Version: 0.9.7l +Requires: +Libs: -L${libdir} -lcrypto -lz +Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.5/libcurl.pc b/Library/Homebrew/os/mac/pkgconfig/10.5/libcurl.pc new file mode 100644 index 000000000..a93a80294 --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.5/libcurl.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: libcurl +URL: http://curl.haxx.se/ +Description: Library to transfer files with ftp, http, etc. +Version: 7.16.4 +Libs: -L${libdir} -lcurl +Libs.private: -lssl -lcrypto -Wl,-weak-lldap -Wl,-weak-lgssapi_krb5 -lresolv -lz +Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.6/sqlite3.pc b/Library/Homebrew/os/mac/pkgconfig/10.6/sqlite3.pc new file mode 100644 index 000000000..8e0269ed6 --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.6/sqlite3.pc @@ -0,0 +1,11 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: SQLite +Description: SQL database engine +Version: 3.6.12 +Libs: -L${libdir} -lsqlite3 +Libs.private: +Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.6/zlib.pc b/Library/Homebrew/os/mac/pkgconfig/10.6/zlib.pc new file mode 100644 index 000000000..47b08b1ea --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.6/zlib.pc @@ -0,0 +1,13 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +sharedlibdir=${libdir} +includedir=${prefix}/include + +Name: zlib +Description: zlib compression library +Version: 1.2.3 + +Requires: +Libs: -L${libdir} -L${sharedlibdir} -lz +Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.7/sqlite3.pc b/Library/Homebrew/os/mac/pkgconfig/10.7/sqlite3.pc new file mode 100644 index 000000000..36daed3d3 --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.7/sqlite3.pc @@ -0,0 +1,11 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: SQLite +Description: SQL database engine +Version: 3.7.7 +Libs: -L${libdir} -lsqlite3 +Libs.private: +Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.7/zlib.pc b/Library/Homebrew/os/mac/pkgconfig/10.7/zlib.pc new file mode 100644 index 000000000..c7bef6a9f --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.7/zlib.pc @@ -0,0 +1,13 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +sharedlibdir=${libdir} +includedir=${prefix}/include + +Name: zlib +Description: zlib compression library +Version: 1.2.5 + +Requires: +Libs: -L${libdir} -L${sharedlibdir} -lz +Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.8/libcurl.pc b/Library/Homebrew/os/mac/pkgconfig/10.8/libcurl.pc new file mode 100644 index 000000000..04a729eef --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.8/libcurl.pc @@ -0,0 +1,39 @@ +#*************************************************************************** +# _ _ ____ _ +# Project ___| | | | _ \| | +# / __| | | | |_) | | +# | (__| |_| | _ <| |___ +# \___|\___/|_| \_\_____| +# +# Copyright (C) 2004 - 2007, Daniel Stenberg, , et al. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://curl.haxx.se/docs/copyright.html. +# +# You may opt to use, copy, modify, merge, publish, distribute and/or sell +# copies of the Software, and permit persons to whom the Software is +# furnished to do so, under the terms of the COPYING file. +# +# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY +# KIND, either express or implied. +# +########################################################################### + +# This should most probably benefit from getting a "Requires:" field added +# dynamically by configure. +# +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include +supported_protocols="DICT FILE FTP FTPS GOPHER HTTP HTTPS IMAP IMAPS LDAP LDAPS POP3 POP3S RTSP SMTP SMTPS TELNET TFTP" +supported_features="SSL IPv6 libz AsynchDNS NTLM" + +Name: libcurl +URL: http://curl.haxx.se/ +Description: Library to transfer files with ftp, http, etc. +Version: 7.24.0 +Libs: -L${libdir} -lcurl +Libs.private: -lssl -lcrypto -Wl,-weak-lldap -Wl,-weak-lgssapi_krb5 -lresolv -lssl -lcrypto -lz -lz +Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.8/libexslt.pc b/Library/Homebrew/os/mac/pkgconfig/10.8/libexslt.pc new file mode 100644 index 000000000..a4214673b --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.8/libexslt.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + + +Name: libexslt +Version: 0.8.15 +Description: EXSLT Extension library +Requires: libxml-2.0 +Libs: -L${libdir} -lexslt -lxslt -lxml2 -lz -lpthread -licucore -lm +Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.8/libxml-2.0.pc b/Library/Homebrew/os/mac/pkgconfig/10.8/libxml-2.0.pc new file mode 100644 index 000000000..02a359e55 --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.8/libxml-2.0.pc @@ -0,0 +1,13 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include +modules=1 + +Name: libXML +Version: 2.7.8 +Description: libXML library version2. +Requires: +Libs: -L${libdir} -lxml2 +Libs.private: -lpthread -lz -lm +Cflags: -I${includedir}/libxml2 diff --git a/Library/Homebrew/os/mac/pkgconfig/10.8/libxslt.pc b/Library/Homebrew/os/mac/pkgconfig/10.8/libxslt.pc new file mode 100644 index 000000000..a52e9aacd --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.8/libxslt.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + + +Name: libxslt +Version: 1.1.26 +Description: XSLT library version 2. +Requires: libxml-2.0 +Libs: -L${libdir} -lxslt -lxml2 -lz -lpthread -licucore -lm +Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.8/sqlite3.pc b/Library/Homebrew/os/mac/pkgconfig/10.8/sqlite3.pc new file mode 100644 index 000000000..28a75568c --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.8/sqlite3.pc @@ -0,0 +1,11 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: SQLite +Description: SQL database engine +Version: 3.7.12 +Libs: -L${libdir} -lsqlite3 +Libs.private: +Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.8/zlib.pc b/Library/Homebrew/os/mac/pkgconfig/10.8/zlib.pc new file mode 100644 index 000000000..c7bef6a9f --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.8/zlib.pc @@ -0,0 +1,13 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +sharedlibdir=${libdir} +includedir=${prefix}/include + +Name: zlib +Description: zlib compression library +Version: 1.2.5 + +Requires: +Libs: -L${libdir} -L${sharedlibdir} -lz +Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.9/libcurl.pc b/Library/Homebrew/os/mac/pkgconfig/10.9/libcurl.pc new file mode 100644 index 000000000..fe7892143 --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.9/libcurl.pc @@ -0,0 +1,39 @@ +#*************************************************************************** +# _ _ ____ _ +# Project ___| | | | _ \| | +# / __| | | | |_) | | +# | (__| |_| | _ <| |___ +# \___|\___/|_| \_\_____| +# +# Copyright (C) 2004 - 2007, Daniel Stenberg, , et al. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://curl.haxx.se/docs/copyright.html. +# +# You may opt to use, copy, modify, merge, publish, distribute and/or sell +# copies of the Software, and permit persons to whom the Software is +# furnished to do so, under the terms of the COPYING file. +# +# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY +# KIND, either express or implied. +# +########################################################################### + +# This should most probably benefit from getting a "Requires:" field added +# dynamically by configure. +# +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include +supported_protocols="DICT FILE FTP FTPS GOPHER HTTP HTTPS IMAP IMAPS LDAP LDAPS POP3 POP3S RTSP SMTP SMTPS TELNET TFTP" +supported_features="SSL IPv6 libz AsynchDNS NTLM" + +Name: libcurl +URL: http://curl.haxx.se/ +Description: Library to transfer files with ftp, http, etc. +Version: 7.30.0 +Libs: -L${libdir} -lcurl +Libs.private: -lssl -lcrypto -Wl,-weak-lldap -Wl,-weak-lgssapi_krb5 -lresolv -lssl -lcrypto -lz -lz +Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.9/libexslt.pc b/Library/Homebrew/os/mac/pkgconfig/10.9/libexslt.pc new file mode 100644 index 000000000..48127cca1 --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.9/libexslt.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + + +Name: libexslt +Version: 0.8.17 +Description: EXSLT Extension library +Requires: libxml-2.0 +Libs: -L${libdir} -lexslt -lxslt -lxml2 -lz -lpthread -licucore -lm +Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.9/libxml-2.0.pc b/Library/Homebrew/os/mac/pkgconfig/10.9/libxml-2.0.pc new file mode 100644 index 000000000..d0f1d3b96 --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.9/libxml-2.0.pc @@ -0,0 +1,13 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include +modules=1 + +Name: libXML +Version: 2.9.0 +Description: libXML library version2. +Requires: +Libs: -L${libdir} -lxml2 +Libs.private: -lpthread -lz -lm +Cflags: -I${includedir}/libxml2 diff --git a/Library/Homebrew/os/mac/pkgconfig/10.9/libxslt.pc b/Library/Homebrew/os/mac/pkgconfig/10.9/libxslt.pc new file mode 100644 index 000000000..1bba1e368 --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.9/libxslt.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + + +Name: libxslt +Version: 1.1.28 +Description: XSLT library version 2. +Requires: libxml-2.0 +Libs: -L${libdir} -lxslt -lxml2 -lz -lpthread -licucore -lm +Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.9/sqlite3.pc b/Library/Homebrew/os/mac/pkgconfig/10.9/sqlite3.pc new file mode 100644 index 000000000..08588adc7 --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.9/sqlite3.pc @@ -0,0 +1,11 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: SQLite +Description: SQL database engine +Version: 3.7.13 +Libs: -L${libdir} -lsqlite3 +Libs.private: +Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/10.9/zlib.pc b/Library/Homebrew/os/mac/pkgconfig/10.9/zlib.pc new file mode 100644 index 000000000..c7bef6a9f --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/10.9/zlib.pc @@ -0,0 +1,13 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +sharedlibdir=${libdir} +includedir=${prefix}/include + +Name: zlib +Description: zlib compression library +Version: 1.2.5 + +Requires: +Libs: -L${libdir} -L${sharedlibdir} -lz +Cflags: -I${includedir} diff --git a/Library/Homebrew/os/mac/pkgconfig/fuse/fuse.pc b/Library/Homebrew/os/mac/pkgconfig/fuse/fuse.pc new file mode 120000 index 000000000..30b17c659 --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/fuse/fuse.pc @@ -0,0 +1 @@ +/usr/local/lib/pkgconfig/fuse.pc \ No newline at end of file diff --git a/Library/Homebrew/os/mac/pkgconfig/fuse/osxfuse.pc b/Library/Homebrew/os/mac/pkgconfig/fuse/osxfuse.pc new file mode 120000 index 000000000..153a5d6e2 --- /dev/null +++ b/Library/Homebrew/os/mac/pkgconfig/fuse/osxfuse.pc @@ -0,0 +1 @@ +/usr/local/lib/pkgconfig/osxfuse.pc \ No newline at end of file diff --git a/Library/Homebrew/shims/scm/git b/Library/Homebrew/shims/scm/git new file mode 100755 index 000000000..10950ef07 --- /dev/null +++ b/Library/Homebrew/shims/scm/git @@ -0,0 +1,120 @@ +#!/bin/bash + +# This script because we support $GIT, $HOMEBREW_SVN, etc., Xcode-only and +# no Xcode/CLT configurations. Order is careful to be what the user would want. + +set +o posix + +quiet_safe_cd() { + cd "$1" >/dev/null || { echo "Error: failed to cd to $1" >&2; exit 1; } +} + +realpath() { + local path="$1" + local dir + local base + local dest + + dir="$(quiet_safe_cd "${path%/*}/" && pwd -P)" + base="${path##*/}" + path="$dir/$base" + + while [[ -L "$path" ]] + do + dest="$(readlink "$path")" + if [[ "$dest" = "/"* ]] + then + path="$dest" + else + path="$dir/$dest" + fi + dir="$(quiet_safe_cd "${path%/*}/" && pwd -P)" + base="${path##*/}" + path="$dir/$base" + done + + echo "$path" +} + +executable() { + local file="$1" + [[ -f "$file" && -x "$file" ]] +} + +lowercase() { + echo "$1" | tr '[:upper:]' '[:lower:]' +} + +safe_exec() { + local arg0="$1" + if ! executable "$arg0" + then + return + fi + # prevent fork-bombs + if [[ "$(lowercase "$arg0")" = "$SCM_FILE" || "$(realpath "$arg0")" = "$SCM_REAL" ]] + then + return + fi + if [[ "$HOMEBREW" = "print-path" ]] + then + echo "$arg0" + exit + fi + exec "$@" +} + +SCM_FILE="${0##*/}" +SCM_REAL="$(realpath "$0")" +SCM_DIR="$(quiet_safe_cd "${SCM_REAL%/*}/" && pwd -P)" + +if [[ "$1" = --homebrew=* ]] +then + HOMEBREW="${1:11}" + shift +fi + +case "$(lowercase "$SCM_FILE")" in + git) + [[ -n "$HOMEBREW_GIT" ]] && safe_exec "$(which "$HOMEBREW_GIT")" "$@" + [[ -n "$GIT" ]] && safe_exec "$(which "$GIT")" "$@" + ;; + svn) + [[ -n "$HOMEBREW_SVN" ]] && safe_exec "$(which "$HOMEBREW_SVN")" "$@" + ;; +esac + +brew_version="$(quiet_safe_cd "$SCM_DIR/../../../../bin" && pwd -P)/$SCM_FILE" +safe_exec "$brew_version" "$@" + +IFS=$'\n' +for path in $(/usr/bin/which -a "$SCM_FILE" 2>/dev/null) +do + if [[ "$path" != "/usr/bin/$SCM_FILE" ]] + then + safe_exec "$path" "$@" + fi +done + +if executable "/usr/bin/xcode-select" +then + # xcode-select will return empty on no Xcode/CLT configuration. + # /usr/bin/ will be a popup stub under such configuration. + # xcrun hangs if xcode-select is set to "/" + xcode_path="$(/usr/bin/xcode-select -print-path 2>/dev/null)" + [[ -n "$xcode_path" ]] || popup_stub=1 + if [[ -z "$popup_stub" && "$xcode_path" != "/" ]] + then + path="$(/usr/bin/xcrun -find "$SCM_FILE" 2>/dev/null)" + safe_exec "$path" "$@" + fi +fi + +path="/Applications/Xcode.app/Contents/Developer/usr/bin/$SCM_FILE" +safe_exec "$path" "$@" + +path="/usr/bin/$SCM_FILE" +[[ -z "$popup_stub" ]] && safe_exec "$path" "$@" + +echo "You must: brew install $SCM_FILE" >&2 +exit 1 diff --git a/Library/Homebrew/shims/scm/svn b/Library/Homebrew/shims/scm/svn new file mode 120000 index 000000000..0899c2993 --- /dev/null +++ b/Library/Homebrew/shims/scm/svn @@ -0,0 +1 @@ +git \ No newline at end of file diff --git a/Library/Homebrew/shims/super/ant b/Library/Homebrew/shims/super/ant new file mode 100755 index 000000000..f54bc2747 --- /dev/null +++ b/Library/Homebrew/shims/super/ant @@ -0,0 +1,5 @@ +#!/bin/bash +export HOMEBREW_CCCFG="O$HOMEBREW_CCCFG" +ant=/usr/bin/ant +[ -x "$ant" ] || ant="$(${HOMEBREW_BREW_FILE} --prefix ant)/bin/ant" +exec "$ant" "$@" diff --git a/Library/Homebrew/shims/super/apr-1-config b/Library/Homebrew/shims/super/apr-1-config new file mode 100755 index 000000000..40ad6478e --- /dev/null +++ b/Library/Homebrew/shims/super/apr-1-config @@ -0,0 +1,15 @@ +#!/bin/bash + +if [[ "$HOMEBREW_CCCFG" == *a* ]]; then + case "$1" in + --cc) echo "cc";; + --cpp) echo "cpp";; + --includedir) echo "$HOMEBREW_SDKROOT/usr/include/apr-1";; + --includes) echo "-isystem$HOMEBREW_SDKROOT/usr/include/apr-1";; + --apr-libtool) echo "glibtool";; + *) + exec xcrun apr-1-config "$@";; + esac +else + exec /usr/bin/apr-1-config "$@" +fi diff --git a/Library/Homebrew/shims/super/bsdmake b/Library/Homebrew/shims/super/bsdmake new file mode 100755 index 000000000..b61e1b2bc --- /dev/null +++ b/Library/Homebrew/shims/super/bsdmake @@ -0,0 +1,3 @@ +#!/bin/bash +export HOMEBREW_CCCFG="O$HOMEBREW_CCCFG" +exec xcrun bsdmake "$@" diff --git a/Library/Homebrew/shims/super/c++ b/Library/Homebrew/shims/super/c++ new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/c++ @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/c89 b/Library/Homebrew/shims/super/c89 new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/c89 @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/c99 b/Library/Homebrew/shims/super/c99 new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/c99 @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/cc b/Library/Homebrew/shims/super/cc new file mode 100755 index 000000000..e7ab6500f --- /dev/null +++ b/Library/Homebrew/shims/super/cc @@ -0,0 +1,364 @@ +#!/bin/sh +# Make sure this shim uses the same Ruby interpreter that is used by Homebrew. +unset RUBYLIB +unset RUBYOPT +if [ -z "$HOMEBREW_RUBY_PATH" ] +then + echo "${0##*/}: The build tool has reset ENV; --env=std required." >&2 + exit 1 +fi +exec "$HOMEBREW_RUBY_PATH" -x "$0" "$@" +#!/usr/bin/env ruby -W0 + +require "pathname" +require "set" + +class Cmd + attr_reader :config, :prefix, :cellar, :opt, :tmpdir, :sysroot, :deps + attr_reader :archflags, :optflags, :keg_regex, :formula_prefix + + def initialize(arg0, args) + @arg0 = arg0 + @args = args.freeze + @config = ENV.fetch("HOMEBREW_CCCFG") { "" } + @prefix = ENV["HOMEBREW_PREFIX"] + @cellar = ENV["HOMEBREW_CELLAR"] + @opt = ENV["HOMEBREW_OPT"] + @tmpdir = ENV["HOMEBREW_TEMP"] + @sysroot = ENV["HOMEBREW_SDKROOT"] + @archflags = ENV.fetch("HOMEBREW_ARCHFLAGS") { "" }.split(" ") + @optflags = ENV.fetch("HOMEBREW_OPTFLAGS") { "" }.split(" ") + @deps = Set.new(ENV.fetch("HOMEBREW_DEPENDENCIES") { "" }.split(",")) + @formula_prefix = ENV["HOMEBREW_FORMULA_PREFIX"] + # matches opt or cellar prefix and formula name + @keg_regex = %r[(#{Regexp.escape(opt)}|#{Regexp.escape(cellar)})/([\w\-_\+]+)] + end + + def mode + if @arg0 == "cpp" || @arg0 == "ld" + @arg0.to_sym + elsif @args.include? "-c" + if @arg0 =~ /(?:c|g|clang)\+\+/ + :cxx + else + :cc + end + elsif @args.include? "-E" + :ccE + else + if @arg0 =~ /(?:c|g|clang)\+\+/ + :cxxld + else + :ccld + end + end + end + + def tool + @tool ||= case @arg0 + when "ld" then "ld" + when "cpp" then "cpp" + when /\w\+\+(-\d(\.\d)?)?$/ + case ENV["HOMEBREW_CC"] + when /clang/ + "clang++" + when /llvm-gcc/ + "llvm-g++-4.2" + when /gcc(-\d(\.\d)?)?$/ + "g++" + $1.to_s + end + else + # Note that this is a universal fallback, so that we'll always invoke + # HOMEBREW_CC regardless of what name under which the tool was invoked. + ENV["HOMEBREW_CC"] + end + end + + def args + if @args.length == 1 && @args[0] == "-v" + # Don't add linker arguments if -v passed as sole option. This stops gcc + # -v with no other arguments from outputting a linker error. Some + # software uses gcc -v (wrongly) to sniff the GCC version. + return @args.dup + end + + if !refurbish_args? || tool == "ld" || configure? + args = @args.dup + else + args = refurbished_args + end + + if sysroot + if tool == "ld" + args << "-syslibroot" << sysroot + else + args << "-isysroot" << sysroot << "--sysroot=#{sysroot}" + end + end + + case mode + when :ccld + cflags + args + cppflags + ldflags + when :cxxld + cxxflags + args + cppflags + ldflags + when :cc + cflags + args + cppflags + when :cxx + cxxflags + args + cppflags + when :ccE + args + cppflags + when :cpp + args + cppflags + when :ld + ldflags + args + end + end + + def refurbished_args + @lset = Set.new(library_paths + system_library_paths) + @iset = Set.new(isystem_paths + include_paths) + + args = [] + enum = @args.each + + loop do + case arg = enum.next + when "-arch" + if permit_arch_flags? + args << arg << enum.next + else + enum.next + end + when "-m32", "-m64" + args << arg if permit_arch_flags? + when /^-Xarch_/ + refurbished = refurbish_arg(enum.next, enum) + unless refurbished.empty? + args << arg + args += refurbished + end + else + args += refurbish_arg(arg, enum) + end + end + + args + end + + def refurbish_arg(arg, enum) + args = [] + + case arg + when /^-g\d?$/, /^-gstabs\d+/, "-gstabs+", /^-ggdb\d?/, + /^-march=.+/, /^-mtune=.+/, /^-mcpu=.+/, + /^-O[0-9zs]?$/, "-fast", "-no-cpp-precomp", + "-pedantic", "-pedantic-errors", "-Wno-long-double", + "-Wno-unused-but-set-variable" + when "-fopenmp", "-lgomp", "-mno-fused-madd", "-fforce-addr", "-fno-defer-pop", + "-mno-dynamic-no-pic", "-fearly-inlining", /^-f(?:no-)?inline-functions-called-once/, + /^-finline-limit/, /^-f(?:no-)?check-new/, "-fno-delete-null-pointer-checks", + "-fcaller-saves", "-fthread-jumps", "-fno-reorder-blocks", "-fcse-skip-blocks", + "-frerun-cse-after-loop", "-frerun-loop-opt", "-fcse-follow-jumps", + "-fno-regmove", "-fno-for-scope", "-fno-tree-pre", "-fno-tree-dominator-opts", + "-fuse-linker-plugin" + # clang doesn't support these flags + args << arg unless tool =~ /^clang/ + when "--fast-math" + arg = "-ffast-math" if tool =~ /^clang/ + args << arg + when "-Wno-deprecated-register" + # older gccs don't support these flags + args << arg unless tool =~ /^g..-4.[02]/ + when /^-W[alp],/, /^-Wno-/ + args << arg + when /^-W.*/ + # prune warnings + when "-macosx_version_min", "-dylib_install_name" + args << "-Wl,#{arg},#{enum.next}" + when "-multiply_definedsuppress" + args << "-Wl,-multiply_defined,suppress" + when "-undefineddynamic_lookup" + args << "-Wl,-undefined,dynamic_lookup" + when /^-isysroot/, /^--sysroot/ + sdk = enum.next + # We set the sysroot for OS X SDKs + args << "-isysroot" << sdk unless sdk.downcase.include? "osx" + when "-dylib" + args << "-Wl,#{arg}" + when /^-I(.+)?/ + # Support both "-Ifoo" (one argument) and "-I foo" (two arguments) + val = chuzzle($1) || enum.next + path = canonical_path(val) + args << "-I#{val}" if keep?(path) && @iset.add?(path) + when /^-L(.+)?/ + val = chuzzle($1) || enum.next + path = canonical_path(val) + args << "-L#{val}" if keep?(path) && @lset.add?(path) + else + args << arg + end + + args + end + + def keep?(path) + # The logic in this method will eventually become the default, + # but is currently opt-in. + return keep_orig?(path) unless ENV["HOMEBREW_EXPERIMENTAL_FILTER_FLAGS_ON_DEPS"] + + # Allow references to self + if formula_prefix && path.start_with?("#{formula_prefix}/") + true + # first two paths: reject references to Cellar or opt paths + # for unspecified dependencies + elsif path.start_with?(cellar) || path.start_with?(opt) + dep = path[keg_regex, 2] + dep && @deps.include?(dep) + elsif path.start_with?(prefix) + true + else + # ignore MacPorts, Boxen's Homebrew, X11, fink + !path.start_with?("/opt/local", "/opt/boxen/homebrew", "/opt/X11", "/sw", "/usr/X11") + end + end + + # The original less-smart version of keep_orig; will eventually be removed + def keep_orig?(path) + path.start_with?(prefix, cellar, tmpdir) || !path.start_with?("/opt/local", "/opt/boxen/homebrew", "/opt/X11", "/sw", "/usr/X11") + end + + def cflags + args = [] + + return args unless refurbish_args? || configure? + + args << "-pipe" + args << "-w" unless configure? + args << "-#{ENV["HOMEBREW_OPTIMIZATION_LEVEL"]}" + args.concat(optflags) + args.concat(archflags) + args << "-std=#{@arg0}" if @arg0 =~ /c[89]9/ + args + end + + def cxxflags + args = cflags + args << "-std=c++11" if cxx11? + args << "-stdlib=libc++" if libcxx? + args << "-stdlib=libstdc++" if libstdcxx? + args + end + + def cppflags + path_flags("-isystem", isystem_paths) + path_flags("-I", include_paths) + end + + def ldflags + args = path_flags("-L", library_paths) + case mode + when :ld + args << "-headerpad_max_install_names" + when :ccld, :cxxld + args << "-Wl,-headerpad_max_install_names" + end + args + end + + def isystem_paths + path_split("HOMEBREW_ISYSTEM_PATHS") + end + + def include_paths + path_split("HOMEBREW_INCLUDE_PATHS") + end + + def library_paths + path_split("HOMEBREW_LIBRARY_PATHS") + end + + def system_library_paths + %W[#{sysroot}/usr/lib /usr/local/lib] + end + + def configure? + # configure scripts generated with autoconf 2.61 or later export as_nl + ENV.key? "as_nl" + end + + def refurbish_args? + config.include?("O") + end + + def cxx11? + config.include?("x") + end + + def libcxx? + config.include?("g") + end + + def libstdcxx? + config.include?("h") + end + + def permit_arch_flags? + config.include?("K") + end + + def canonical_path(path) + path = Pathname.new(path) + path = path.realpath if path.exist? + path.to_s + end + + def path_flags(prefix, paths) + paths = paths.uniq.select { |path| File.directory?(path) } + paths.map! { |path| prefix + path } + end + + def path_split(key) + ENV.fetch(key) { "" }.split(File::PATH_SEPARATOR) + end + + def chuzzle(val) + return val if val.nil? + val = val.chomp + return val unless val.empty? + end +end + +def log(basename, argv, tool, args) + return unless ENV.key?("HOMEBREW_CC_LOG_PATH") + + adds = args - argv + dels = argv - args + + s = "" + s << "#{basename} called with: #{argv.join(" ")}\n" + s << "superenv removed: #{dels.join(" ")}\n" unless dels.empty? + s << "superenv added: #{adds.join(" ")}\n" unless adds.empty? + s << "superenv executed: #{tool} #{args.join(" ")}\n\n" + File.open("#{ENV["HOMEBREW_CC_LOG_PATH"]}.cc", "a+") { |f| f.write(s) } +end + +if __FILE__ == $PROGRAM_NAME + ##################################################################### sanity + + if (cc = ENV["HOMEBREW_CC"]).nil? || cc.empty? || cc == "cc" + # those values are not allowed + ENV["HOMEBREW_CC"] = "clang" + end + + ####################################################################### main + + dirname, basename = File.split($0) + + cmd = Cmd.new(basename, ARGV) + tool = cmd.tool + args = cmd.args + + log(basename, ARGV, tool, args) + + args << { :close_others => false } if RUBY_VERSION >= "2.0" + exec "#{dirname}/xcrun", tool, *args +end diff --git a/Library/Homebrew/shims/super/clang b/Library/Homebrew/shims/super/clang new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/clang @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/clang++ b/Library/Homebrew/shims/super/clang++ new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/clang++ @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/cpp b/Library/Homebrew/shims/super/cpp new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/cpp @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/g++ b/Library/Homebrew/shims/super/g++ new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/g++ @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/g++-4.2 b/Library/Homebrew/shims/super/g++-4.2 new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/g++-4.2 @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/g++-4.3 b/Library/Homebrew/shims/super/g++-4.3 new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/g++-4.3 @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/g++-4.4 b/Library/Homebrew/shims/super/g++-4.4 new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/g++-4.4 @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/g++-4.5 b/Library/Homebrew/shims/super/g++-4.5 new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/g++-4.5 @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/g++-4.6 b/Library/Homebrew/shims/super/g++-4.6 new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/g++-4.6 @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/g++-4.7 b/Library/Homebrew/shims/super/g++-4.7 new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/g++-4.7 @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/g++-4.8 b/Library/Homebrew/shims/super/g++-4.8 new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/g++-4.8 @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/g++-4.9 b/Library/Homebrew/shims/super/g++-4.9 new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/g++-4.9 @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/g++-5 b/Library/Homebrew/shims/super/g++-5 new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/g++-5 @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/g++-6 b/Library/Homebrew/shims/super/g++-6 new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/g++-6 @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/gcc b/Library/Homebrew/shims/super/gcc new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/gcc @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/gcc-4.2 b/Library/Homebrew/shims/super/gcc-4.2 new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/gcc-4.2 @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/gcc-4.3 b/Library/Homebrew/shims/super/gcc-4.3 new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/gcc-4.3 @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/gcc-4.4 b/Library/Homebrew/shims/super/gcc-4.4 new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/gcc-4.4 @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/gcc-4.5 b/Library/Homebrew/shims/super/gcc-4.5 new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/gcc-4.5 @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/gcc-4.6 b/Library/Homebrew/shims/super/gcc-4.6 new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/gcc-4.6 @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/gcc-4.7 b/Library/Homebrew/shims/super/gcc-4.7 new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/gcc-4.7 @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/gcc-4.8 b/Library/Homebrew/shims/super/gcc-4.8 new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/gcc-4.8 @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/gcc-4.9 b/Library/Homebrew/shims/super/gcc-4.9 new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/gcc-4.9 @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/gcc-5 b/Library/Homebrew/shims/super/gcc-5 new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/gcc-5 @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/gcc-6 b/Library/Homebrew/shims/super/gcc-6 new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/gcc-6 @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/git b/Library/Homebrew/shims/super/git new file mode 120000 index 000000000..ba71181a5 --- /dev/null +++ b/Library/Homebrew/shims/super/git @@ -0,0 +1 @@ +../scm/git \ No newline at end of file diff --git a/Library/Homebrew/shims/super/gmake b/Library/Homebrew/shims/super/gmake new file mode 120000 index 000000000..ac08cdcf9 --- /dev/null +++ b/Library/Homebrew/shims/super/gmake @@ -0,0 +1 @@ +make \ No newline at end of file diff --git a/Library/Homebrew/shims/super/i686-apple-darwin11-llvm-g++-4.2 b/Library/Homebrew/shims/super/i686-apple-darwin11-llvm-g++-4.2 new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/i686-apple-darwin11-llvm-g++-4.2 @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/i686-apple-darwin11-llvm-gcc-4.2 b/Library/Homebrew/shims/super/i686-apple-darwin11-llvm-gcc-4.2 new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/i686-apple-darwin11-llvm-gcc-4.2 @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/ld b/Library/Homebrew/shims/super/ld new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/ld @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/llvm-g++ b/Library/Homebrew/shims/super/llvm-g++ new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/llvm-g++ @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/llvm-g++-4.2 b/Library/Homebrew/shims/super/llvm-g++-4.2 new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/llvm-g++-4.2 @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/llvm-gcc b/Library/Homebrew/shims/super/llvm-gcc new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/llvm-gcc @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/llvm-gcc-4.2 b/Library/Homebrew/shims/super/llvm-gcc-4.2 new file mode 120000 index 000000000..2652f5f42 --- /dev/null +++ b/Library/Homebrew/shims/super/llvm-gcc-4.2 @@ -0,0 +1 @@ +cc \ No newline at end of file diff --git a/Library/Homebrew/shims/super/make b/Library/Homebrew/shims/super/make new file mode 100755 index 000000000..f7089de36 --- /dev/null +++ b/Library/Homebrew/shims/super/make @@ -0,0 +1,3 @@ +#!/bin/bash +export HOMEBREW_CCCFG="O$HOMEBREW_CCCFG" +exec xcrun make "$@" diff --git a/Library/Homebrew/shims/super/mig b/Library/Homebrew/shims/super/mig new file mode 100755 index 000000000..a7a12557a --- /dev/null +++ b/Library/Homebrew/shims/super/mig @@ -0,0 +1,3 @@ +#!/bin/bash +pwd="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +exec xcrun mig -cc $pwd/cc "$@" diff --git a/Library/Homebrew/shims/super/pod2man b/Library/Homebrew/shims/super/pod2man new file mode 100755 index 000000000..8e83f4bcb --- /dev/null +++ b/Library/Homebrew/shims/super/pod2man @@ -0,0 +1,3 @@ +#!/bin/bash +POD2MAN=$(/usr/bin/which pod2man5.18 || /usr/bin/which pod2man5.16 || /usr/bin/which pod2man5.12 || /usr/bin/which $HOMEBREW_PREFIX/opt/pod2man/bin/pod2man || echo /usr/bin/pod2man) +exec $POD2MAN "$@" diff --git a/Library/Homebrew/shims/super/sed b/Library/Homebrew/shims/super/sed new file mode 100755 index 000000000..420e39669 --- /dev/null +++ b/Library/Homebrew/shims/super/sed @@ -0,0 +1,7 @@ +#!/bin/bash +if [[ $HOMEBREW_CCCFG == *s* ]]; then + # Fix issue with sed barfing on unicode characters on Mountain Lion + unset LC_ALL + export LC_CTYPE='C' +fi +exec /usr/bin/sed "$@" diff --git a/Library/Homebrew/shims/super/svn b/Library/Homebrew/shims/super/svn new file mode 120000 index 000000000..e1231dfaa --- /dev/null +++ b/Library/Homebrew/shims/super/svn @@ -0,0 +1 @@ +../scm/svn \ No newline at end of file diff --git a/Library/Homebrew/shims/super/xcrun b/Library/Homebrew/shims/super/xcrun new file mode 100755 index 000000000..128f40ba2 --- /dev/null +++ b/Library/Homebrew/shims/super/xcrun @@ -0,0 +1,57 @@ +#!/bin/sh +# Historically, xcrun has had various bugs, and in some cases it didn't +# work at all (e.g. CLT-only in the Xcode 4.3 era). This script emulates +# it and attempts to avoid these issues. + +# Some build tools set DEVELOPER_DIR, so discard it +unset DEVELOPER_DIR + +if [ $# -eq 0 ]; then + exec /usr/bin/xcrun "$@" +fi + +case "$1" in + -*) exec /usr/bin/xcrun "$@" ;; +esac + +arg0=$1 +shift + +exe="/usr/bin/${arg0}" +if [ -x "$exe" ]; then + if [ -n "$HOMEBREW_PREFER_CLT_PROXIES" ]; then + exec "$exe" "$@" + elif [ -z "$HOMEBREW_SDKROOT" -o ! -d "$HOMEBREW_SDKROOT" ]; then + exec "$exe" "$@" + fi +fi + +SUPERBIN=$(cd "${0%/*}" && pwd -P) + +exe=$(/usr/bin/xcrun --find "$arg0" 2>/dev/null) +if [ -x "$exe" -a "${exe%/*}" != "$SUPERBIN" ]; then + exec "$exe" "$@" +fi + +old_IFS=$IFS +IFS=: +for path in $PATH; do + if [ "$path" = "$SUPERBIN" ]; then + continue + fi + + exe="${path}/${arg0}" + if [ -x "$exe" ]; then + exec "$exe" "$@" + fi +done +IFS=$old_IFS + +echo >&2 " +Failed to execute $arg0 $@ + +Xcode and/or the CLT appear to be misconfigured. Try one or both of the following: + xcodebuild -license + sudo xcode-select -switch /path/to/Xcode.app +" +exit 1 diff --git a/Library/Homebrew/test/lib/config.rb b/Library/Homebrew/test/lib/config.rb index 91ef9fe8a..062bed33b 100644 --- a/Library/Homebrew/test/lib/config.rb +++ b/Library/Homebrew/test/lib/config.rb @@ -12,7 +12,7 @@ TEST_TMPDIR = ENV.fetch("HOMEBREW_TEST_TMPDIR") { |k| # Paths pointing into the Homebrew code base that persist across test runs HOMEBREW_LIBRARY_PATH = Pathname.new(File.expand_path("../../..", __FILE__)) -HOMEBREW_ENV_PATH = HOMEBREW_LIBRARY_PATH.parent+"ENV" +HOMEBREW_SHIMS_PATH = HOMEBREW_LIBRARY_PATH.parent+"Homebrew/shims" HOMEBREW_LOAD_PATH = [File.expand_path("..", __FILE__), HOMEBREW_LIBRARY_PATH].join(":") # Paths redirected to a temporary directory and wiped at the end of the test run diff --git a/Library/Homebrew/utils/git.rb b/Library/Homebrew/utils/git.rb index b4d86eb8a..837cc22e4 100644 --- a/Library/Homebrew/utils/git.rb +++ b/Library/Homebrew/utils/git.rb @@ -1,20 +1,20 @@ module Utils def self.git_available? return @git if instance_variable_defined?(:@git) - @git = quiet_system HOMEBREW_ENV_PATH/"scm/git", "--version" + @git = quiet_system HOMEBREW_SHIMS_PATH/"scm/git", "--version" end def self.git_path return unless git_available? @git_path ||= Utils.popen_read( - HOMEBREW_ENV_PATH/"scm/git", "--homebrew=print-path" + HOMEBREW_SHIMS_PATH/"scm/git", "--homebrew=print-path" ).chuzzle end def self.git_version return unless git_available? @git_version ||= Utils.popen_read( - HOMEBREW_ENV_PATH/"scm/git", "--version" + HOMEBREW_SHIMS_PATH/"scm/git", "--version" ).chomp[/git version (\d+(?:\.\d+)*)/, 1] end diff --git a/Library/brew.rb b/Library/brew.rb index c06aa735e..9110d5db0 100644 --- a/Library/brew.rb +++ b/Library/brew.rb @@ -55,7 +55,7 @@ begin end # Add SCM wrappers. - ENV["PATH"] += "#{File::PATH_SEPARATOR}#{HOMEBREW_ENV_PATH}/scm" + ENV["PATH"] += "#{File::PATH_SEPARATOR}#{HOMEBREW_SHIMS_PATH}/scm" if cmd internal_cmd = require? HOMEBREW_LIBRARY_PATH.join("cmd", cmd) diff --git a/Library/brew.sh b/Library/brew.sh index 03eaa4390..5dd1ce630 100644 --- a/Library/brew.sh +++ b/Library/brew.sh @@ -29,7 +29,7 @@ brew() { } git() { - "$HOMEBREW_LIBRARY/ENV/scm/git" "$@" + "$HOMEBREW_LIBRARY/Homebrew/shims/scm/git" "$@" } # Force UTF-8 to avoid encoding issues for users with broken locale settings. -- cgit v1.2.3