diff options
author | Saul Wold <sgw@linux.intel.com> | 2014-11-10 13:59:03 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-03 12:23:58 +0000 |
commit | 2f7c9faf3a194cf611d7a4fd5dcd54f2aa245bbb (patch) | |
tree | 6d6a9ed54ca8a8a466705bfa3eb475b4ffa5b368 /meta/recipes-support | |
parent | 2a7b8755c17dc5a9ff6a7218665eaf82b2f315e5 (diff) | |
download | poky-2f7c9faf3a194cf611d7a4fd5dcd54f2aa245bbb.tar.gz |
npth: Upgrade to 1.1
Add patch for adding pkgconfig file.
(From OE-Core rev: 7799ca5e72cd42830efa7e1b5f2dbddcf2495254)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/npth/npth/pkgconfig.patch | 48 | ||||
-rw-r--r-- | meta/recipes-support/npth/npth_1.1.bb (renamed from meta/recipes-support/npth/npth_1.0.bb) | 5 |
2 files changed, 51 insertions, 2 deletions
diff --git a/meta/recipes-support/npth/npth/pkgconfig.patch b/meta/recipes-support/npth/npth/pkgconfig.patch new file mode 100644 index 0000000000..55d12c220c --- /dev/null +++ b/meta/recipes-support/npth/npth/pkgconfig.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | Added npth pkgconfig file | ||
2 | |||
3 | Upstream-Status: Incompatible [oe-core specific] | ||
4 | |||
5 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
6 | Index: npth-1.1/src/npth.pc.in | ||
7 | =================================================================== | ||
8 | --- /dev/null | ||
9 | +++ npth-1.1/src/npth.pc.in | ||
10 | @@ -0,0 +1,10 @@ | ||
11 | +prefix=@prefix@ | ||
12 | +exec_prefix=@exec_prefix@ | ||
13 | +libdir=@libdir@ | ||
14 | +includedir=@includedir@ | ||
15 | + | ||
16 | +Name: npth | ||
17 | +Description: a new portable posix threading library | ||
18 | +Version: @VERSION@ | ||
19 | +Libs: -L${libdir} -lnpth | ||
20 | +Cflags: -I${includedir} | ||
21 | Index: npth-1.1/src/Makefile.am | ||
22 | =================================================================== | ||
23 | --- npth-1.1.orig/src/Makefile.am | ||
24 | +++ npth-1.1/src/Makefile.am | ||
25 | @@ -27,8 +27,10 @@ | ||
26 | # License along with this program; if not, see <http://www.gnu.org/licenses/>. | ||
27 | |||
28 | ## Process this file with automake to produce Makefile.in | ||
29 | +pkgconfigdir = $(libdir)/pkgconfig | ||
30 | +pkgconfig_DATA = npth.pc | ||
31 | |||
32 | -EXTRA_DIST = libnpth.vers | ||
33 | +EXTRA_DIST = libnpth.vers npth.pc | ||
34 | # versioninfo.rc.in | ||
35 | nodist_include_HEADERS = npth.h | ||
36 | |||
37 | Index: npth-1.1/configure.ac | ||
38 | =================================================================== | ||
39 | --- npth-1.1.orig/configure.ac | ||
40 | +++ npth-1.1/configure.ac | ||
41 | @@ -337,6 +337,7 @@ src/Makefile | ||
42 | w32/Makefile | ||
43 | tests/Makefile]) | ||
44 | AC_CONFIG_FILES(npth-config, chmod +x npth-config) | ||
45 | +AC_CONFIG_FILES([src/npth.pc]) | ||
46 | AC_OUTPUT | ||
47 | |||
48 | echo " | ||
diff --git a/meta/recipes-support/npth/npth_1.0.bb b/meta/recipes-support/npth/npth_1.1.bb index 3356ba06b0..72a194e784 100644 --- a/meta/recipes-support/npth/npth_1.0.bb +++ b/meta/recipes-support/npth/npth_1.1.bb | |||
@@ -7,10 +7,11 @@ LIC_FILES_CHKSUM = "\ | |||
7 | file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6\ | 7 | file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6\ |
8 | " | 8 | " |
9 | SRC_URI = "ftp://ftp.gnupg.org/gcrypt/npth/npth-${PV}.tar.bz2 \ | 9 | SRC_URI = "ftp://ftp.gnupg.org/gcrypt/npth/npth-${PV}.tar.bz2 \ |
10 | file://pkgconfig.patch \ | ||
10 | " | 11 | " |
11 | 12 | ||
12 | SRC_URI[md5sum] = "36869bf10378ea08c155cd5c3580a1dd" | 13 | SRC_URI[md5sum] = "aaffc8ef3e955ab50a1905809f268a23" |
13 | SRC_URI[sha256sum] = "9ad49de376310effab7fdad69581054b0fa9023d062032d06e73058146c8f76e" | 14 | SRC_URI[sha256sum] = "896c561eb2ec8da35f11828fb04a3fbff12d41ff657c799056d7dc4a66e5df7f" |
14 | 15 | ||
15 | BINCONFIG = "${bindir}/npth-config" | 16 | BINCONFIG = "${bindir}/npth-config" |
16 | 17 | ||