diff options
Diffstat (limited to 'yocto-poky/meta/recipes-support/pth')
3 files changed, 184 insertions, 0 deletions
diff --git a/yocto-poky/meta/recipes-support/pth/files/pth-add-pkgconfig-support.patch b/yocto-poky/meta/recipes-support/pth/files/pth-add-pkgconfig-support.patch new file mode 100644 index 000000000..67a28ab77 --- /dev/null +++ b/yocto-poky/meta/recipes-support/pth/files/pth-add-pkgconfig-support.patch @@ -0,0 +1,105 @@ +Upstream-Status: Pending + +Add pkgconfig support to pth. + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> + +Index: Makefile.in +=========================================================== +--- a/Makefile.in ++++ b/Makefile.in +@@ -47,6 +47,9 @@ datadir = @datadir@ + + DESTDIR = + ++pkgconfigdir = ${libdir}/pkgconfig ++pkgconfig_DATA = pth.pc ++ + ## + ## ____ TOOL DEFINITIONS ___________________________________________ + ## +@@ -216,7 +219,7 @@ test_pthread: test_pthread.o test_common.o libpthread.la + + # install the package + install: all-for-install +- @$(MAKE) $(MKFLAGS) install-dirs install-pth @INSTALL_PTHREAD@ ++ @$(MAKE) $(MKFLAGS) install-dirs install-pth @INSTALL_PTHREAD@ install-pkgconfigDATA + @touch .done-install >/dev/null 2>&1 || $(TRUE) + @$(MAKE) $(MKFLAGS) what-next + install-dirs: +@@ -227,6 +230,7 @@ install-dirs: + $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1 + $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man3 + $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(datadir)/aclocal ++ $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(pkgconfigdir) + install-pth: + $(SHTOOL) install -c -m 755 pth-config $(DESTDIR)$(bindir)/pth-config + $(SHTOOL) install -c -m 644 $(S)pth-config.1 $(DESTDIR)$(mandir)/man1/pth-config.1 +@@ -242,12 +246,16 @@ install-pthread: + $(SHTOOL) install -c -m 644 $(S)pthread.3 $(DESTDIR)$(mandir)/man3/pthread.3 + @umask 022; $(LIBTOOL) --mode=install \ + $(SHTOOL) install -c libpthread.la $(DESTDIR)$(libdir)/libpthread.la ++install-pkgconfigDATA: $(pkgconfig_DATA) ++ $(SHTOOL) install -c -m 644 $(pkgconfig_DATA) $(DESTDIR)$(pkgconfigdir)/$(pkgconfig_DATA) + + # uninstall the package + uninstall: +- @$(MAKE) $(MKFLAGS) @UNINSTALL_PTHREAD@ uninstall-pth uninstall-dirs ++ @$(MAKE) $(MKFLAGS) uninstall-pkgconfigDATA @UNINSTALL_PTHREAD@ uninstall-pth uninstall-dirs + @touch .done-uninstall >/dev/null 2>&1 || $(TRUE) + @$(MAKE) $(MKFLAGS) what-next ++uninstall-pkgconfigDATA: ++ $(RM) $(DESTDIR)$(pkgconfigdir)/$(pkgconfig_DATA) + uninstall-pthread: + $(RM) $(DESTDIR)$(bindir)/pthread-config + $(RM) $(DESTDIR)$(mandir)/man1/pthread-config.1 +@@ -271,6 +279,7 @@ uninstall-dirs: + -$(RMDIR) $(DESTDIR)$(includedir) >/dev/null 2>&1 || $(TRUE) + -$(RMDIR) $(DESTDIR)$(bindir) >/dev/null 2>&1 || $(TRUE) + -$(RMDIR) $(DESTDIR)$(prefix) >/dev/null 2>&1 || $(TRUE) ++ -$(RMDIR) $(DESTDIR)$(pkgconfigdir) > /dev/null 2>&1 ||$(TRUE) + + # strip down the source tree to its minimum + striptease: +Index: configure.ac +=========================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -656,6 +656,13 @@ pth_acmac.h dnl + chmod +rx pthread-config + chmod +rx pth-config + )dnl ++ ++PTH_VERSION=`echo $PTH_VERSION_STR | cut -d' ' -f1` ++AC_SUBST(PTH_VERSION) ++ ++AC_CONFIG_FILES([pth.pc]) ++AC_OUTPUT ++ + if test ".$enable_pthread" = .no; then + rm -f pthread-config + rm -f pthread.h +Index: pth.pc.in +=========================================================== +--- /dev/null ++++ b/pth.pc.in +@@ -0,0 +1,16 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++bindir=@bindir@ ++mandir=@mandir@ ++datadir=@datadir@ ++acdir=@datadir@/aclocal ++ ++Name: pth ++Description: GNU Portable Threads ++Requires: ++Version: @PTH_VERSION@ ++Libs: -L${libdir} -lpth ++Libs.private: ++Cflags: -I${includedir} +-- +1.7.5.4 + diff --git a/yocto-poky/meta/recipes-support/pth/files/pth-fix-parallel.patch b/yocto-poky/meta/recipes-support/pth/files/pth-fix-parallel.patch new file mode 100644 index 000000000..08edaff15 --- /dev/null +++ b/yocto-poky/meta/recipes-support/pth/files/pth-fix-parallel.patch @@ -0,0 +1,48 @@ +From df06b8170745eac347acb95f9f374f257621254f Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Thu, 29 Jan 2015 18:11:00 -0800 +Subject: [PATCH] Makefile.in: fix for parallel build + +Fixed: +* do_compile + pth_uctx.c:31:19: fatal error: pth_p.h: No such file or directory + #include "pth_p.h" + ^ +compilation terminated. +make: *** [pth_uctx.lo] Error 1 + +* do_install: + cp: cannot create regular file `image/usr/lib/pkgconfig/#INST@15507#': No such file or directory + +Upstream-Status: Pending +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + Makefile.in | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index de0390d..381a0ee 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -219,7 +219,8 @@ test_pthread: test_pthread.o test_common.o libpthread.la + + # install the package + install: all-for-install +- @$(MAKE) $(MKFLAGS) install-dirs install-pth @INSTALL_PTHREAD@ install-pkgconfigDATA ++ @$(MAKE) $(MKFLAGS) install-dirs ++ @$(MAKE) $(MKFLAGS) install-pth @INSTALL_PTHREAD@ install-pkgconfigDATA + @touch .done-install >/dev/null 2>&1 || $(TRUE) + @$(MAKE) $(MKFLAGS) what-next + install-dirs: +@@ -432,7 +433,7 @@ TAGS: + ## (AUTOMATICALLY UPDATED - DO NOT EDIT) + ## + +-$(LOBJS): Makefile ++$(LOBJS): Makefile pth_p.h + + # DO NOT REMOVE + pth_attr.lo: pth_attr.c pth_p.h pth_vers.c pth.h pth_acdef.h pth_acmac.h +-- +1.7.9.5 + diff --git a/yocto-poky/meta/recipes-support/pth/pth_2.0.7.bb b/yocto-poky/meta/recipes-support/pth/pth_2.0.7.bb new file mode 100644 index 000000000..9037769b7 --- /dev/null +++ b/yocto-poky/meta/recipes-support/pth/pth_2.0.7.bb @@ -0,0 +1,31 @@ +SUMMARY = "GNU Portable Threads library" +HOMEPAGE = "http://www.gnu.org/software/pth/" +SECTION = "libs" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;beginline=12;endline=15;md5=a48af114a80c222cafd37f24370a77b1" +PR = "r3" + +python __anonymous () { + import re + uc_os = (re.match('.*uclibc*', d.getVar('TARGET_OS', True)) != None) + if uc_os: + raise bb.parse.SkipPackage("incompatible with uClibc") +} + +SRC_URI = "${GNU_MIRROR}/pth/pth-${PV}.tar.gz \ + file://pth-add-pkgconfig-support.patch \ + file://pth-fix-parallel.patch \ + " + +SRC_URI[md5sum] = "9cb4a25331a4c4db866a31cbe507c793" +SRC_URI[sha256sum] = "72353660c5a2caafd601b20e12e75d865fd88f6cf1a088b306a3963f0bc77232" + +BINCONFIG = "${bindir}/pth-config" + +inherit autotools binconfig-disabled pkgconfig + +do_configure() { + ( cd ${S}; gnu-configize ) + ( cd ${S}; autoconf ) + oe_runconf +} |