From 7799ca5e72cd42830efa7e1b5f2dbddcf2495254 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Mon, 10 Nov 2014 13:59:03 -0800 Subject: npth: Upgrade to 1.1 Add patch for adding pkgconfig file. Signed-off-by: Saul Wold --- meta/recipes-support/npth/npth/pkgconfig.patch | 48 ++++++++++++++++++++++++++ meta/recipes-support/npth/npth_1.0.bb | 20 ----------- meta/recipes-support/npth/npth_1.1.bb | 21 +++++++++++ 3 files changed, 69 insertions(+), 20 deletions(-) create mode 100644 meta/recipes-support/npth/npth/pkgconfig.patch delete mode 100644 meta/recipes-support/npth/npth_1.0.bb create mode 100644 meta/recipes-support/npth/npth_1.1.bb 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 @@ +Added npth pkgconfig file + +Upstream-Status: Incompatible [oe-core specific] + +Signed-off-by: Saul Wold +Index: npth-1.1/src/npth.pc.in +=================================================================== +--- /dev/null ++++ npth-1.1/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 ++Cflags: -I${includedir} +Index: npth-1.1/src/Makefile.am +=================================================================== +--- npth-1.1.orig/src/Makefile.am ++++ npth-1.1/src/Makefile.am +@@ -27,8 +27,10 @@ + # License along with this program; if not, see . + + ## 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 + +Index: npth-1.1/configure.ac +=================================================================== +--- npth-1.1.orig/configure.ac ++++ npth-1.1/configure.ac +@@ -337,6 +337,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/meta/recipes-support/npth/npth_1.0.bb b/meta/recipes-support/npth/npth_1.0.bb deleted file mode 100644 index 3356ba06b0..0000000000 --- a/meta/recipes-support/npth/npth_1.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "New GNU Portable Threads library" -HOMEPAGE = "http://www.gnupg.org/software/pth/" -SECTION = "libs" -LICENSE = "LGPLv3+ & GPLv2+" -LIC_FILES_CHKSUM = "\ - file://COPYING;md5=751419260aa954499f7abaabaa882bbe\ - file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6\ - " -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/npth/npth-${PV}.tar.bz2 \ - " - -SRC_URI[md5sum] = "36869bf10378ea08c155cd5c3580a1dd" -SRC_URI[sha256sum] = "9ad49de376310effab7fdad69581054b0fa9023d062032d06e73058146c8f76e" - -BINCONFIG = "${bindir}/npth-config" - -inherit autotools binconfig-disabled - -FILES_${PN} = "${libdir}/libnpth.so.*" -FILES_${PN}-dev += "${bindir}/npth-config" diff --git a/meta/recipes-support/npth/npth_1.1.bb b/meta/recipes-support/npth/npth_1.1.bb new file mode 100644 index 0000000000..72a194e784 --- /dev/null +++ b/meta/recipes-support/npth/npth_1.1.bb @@ -0,0 +1,21 @@ +SUMMARY = "New GNU Portable Threads library" +HOMEPAGE = "http://www.gnupg.org/software/pth/" +SECTION = "libs" +LICENSE = "LGPLv3+ & GPLv2+" +LIC_FILES_CHKSUM = "\ + file://COPYING;md5=751419260aa954499f7abaabaa882bbe\ + file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6\ + " +SRC_URI = "ftp://ftp.gnupg.org/gcrypt/npth/npth-${PV}.tar.bz2 \ + file://pkgconfig.patch \ + " + +SRC_URI[md5sum] = "aaffc8ef3e955ab50a1905809f268a23" +SRC_URI[sha256sum] = "896c561eb2ec8da35f11828fb04a3fbff12d41ff657c799056d7dc4a66e5df7f" + +BINCONFIG = "${bindir}/npth-config" + +inherit autotools binconfig-disabled + +FILES_${PN} = "${libdir}/libnpth.so.*" +FILES_${PN}-dev += "${bindir}/npth-config" -- cgit v1.2.3