summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-02-01 05:08:25 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-01 17:16:05 +0000
commit1ba62f9e53f5e2d0da9fe6ee52007562deb77f32 (patch)
treea585480bb0ddbd7efb979bf1f54906e7a7ad633d
parenta4a5d1f3232821ea2695ba5e48ddfeb30ee7ea8d (diff)
downloadpoky-1ba62f9e53f5e2d0da9fe6ee52007562deb77f32.tar.gz
pth: Remove dead code
recipe is removed, delete remaining cruft (From OE-Core rev: cf62c02acfd27caa276c5f4eb2aa7956b16ac1fb) Signed-off-by: Khem Raj <raj.khem@gmail.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/files/pth-fix-parallel.patch48
2 files changed, 0 insertions, 153 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
deleted file mode 100644
index 67a28ab77a..0000000000
--- a/meta/recipes-support/pth/files/pth-add-pkgconfig-support.patch
+++ /dev/null
@@ -1,105 +0,0 @@
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/files/pth-fix-parallel.patch b/meta/recipes-support/pth/files/pth-fix-parallel.patch
deleted file mode 100644
index 08edaff157..0000000000
--- a/meta/recipes-support/pth/files/pth-fix-parallel.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1From df06b8170745eac347acb95f9f374f257621254f Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Thu, 29 Jan 2015 18:11:00 -0800
4Subject: [PATCH] Makefile.in: fix for parallel build
5
6Fixed:
7* do_compile
8 pth_uctx.c:31:19: fatal error: pth_p.h: No such file or directory
9 #include "pth_p.h"
10 ^
11compilation terminated.
12make: *** [pth_uctx.lo] Error 1
13
14* do_install:
15 cp: cannot create regular file `image/usr/lib/pkgconfig/#INST@15507#': No such file or directory
16
17Upstream-Status: Pending
18Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
19---
20 Makefile.in | 5 +++--
21 1 file changed, 3 insertions(+), 2 deletions(-)
22
23diff --git a/Makefile.in b/Makefile.in
24index de0390d..381a0ee 100644
25--- a/Makefile.in
26+++ b/Makefile.in
27@@ -219,7 +219,8 @@ test_pthread: test_pthread.o test_common.o libpthread.la
28
29 # install the package
30 install: all-for-install
31- @$(MAKE) $(MKFLAGS) install-dirs install-pth @INSTALL_PTHREAD@ install-pkgconfigDATA
32+ @$(MAKE) $(MKFLAGS) install-dirs
33+ @$(MAKE) $(MKFLAGS) install-pth @INSTALL_PTHREAD@ install-pkgconfigDATA
34 @touch .done-install >/dev/null 2>&1 || $(TRUE)
35 @$(MAKE) $(MKFLAGS) what-next
36 install-dirs:
37@@ -432,7 +433,7 @@ TAGS:
38 ## (AUTOMATICALLY UPDATED - DO NOT EDIT)
39 ##
40
41-$(LOBJS): Makefile
42+$(LOBJS): Makefile pth_p.h
43
44 # DO NOT REMOVE
45 pth_attr.lo: pth_attr.c pth_p.h pth_vers.c pth.h pth_acdef.h pth_acmac.h
46--
471.7.9.5
48