From patchwork Sat Jun 2 15:09:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stijn Souffriau X-Patchwork-Id: 162422 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 59CD3B700A for ; Sun, 3 Jun 2012 01:10:26 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C54CB90E47; Sat, 2 Jun 2012 15:10:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PAjaqp5NQmV8; Sat, 2 Jun 2012 15:10:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 25ED990E57; Sat, 2 Jun 2012 15:10:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 3C2738F753 for ; Sat, 2 Jun 2012 15:10:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 20CBA90E5D for ; Sat, 2 Jun 2012 15:10:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8-5PNCrXG8Sl for ; Sat, 2 Jun 2012 15:10:11 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from viper.mind.be (132.79-246-81.adsl-static.isp.belgacom.be [81.246.79.132]) by whitealder.osuosl.org (Postfix) with ESMTPS id 378F290E92 for ; Sat, 2 Jun 2012 15:10:11 +0000 (UTC) Received: from [172.16.0.18] (helo=localhost.localdomain) by viper.mind.be with esmtp (Exim 4.69) (envelope-from ) id 1Sapxg-0003va-TC; Sat, 02 Jun 2012 17:10:09 +0200 From: Stijn Souffriau To: buildroot@busybox.net Date: Sat, 2 Jun 2012 17:09:17 +0200 Message-Id: <1338649758-11225-3-git-send-email-stijn.souffriau@essensium.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1338649758-11225-1-git-send-email-stijn.souffriau@essensium.com> References: <1338649758-11225-1-git-send-email-stijn.souffriau@essensium.com> Subject: [Buildroot] [PATCH resend 3/4] Added the pth package. X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net --- package/Config.in | 1 + package/pth/Config.in | 10 ++++++ ...mmited-L-usr-lib-I-usr-include-from-paths.patch | 34 ++++++++++++++++++++ package/pth/pth-0002-dependencyfix.patch | 25 ++++++++++++++ .../pth/pth-0003-fixed-install-dependency.patch | 34 ++++++++++++++++++++ package/pth/pth.mk | 12 +++++++ 6 files changed, 116 insertions(+) create mode 100644 package/pth/Config.in create mode 100644 package/pth/pth-0001-ommited-L-usr-lib-I-usr-include-from-paths.patch create mode 100644 package/pth/pth-0002-dependencyfix.patch create mode 100644 package/pth/pth-0003-fixed-install-dependency.patch create mode 100644 package/pth/pth.mk diff --git a/package/Config.in b/package/Config.in index d71136d..ed25424 100644 --- a/package/Config.in +++ b/package/Config.in @@ -398,6 +398,7 @@ source "package/libffi/Config.in" source "package/libglib2/Config.in" source "package/libical/Config.in" source "package/libnspr/Config.in" +source "package/pth/Config.in" source "package/libsigc/Config.in" source "package/libtpl/Config.in" source "package/liburcu/Config.in" diff --git a/package/pth/Config.in b/package/pth/Config.in new file mode 100644 index 0000000..c8912cb --- /dev/null +++ b/package/pth/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_LIBPTH + bool "libpth" + depends on BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_glibc || BR2_TOOLCHAIN_CTNG_eglibc + help + Pth is a very portable POSIX/ANSI-C based library for Unix + platforms which provides non-preemptive priority-based scheduling + for multiple threads of execution (aka ``multithreading'') + inside event-driven applications. + + http://www.gnu.org/software/pth/ diff --git a/package/pth/pth-0001-ommited-L-usr-lib-I-usr-include-from-paths.patch b/package/pth/pth-0001-ommited-L-usr-lib-I-usr-include-from-paths.patch new file mode 100644 index 0000000..846a454 --- /dev/null +++ b/package/pth/pth-0001-ommited-L-usr-lib-I-usr-include-from-paths.patch @@ -0,0 +1,34 @@ +From 92f49db9b1c74691ac82b1f52429ca9b6f98d6f4 Mon Sep 17 00:00:00 2001 +From: Stijn Souffriau +Date: Thu, 29 Mar 2012 19:55:02 +0200 +Subject: [PATCH] ommited -L/usr/lib -I/usr/include from paths + +--- + pth-config.in | 8 ++++++-- + 1 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/pth-config.in b/pth-config.in +index 24a93d7..802770d 100644 +--- a/pth-config.in ++++ b/pth-config.in +@@ -109,11 +109,15 @@ do + output="$output $pth_acdir" + ;; + --cflags) +- output="$output -I$pth_includedir" ++ if [[ $pth_includedir != "/usr/include" ]]; then ++ output="$output -I$pth_includedir" ++ fi + output_extra="$output_extra $pth_cflags" + ;; + --ldflags) +- output="$output -L$pth_libdir" ++ if [[ $pth_libdir != "/usr/lib" ]]; then ++ output="$output -L$pth_libdir" ++ fi + output_extra="$output_extra $pth_ldflags" + ;; + --libs) +-- +1.7.0.4 + diff --git a/package/pth/pth-0002-dependencyfix.patch b/package/pth/pth-0002-dependencyfix.patch new file mode 100644 index 0000000..a1eefe1 --- /dev/null +++ b/package/pth/pth-0002-dependencyfix.patch @@ -0,0 +1,25 @@ +From 92f862503bb934252e9df1d19d7184b5ed57d7aa Mon Sep 17 00:00:00 2001 +From: Stijn Souffriau +Date: Mon, 2 Apr 2012 16:00:53 +0200 +Subject: [PATCH] Added prerequisite to rule needed for parallel building + +--- + Makefile.in | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 477ed81..750ec9f 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -162,6 +162,8 @@ all-normal: $(TARGET_ALL) + all-for-install: $(TARGET_ALL) + @touch .done-all >/dev/null 2>&1 || $(TRUE) + ++$(HSRCS): pth_p.h ++ + # build the private shared header file + pth_p.h: $(S)pth_p.h.in + $(SHTOOL) scpp -o pth_p.h -t $(S)pth_p.h.in -Dcpp -Cintern -M '==#==' $(HSRCS) +-- +1.7.0.4 + diff --git a/package/pth/pth-0003-fixed-install-dependency.patch b/package/pth/pth-0003-fixed-install-dependency.patch new file mode 100644 index 0000000..e1d7d50 --- /dev/null +++ b/package/pth/pth-0003-fixed-install-dependency.patch @@ -0,0 +1,34 @@ +From f2079abd360d2f1c531927e8ff7aa034d51aac66 Mon Sep 17 00:00:00 2001 +From: Stijn Souffriau +Date: Tue, 3 Apr 2012 13:49:38 +0200 +Subject: [PATCH] fixed install dependency + +--- + Makefile.in | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 750ec9f..f5f3c9c 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -229,7 +229,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 +-install-pth: ++install-pth: install-dirs + $(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 + $(SHTOOL) install -c -m 644 $(S)pth.3 $(DESTDIR)$(mandir)/man3/pth.3 +@@ -237,7 +237,7 @@ install-pth: + $(SHTOOL) install -c -m 644 pth.h $(DESTDIR)$(includedir)/pth.h + @umask 022; $(LIBTOOL) --mode=install \ + $(SHTOOL) install -c libpth.la $(DESTDIR)$(libdir)/libpth.la +-install-pthread: ++install-pthread: install-dirs + $(SHTOOL) install -c -m 755 pthread-config $(DESTDIR)$(bindir)/pthread-config + $(SHTOOL) install -c -m 644 $(S)pthread-config.1 $(DESTDIR)$(mandir)/man1/pthread-config.1 + $(SHTOOL) install -c -m 644 pthread.h $(DESTDIR)$(includedir)/pthread.h +-- +1.7.0.4 + diff --git a/package/pth/pth.mk b/package/pth/pth.mk new file mode 100644 index 0000000..a296fc5 --- /dev/null +++ b/package/pth/pth.mk @@ -0,0 +1,12 @@ +############################################################# +# +# pth +# +############################################################# + +PTH_VERSION = 2.0.6 +PTH_SOURCE = pth-$(PTH_VERSION).tar.gz +PTH_SITE = $(BR2_GNU_MIRROR)/pth +PTH_INSTALL_STAGING = YES + +$(eval $(call AUTOTARGETS))