From 5875df6c958743cf86c75b2cb5fc2efe5ca0de43 Mon Sep 17 00:00:00 2001
From: Daniel Mueller <deso@posteo.net>
Date: Mon, 10 Dec 2018 20:51:50 -0800
Subject: Update pkg-config crate to 0.3.14

This change updates the pkg-config crate to version 0.3.14.

Import subrepo pkg-config/:pkg-config at f867f8be1babca4d6d9cddc92a817519ae845193
---
 pkg-config/README.md | 39 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 34 insertions(+), 5 deletions(-)

(limited to 'pkg-config/README.md')

diff --git a/pkg-config/README.md b/pkg-config/README.md
index 80e372a..cb9ebd5 100644
--- a/pkg-config/README.md
+++ b/pkg-config/README.md
@@ -1,8 +1,9 @@
 # pkg-config-rs
 
 [![Build Status](https://travis-ci.org/alexcrichton/pkg-config-rs.svg?branch=master)](https://travis-ci.org/alexcrichton/pkg-config-rs)
+[![Rust](https://img.shields.io/badge/rust-1.13%2B-blue.svg?maxAge=3600)](https://github.com/alexcrichton/pkg-config-rs/)
 
-[Documentation](http://alexcrichton.com/pkg-config-rs)
+[Documentation](https://docs.rs/pkg-config)
 
 A simple library meant to be used as a build dependency with Cargo packages in
 order to use the system `pkg-config` tool (if available) to determine where a
@@ -12,6 +13,8 @@ You can use this crate directly to probe for specific libraries, or use
 [metadeps](https://github.com/joshtriplett/metadeps) to declare all your
 `pkg-config` dependencies in `Cargo.toml`.
 
+This library requires Rust 1.13+.
+
 # Example
 
 Find the system library named `foo`, with minimum version 1.2.3:
@@ -35,10 +38,36 @@ fn main() {
 }
 ```
 
+# External configuration via target-scoped environment variables
+
+In cross-compilation context, it is useful to manage separately PKG_CONFIG_PATH
+and a few other variables for the `host` and the `target` platform.
+
+The supported variables are: `PKG_CONFIG_PATH`, `PKG_CONFIG_LIBDIR`, and
+`PKG_CONFIG_SYSROOT_DIR`.
+
+Each of these variables can also be supplied with certain prefixes and suffixes, in the following prioritized order:
+
+1. `<var>_<target>` - for example, `PKG_CONFIG_PATH_x86_64-unknown-linux-gnu`
+2. `<var>_<target_with_underscores>` - for example, `PKG_CONFIG_PATH_x86_64_unknown_linux_gnu`
+3. `<build-kind>_<var>` - for example, `HOST_PKG_CONFIG_PATH` or `TARGET_PKG_CONFIG_PATH`
+4. `<var>` - a plain `PKG_CONFIG_PATH`
+
+Also note that `PKG_CONFIG_ALLOW_CROSS` must always be set in cross-compilation context.
+
 # License
 
-`pkg-config-rs` is primarily distributed under the terms of both the MIT
-license and the Apache License (Version 2.0), with portions covered by various
-BSD-like licenses.
+This project is licensed under either of
+
+ * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
+   http://www.apache.org/licenses/LICENSE-2.0)
+ * MIT license ([LICENSE-MIT](LICENSE-MIT) or
+   http://opensource.org/licenses/MIT)
+
+at your option.
+
+### Contribution
 
-See LICENSE-APACHE, and LICENSE-MIT for details.
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in Serde by you, as defined in the Apache-2.0 license, shall be
+dual licensed as above, without any additional terms or conditions.
-- 
cgit v1.2.1