npth: remove obsolete pkgconfig patch

npth now provides a pkg-config itself[1] so we don't need to patch one
in anymore.

[1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git;a=commit;h=f3cbbc86cb49a1729d6df573bd76a5559e7f636b

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-support/npth/npth/pkgconfig.patch b/meta/recipes-support/npth/npth/pkgconfig.patch
deleted file mode 100644 (file)
index e736921..0000000
--- a/meta/recipes-support/npth/npth/pkgconfig.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From ff19a9648f1c7d93087e2c33ca64bb881d53ea5a Mon Sep 17 00:00:00 2001
-From: Saul Wold <sgw@linux.intel.com>
-Date: Mon, 10 Nov 2014 13:59:03 -0800
-Subject: [PATCH] Added npth pkgconfig file
-
-Upstream-Status: Pending
-
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
----
- configure.ac    |  1 +
- src/Makefile.am |  4 +++-
- src/npth.pc.in  | 10 ++++++++++
- 3 files changed, 14 insertions(+), 1 deletion(-)
- create mode 100644 src/npth.pc.in
-
-diff --git a/configure.ac b/configure.ac
-index 10f3629..65b76a1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -476,6 +476,7 @@ src/Makefile
- w32/Makefile
- tests/Makefile])
- AC_CONFIG_FILES(npth-config, chmod +x npth-config)
-+AC_CONFIG_FILES([src/npth.pc])
- AC_OUTPUT
- 
- echo "
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 7070118..6f01c64 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -17,8 +17,10 @@
- # License along with this program; if not, see <http://www.gnu.org/licenses/>.
- 
- ## Process this file with automake to produce Makefile.in
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = npth.pc
- 
--EXTRA_DIST = libnpth.vers
-+EXTRA_DIST = libnpth.vers npth.pc
- #          versioninfo.rc.in
- nodist_include_HEADERS = npth.h
- 
-diff --git a/src/npth.pc.in b/src/npth.pc.in
-new file mode 100644
-index 0000000..db091e8
---- /dev/null
-+++ b/src/npth.pc.in
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: npth
-+Description: a new portable posix threading library
-+Version: @VERSION@
-+Libs: -L${libdir} -lnpth -lpthread
-+Cflags: -I${includedir}

diff --git a/meta/recipes-support/npth/npth_1.7.bb b/meta/recipes-support/npth/npth_1.7.bb
index 45d4efb4a9cadb07cbe8e665870886af14148be3..038caebd3d6305d155c5b7a7a50c085736beca19 100644 (file)
--- a/meta/recipes-support/npth/npth_1.7.bb
+++ b/meta/recipes-support/npth/npth_1.7.bb
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2caced0b25dfefd4c601d92bd15116de"
 UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
 
 SRC_URI = "${GNUPG_MIRROR}/npth/npth-${PV}.tar.bz2 \
-           file://pkgconfig.patch \
            file://musl-fix.patch \
            "