From 878747d45881fafa64723284bb2fd769d94f722c Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Fri, 8 Mar 2013 18:10:35 -0600 Subject: Index pkgconfig directories by MacOS.version --- 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.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/leopard/libcrypto.pc | 11 ------- Library/ENV/pkgconfig/leopard/libcurl.pc | 12 ------- Library/ENV/pkgconfig/mountain_lion/libcurl.pc | 39 ----------------------- Library/ENV/pkgconfig/mountain_lion/libexslt.pc | 12 ------- Library/ENV/pkgconfig/mountain_lion/libxml-2.0.pc | 13 -------- Library/ENV/pkgconfig/mountain_lion/libxslt.pc | 12 ------- Library/Homebrew/extend/ENV.rb | 3 +- Library/Homebrew/superenv.rb | 3 +- 15 files changed, 102 insertions(+), 103 deletions(-) create mode 120000 Library/ENV/pkgconfig/10.4 create mode 100644 Library/ENV/pkgconfig/10.5/libcrypto.pc create mode 100644 Library/ENV/pkgconfig/10.5/libcurl.pc create mode 100644 Library/ENV/pkgconfig/10.8/libcurl.pc create mode 100644 Library/ENV/pkgconfig/10.8/libexslt.pc create mode 100644 Library/ENV/pkgconfig/10.8/libxml-2.0.pc create mode 100644 Library/ENV/pkgconfig/10.8/libxslt.pc delete mode 100644 Library/ENV/pkgconfig/leopard/libcrypto.pc delete mode 100644 Library/ENV/pkgconfig/leopard/libcurl.pc delete mode 100644 Library/ENV/pkgconfig/mountain_lion/libcurl.pc delete mode 100644 Library/ENV/pkgconfig/mountain_lion/libexslt.pc delete mode 100644 Library/ENV/pkgconfig/mountain_lion/libxml-2.0.pc delete mode 100644 Library/ENV/pkgconfig/mountain_lion/libxslt.pc (limited to 'Library') diff --git a/Library/ENV/pkgconfig/10.4 b/Library/ENV/pkgconfig/10.4 new file mode 120000 index 000000000..41c25a186 --- /dev/null +++ b/Library/ENV/pkgconfig/10.4 @@ -0,0 +1 @@ +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 new file mode 100644 index 000000000..26cd08be3 --- /dev/null +++ b/Library/ENV/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/ENV/pkgconfig/10.5/libcurl.pc b/Library/ENV/pkgconfig/10.5/libcurl.pc new file mode 100644 index 000000000..a93a80294 --- /dev/null +++ b/Library/ENV/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/ENV/pkgconfig/10.8/libcurl.pc b/Library/ENV/pkgconfig/10.8/libcurl.pc new file mode 100644 index 000000000..cb2ebf4a5 --- /dev/null +++ b/Library/ENV/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.21.4 +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 new file mode 100644 index 000000000..c0b5f22da --- /dev/null +++ b/Library/ENV/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.13 +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 new file mode 100644 index 000000000..b2aac2a8b --- /dev/null +++ b/Library/ENV/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.3 +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 new file mode 100644 index 000000000..60fdd436c --- /dev/null +++ b/Library/ENV/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.24 +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/leopard/libcrypto.pc b/Library/ENV/pkgconfig/leopard/libcrypto.pc deleted file mode 100644 index 26cd08be3..000000000 --- a/Library/ENV/pkgconfig/leopard/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/leopard/libcurl.pc b/Library/ENV/pkgconfig/leopard/libcurl.pc deleted file mode 100644 index a93a80294..000000000 --- a/Library/ENV/pkgconfig/leopard/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/mountain_lion/libcurl.pc b/Library/ENV/pkgconfig/mountain_lion/libcurl.pc deleted file mode 100644 index cb2ebf4a5..000000000 --- a/Library/ENV/pkgconfig/mountain_lion/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.21.4 -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/mountain_lion/libexslt.pc b/Library/ENV/pkgconfig/mountain_lion/libexslt.pc deleted file mode 100644 index c0b5f22da..000000000 --- a/Library/ENV/pkgconfig/mountain_lion/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.13 -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/mountain_lion/libxml-2.0.pc b/Library/ENV/pkgconfig/mountain_lion/libxml-2.0.pc deleted file mode 100644 index b2aac2a8b..000000000 --- a/Library/ENV/pkgconfig/mountain_lion/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.3 -Description: libXML library version2. -Requires: -Libs: -L${libdir} -lxml2 -Libs.private: -lpthread -lz -lm -Cflags: -I${includedir}/libxml2 diff --git a/Library/ENV/pkgconfig/mountain_lion/libxslt.pc b/Library/ENV/pkgconfig/mountain_lion/libxslt.pc deleted file mode 100644 index 60fdd436c..000000000 --- a/Library/ENV/pkgconfig/mountain_lion/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.24 -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/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index c8b567239..ff51ced66 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/Library/Homebrew/extend/ENV.rb @@ -69,8 +69,7 @@ module HomebrewEnvExtension paths = [] paths << HOMEBREW_PREFIX/'lib/pkgconfig' paths << HOMEBREW_PREFIX/'share/pkgconfig' - paths << HOMEBREW_REPOSITORY/'Library/ENV/pkgconfig/mountain_lion' if MacOS.version >= :mountain_lion - paths << HOMEBREW_REPOSITORY/'Library/ENV/pkgconfig/leopard' if MacOS.version <= :leopard + paths << HOMEBREW_REPOSITORY/"Library/ENV/pkgconfig/#{MacOS.version}" paths << '/usr/lib/pkgconfig' paths.select { |d| File.directory? d }.join(':') end diff --git a/Library/Homebrew/superenv.rb b/Library/Homebrew/superenv.rb index 79e8a396b..36dead356 100644 --- a/Library/Homebrew/superenv.rb +++ b/Library/Homebrew/superenv.rb @@ -127,8 +127,7 @@ class << ENV paths << "#{HOMEBREW_PREFIX}/share/pkgconfig" # we put our paths before X because we dupe some of the X libraries paths << "#{MacSystem.x11_prefix}/lib/pkgconfig" << "#{MacSystem.x11_prefix}/share/pkgconfig" if x11? - # Mountain Lion no longer ships some .pcs; ensure we pick up our versions - paths << "#{HOMEBREW_REPOSITORY}/Library/ENV/pkgconfig/mountain_lion" if MacOS.version >= :mountain_lion + paths << "#{HOMEBREW_REPOSITORY}/Library/ENV/pkgconfig/#{MacOS.version}" paths.to_path_s end -- cgit v1.2.3