summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2024-04-22 16:38:45 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-04-22 22:05:58 +0100
commitc93855ac4321f3ea2f7394adbbaf856872f69cfc (patch)
tree84ce9ad59d824670e357deefb0f114667057ec4f
parent7457153b8e91cf904abcff3b4654f507624b6e44 (diff)
downloadpoky-c93855ac4321f3ea2f7394adbbaf856872f69cfc.tar.gz
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 (From OE-Core rev: 4461a30665e59834ba603929aadec27c9e719a6e) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/npth/npth/pkgconfig.patch59
-rw-r--r--meta/recipes-support/npth/npth_1.7.bb1
2 files changed, 0 insertions, 60 deletions
diff --git a/meta/recipes-support/npth/npth/pkgconfig.patch b/meta/recipes-support/npth/npth/pkgconfig.patch
deleted file mode 100644
index e736921b43..0000000000
--- a/meta/recipes-support/npth/npth/pkgconfig.patch
+++ /dev/null
@@ -1,59 +0,0 @@
1From ff19a9648f1c7d93087e2c33ca64bb881d53ea5a Mon Sep 17 00:00:00 2001
2From: Saul Wold <sgw@linux.intel.com>
3Date: Mon, 10 Nov 2014 13:59:03 -0800
4Subject: [PATCH] Added npth pkgconfig file
5
6Upstream-Status: Pending
7
8Signed-off-by: Saul Wold <sgw@linux.intel.com>
9---
10 configure.ac | 1 +
11 src/Makefile.am | 4 +++-
12 src/npth.pc.in | 10 ++++++++++
13 3 files changed, 14 insertions(+), 1 deletion(-)
14 create mode 100644 src/npth.pc.in
15
16diff --git a/configure.ac b/configure.ac
17index 10f3629..65b76a1 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -476,6 +476,7 @@ src/Makefile
21 w32/Makefile
22 tests/Makefile])
23 AC_CONFIG_FILES(npth-config, chmod +x npth-config)
24+AC_CONFIG_FILES([src/npth.pc])
25 AC_OUTPUT
26
27 echo "
28diff --git a/src/Makefile.am b/src/Makefile.am
29index 7070118..6f01c64 100644
30--- a/src/Makefile.am
31+++ b/src/Makefile.am
32@@ -17,8 +17,10 @@
33 # License along with this program; if not, see <http://www.gnu.org/licenses/>.
34
35 ## Process this file with automake to produce Makefile.in
36+pkgconfigdir = $(libdir)/pkgconfig
37+pkgconfig_DATA = npth.pc
38
39-EXTRA_DIST = libnpth.vers
40+EXTRA_DIST = libnpth.vers npth.pc
41 # versioninfo.rc.in
42 nodist_include_HEADERS = npth.h
43
44diff --git a/src/npth.pc.in b/src/npth.pc.in
45new file mode 100644
46index 0000000..db091e8
47--- /dev/null
48+++ b/src/npth.pc.in
49@@ -0,0 +1,10 @@
50+prefix=@prefix@
51+exec_prefix=@exec_prefix@
52+libdir=@libdir@
53+includedir=@includedir@
54+
55+Name: npth
56+Description: a new portable posix threading library
57+Version: @VERSION@
58+Libs: -L${libdir} -lnpth -lpthread
59+Cflags: -I${includedir}
diff --git a/meta/recipes-support/npth/npth_1.7.bb b/meta/recipes-support/npth/npth_1.7.bb
index 45d4efb4a9..038caebd3d 100644
--- 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"
7UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" 7UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
8 8
9SRC_URI = "${GNUPG_MIRROR}/npth/npth-${PV}.tar.bz2 \ 9SRC_URI = "${GNUPG_MIRROR}/npth/npth-${PV}.tar.bz2 \
10 file://pkgconfig.patch \
11 file://musl-fix.patch \ 10 file://musl-fix.patch \
12 " 11 "
13 12