summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2012-12-03 18:22:27 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-06 12:31:12 +0000
commit1600f72fa8eec82c43786802042ac4c92335cef0 (patch)
treefa44baf9e0afd3d70eede030a3616402ee67a30f
parentbd368cf0e6478edd98cbb7a29f00195a0b789bf3 (diff)
downloadpoky-1600f72fa8eec82c43786802042ac4c92335cef0.tar.gz
pth: add pkgconfig support
Add pkgconfig support to pth. [YOCTO #2453] (From OE-Core rev: c5f14ef7797394bcee1b0e295cc2dac4b62e55e2) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/pth/files/pth-add-pkgconfig-support.patch105
-rw-r--r--meta/recipes-support/pth/pth_2.0.7.bb7
2 files changed, 109 insertions, 3 deletions
diff --git a/meta/recipes-support/pth/files/pth-add-pkgconfig-support.patch b/meta/recipes-support/pth/files/pth-add-pkgconfig-support.patch
new file mode 100644
index 0000000000..67a28ab77a
--- /dev/null
+++ b/meta/recipes-support/pth/files/pth-add-pkgconfig-support.patch
@@ -0,0 +1,105 @@
1Upstream-Status: Pending
2
3Add pkgconfig support to pth.
4
5Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
6
7Index: Makefile.in
8===========================================================
9--- a/Makefile.in
10+++ b/Makefile.in
11@@ -47,6 +47,9 @@ datadir = @datadir@
12
13 DESTDIR =
14
15+pkgconfigdir = ${libdir}/pkgconfig
16+pkgconfig_DATA = pth.pc
17+
18 ##
19 ## ____ TOOL DEFINITIONS ___________________________________________
20 ##
21@@ -216,7 +219,7 @@ test_pthread: test_pthread.o test_common.o libpthread.la
22
23 # install the package
24 install: all-for-install
25- @$(MAKE) $(MKFLAGS) install-dirs install-pth @INSTALL_PTHREAD@
26+ @$(MAKE) $(MKFLAGS) install-dirs install-pth @INSTALL_PTHREAD@ install-pkgconfigDATA
27 @touch .done-install >/dev/null 2>&1 || $(TRUE)
28 @$(MAKE) $(MKFLAGS) what-next
29 install-dirs:
30@@ -227,6 +230,7 @@ install-dirs:
31 $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1
32 $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man3
33 $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(datadir)/aclocal
34+ $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(pkgconfigdir)
35 install-pth:
36 $(SHTOOL) install -c -m 755 pth-config $(DESTDIR)$(bindir)/pth-config
37 $(SHTOOL) install -c -m 644 $(S)pth-config.1 $(DESTDIR)$(mandir)/man1/pth-config.1
38@@ -242,12 +246,16 @@ install-pthread:
39 $(SHTOOL) install -c -m 644 $(S)pthread.3 $(DESTDIR)$(mandir)/man3/pthread.3
40 @umask 022; $(LIBTOOL) --mode=install \
41 $(SHTOOL) install -c libpthread.la $(DESTDIR)$(libdir)/libpthread.la
42+install-pkgconfigDATA: $(pkgconfig_DATA)
43+ $(SHTOOL) install -c -m 644 $(pkgconfig_DATA) $(DESTDIR)$(pkgconfigdir)/$(pkgconfig_DATA)
44
45 # uninstall the package
46 uninstall:
47- @$(MAKE) $(MKFLAGS) @UNINSTALL_PTHREAD@ uninstall-pth uninstall-dirs
48+ @$(MAKE) $(MKFLAGS) uninstall-pkgconfigDATA @UNINSTALL_PTHREAD@ uninstall-pth uninstall-dirs
49 @touch .done-uninstall >/dev/null 2>&1 || $(TRUE)
50 @$(MAKE) $(MKFLAGS) what-next
51+uninstall-pkgconfigDATA:
52+ $(RM) $(DESTDIR)$(pkgconfigdir)/$(pkgconfig_DATA)
53 uninstall-pthread:
54 $(RM) $(DESTDIR)$(bindir)/pthread-config
55 $(RM) $(DESTDIR)$(mandir)/man1/pthread-config.1
56@@ -271,6 +279,7 @@ uninstall-dirs:
57 -$(RMDIR) $(DESTDIR)$(includedir) >/dev/null 2>&1 || $(TRUE)
58 -$(RMDIR) $(DESTDIR)$(bindir) >/dev/null 2>&1 || $(TRUE)
59 -$(RMDIR) $(DESTDIR)$(prefix) >/dev/null 2>&1 || $(TRUE)
60+ -$(RMDIR) $(DESTDIR)$(pkgconfigdir) > /dev/null 2>&1 ||$(TRUE)
61
62 # strip down the source tree to its minimum
63 striptease:
64Index: configure.ac
65===========================================================
66--- a/configure.ac
67+++ b/configure.ac
68@@ -656,6 +656,13 @@ pth_acmac.h dnl
69 chmod +rx pthread-config
70 chmod +rx pth-config
71 )dnl
72+
73+PTH_VERSION=`echo $PTH_VERSION_STR | cut -d' ' -f1`
74+AC_SUBST(PTH_VERSION)
75+
76+AC_CONFIG_FILES([pth.pc])
77+AC_OUTPUT
78+
79 if test ".$enable_pthread" = .no; then
80 rm -f pthread-config
81 rm -f pthread.h
82Index: pth.pc.in
83===========================================================
84--- /dev/null
85+++ b/pth.pc.in
86@@ -0,0 +1,16 @@
87+prefix=@prefix@
88+exec_prefix=@exec_prefix@
89+libdir=@libdir@
90+includedir=@includedir@
91+bindir=@bindir@
92+mandir=@mandir@
93+datadir=@datadir@
94+acdir=@datadir@/aclocal
95+
96+Name: pth
97+Description: GNU Portable Threads
98+Requires:
99+Version: @PTH_VERSION@
100+Libs: -L${libdir} -lpth
101+Libs.private:
102+Cflags: -I${includedir}
103--
1041.7.5.4
105
diff --git a/meta/recipes-support/pth/pth_2.0.7.bb b/meta/recipes-support/pth/pth_2.0.7.bb
index 83a03b334f..fc9ed16aca 100644
--- a/meta/recipes-support/pth/pth_2.0.7.bb
+++ b/meta/recipes-support/pth/pth_2.0.7.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/pth/"
3SECTION = "libs" 3SECTION = "libs"
4LICENSE = "GPLv2+" 4LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;beginline=12;endline=15;md5=a48af114a80c222cafd37f24370a77b1" 5LIC_FILES_CHKSUM = "file://COPYING;beginline=12;endline=15;md5=a48af114a80c222cafd37f24370a77b1"
6PR = "r2" 6PR = "r3"
7 7
8python __anonymous () { 8python __anonymous () {
9 import re 9 import re
@@ -13,16 +13,17 @@ python __anonymous () {
13} 13}
14 14
15SRC_URI = "${GNU_MIRROR}/pth/pth-${PV}.tar.gz \ 15SRC_URI = "${GNU_MIRROR}/pth/pth-${PV}.tar.gz \
16 " 16 file://pth-add-pkgconfig-support.patch"
17 17
18SRC_URI[md5sum] = "9cb4a25331a4c4db866a31cbe507c793" 18SRC_URI[md5sum] = "9cb4a25331a4c4db866a31cbe507c793"
19SRC_URI[sha256sum] = "72353660c5a2caafd601b20e12e75d865fd88f6cf1a088b306a3963f0bc77232" 19SRC_URI[sha256sum] = "72353660c5a2caafd601b20e12e75d865fd88f6cf1a088b306a3963f0bc77232"
20 20
21PARALLEL_MAKE="" 21PARALLEL_MAKE=""
22 22
23inherit autotools binconfig 23inherit autotools binconfig pkgconfig
24 24
25do_configure() { 25do_configure() {
26 gnu-configize 26 gnu-configize
27 autoconf
27 oe_runconf 28 oe_runconf
28} 29}