From patchwork Wed Dec 27 18:08:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 853231 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qhQRQ2KV"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z6LST2ZtMz9s7g for ; Thu, 28 Dec 2017 05:08:25 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 163BB86AEA; Wed, 27 Dec 2017 18:08: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 CmqapmeSYILQ; Wed, 27 Dec 2017 18:08:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 46AF9869C4; Wed, 27 Dec 2017 18:08:18 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id D87931C21CA for ; Wed, 27 Dec 2017 18:08:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D4F2086F03 for ; Wed, 27 Dec 2017 18:08:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ym7TeoJTVcnS for ; Wed, 27 Dec 2017 18:08:13 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-yb0-f193.google.com (mail-yb0-f193.google.com [209.85.213.193]) by hemlock.osuosl.org (Postfix) with ESMTPS id B21F586BEF for ; Wed, 27 Dec 2017 18:08:13 +0000 (UTC) Received: by mail-yb0-f193.google.com with SMTP id u107so2710378ybi.2 for ; Wed, 27 Dec 2017 10:08:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=QtiUtqmbsVxFqw7+wpY4KXE1BogmIsaTm7j6pVR8GhY=; b=qhQRQ2KV3Oy66ZnPl/6z0nrETCqCGGC8wOiV4j5i4Dtn4Bxk2oCdr5gqTqHcmbPRCp T802fGYedjbOWWimcVWXkirgAnsc88gHQJ791BoTI/pXKGRJfWoY6gsOq7PLXkHvR3Ov JVa86fPqFOv7Wrca0dhEZ07xxpYIbUgbVRlLE/cuNQxV2Crohxsq0WCSpn5w4HA4h7cF m6BRWVBfROfwDFN37DIkb3xnFC5fUqJecFEE2DBRaMTJ203OHmBlBizbV+4MGJ2fblMw bAvysRpMPT48OOoizyXxJQ2sG+31pt1tOzsc1TxZEqsHpSD4rIzNsD9eIWwLrCyUFJjL L5eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=QtiUtqmbsVxFqw7+wpY4KXE1BogmIsaTm7j6pVR8GhY=; b=UzmFOQIL5VoC1XyI9q9ArEdl5KEIonmWfKqBSA1gW1VqYBo9rlEjrn8xD/r8+7ouVL D92SY9Bg9KS9FwMxH9n1Adcp/8+FrwENodJbYymg6vhUlP63SCzGK/fCBfqCUCG+Avy1 AnkaCy4vPDG5z6k9KoPQGRhWlS6IQgoeUO61C0qy+isI4pUS+J6GoTyq59xRW/pui1Tc qG8MRLtakh32jvKeHAKODTmJXhyHiY6LrowDP7jOgKEuoZU3sfs5z551JLLnRhT++L8V nhqm2Ilhcvn1iw/P3vOJ5gl7S87oSlvIyXj9TyiLNM/IRR8Py594Hifbv84jmKZnoPnU YWrw== X-Gm-Message-State: AKGB3mLggX4/GmvJ7kN0/NeYZhBE4be2ygL2SJYc3h5/bu562wqFckW3 r6QlNIf6f8z6N1dajsG8pnPHTU0p X-Google-Smtp-Source: ACJfBosNb0AXM3dIrmLagITkq9BjNgE6Ek453FgR5Sk38Q2D48fSdsp1upkLpX9l70uDQUEKnBrTRA== X-Received: by 10.37.184.201 with SMTP id g9mr955080ybm.328.1514398092468; Wed, 27 Dec 2017 10:08:12 -0800 (PST) Received: from aduskett.duskett (68-188-149-81.dhcp.aldl.mi.charter.com. [68.188.149.81]) by smtp.gmail.com with ESMTPSA id c10sm15291231ywa.65.2017.12.27.10.08.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 27 Dec 2017 10:08:12 -0800 (PST) From: Adam Duskett X-Google-Original-From: Adam Duskett To: buildroot@buildroot.org Date: Wed, 27 Dec 2017 13:08:10 -0500 Message-Id: <20171227180810.19405-1-Adamduskett@outlook.com> X-Mailer: git-send-email 2.14.3 Subject: [Buildroot] [PATCH 1/1] libpqxx: bump to 6.0.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Duskett MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Other changes: - Add a hash for the license file. - Change the URL from pqxx.org to the official GitHub repository, as releases are no longer being posted to the old download mirror. - Remove the patch, this has been fixed in the upstream code for some time. - Remove AUTORECONF, as it is no longer necessary because the patch has been removed. - Require gcc >= 4.7, as C++11 is now mandatory: http://pqxx.org/development/libpqxx/ Signed-off-by: Adam Duskett --- ...01-Fix-broken-sed-call-in-configure.ac.in.patch | 31 ---------------------- package/libpqxx/Config.in | 5 ++-- package/libpqxx/libpqxx.hash | 7 +++-- package/libpqxx/libpqxx.mk | 7 ++--- 4 files changed, 8 insertions(+), 42 deletions(-) delete mode 100644 package/libpqxx/0001-Fix-broken-sed-call-in-configure.ac.in.patch diff --git a/package/libpqxx/0001-Fix-broken-sed-call-in-configure.ac.in.patch b/package/libpqxx/0001-Fix-broken-sed-call-in-configure.ac.in.patch deleted file mode 100644 index 672133a506..0000000000 --- a/package/libpqxx/0001-Fix-broken-sed-call-in-configure.ac.in.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d5120738a9b6b90d19e742f3c591727d16d76c9c Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Tue, 26 Dec 2017 14:09:46 +0100 -Subject: [PATCH] Fix broken sed call in configure.ac.in - -Upstream fix from commit [1][2] - -[1] 80a9d5386641ac67d4ea1b602c786b45b40b252f -[2] 85e9336740475be25ed19924cca0961f7d844c4b - -Signed-off-by: Romain Naour ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 32cf5cb5..77cf7edd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -480,7 +480,7 @@ occurring in the file. - ])], -L${with_postgres_lib}) - - # Remove redundant occurrances of -lpq --LIBS="`echo "$LIBS" | sed -e 's/-lpq[[:space:]]*[[:space:]]-lpq\>/-lpq/g'`" -+LIBS=[`echo "$LIBS" | sed -e 's/-lpq * -lpq\>/-lpq/g'`] - - AC_LANG_POP(C) - --- -2.14.3 - diff --git a/package/libpqxx/Config.in b/package/libpqxx/Config.in index ddf14fd6ce..7832d2508e 100644 --- a/package/libpqxx/Config.in +++ b/package/libpqxx/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBPQXX bool "libpqxx" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 depends on BR2_PACKAGE_POSTGRESQL help libpqxx is the official C++ client API for PostgreSQL, the @@ -8,6 +9,6 @@ config BR2_PACKAGE_LIBPQXX http://pqxx.org/development/libpqxx/ -comment "libpqxx needs toolchain w/ C++ support" - depends on !BR2_INSTALL_LIBSTDCPP +comment "libpqxx needs toolchain w/ C++ support, gcc >= 4.7" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 depends on BR2_PACKAGE_POSTGRESQL diff --git a/package/libpqxx/libpqxx.hash b/package/libpqxx/libpqxx.hash index 65c50c6752..372be603c5 100644 --- a/package/libpqxx/libpqxx.hash +++ b/package/libpqxx/libpqxx.hash @@ -1,4 +1,3 @@ -# From: http://pqxx.org/download/software/libpqxx/libpqxx-4.0.1.tar.gz.md5sum -md5 6ea888b9ba85dd7cef1b182dc5f223a2 libpqxx-4.0.1.tar.gz -# Locally computed after verifying md5sum: -sha256 097ceda2797761ce517faa5bee186c883df1c407cb2aada613a16773afeedc38 libpqxx-4.0.1.tar.gz +# Locally computed: +sha256 81cac92458efd799fadb0374107464320d93eba71de05aedf21afb9c8dda7c3a libpqxx-6.0.0.tar.gz +sha256 9e1c78fa302e4e9738bf3315b130429035c03fcb0f046531ccd977cb474f6b31 COPYING diff --git a/package/libpqxx/libpqxx.mk b/package/libpqxx/libpqxx.mk index 6a8c37a7cc..ccafa9ce71 100644 --- a/package/libpqxx/libpqxx.mk +++ b/package/libpqxx/libpqxx.mk @@ -4,16 +4,13 @@ # ################################################################################ -LIBPQXX_VERSION = 4.0.1 -LIBPQXX_SITE = http://pqxx.org/download/software/libpqxx +LIBPQXX_VERSION = 6.0.0 +LIBPQXX_SITE = $(call github,jtv,libpqxx,$(LIBPQXX_VERSION)) LIBPQXX_INSTALL_STAGING = YES LIBPQXX_DEPENDENCIES = postgresql LIBPQXX_LICENSE = BSD-3-Clause LIBPQXX_LICENSE_FILES = COPYING -# 0001-Fix-broken-sed-call-in-configure.ac.in.patch -LIBPQXX_AUTORECONF = YES - LIBPQXX_CONF_ENV += ac_cv_path_PG_CONFIG=$(STAGING_DIR)/usr/bin/pg_config $(eval $(autotools-package))