Bump buidlroot version to 2018.02.6
This commit is contained in:
jbnadal
@@ -1,31 +0,0 @@
|
||||
From d5120738a9b6b90d19e742f3c591727d16d76c9c Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@gmail.com>
|
||||
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 <romain.naour@gmail.com>
|
||||
---
|
||||
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
|
||||
|
||||
@@ -0,0 +1,119 @@
|
||||
From 44970d7331e4f369e160af0135a2d1fc16f27a21 Mon Sep 17 00:00:00 2001
|
||||
From: jdknight-rockwellcollins <james.knight@rockwellcollins.com>
|
||||
Date: Mon, 15 Jan 2018 12:41:25 -0500
|
||||
Subject: [PATCH] include sys/time.h outside fallback select (#55)
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The implementation of 'wait_fd' (inside 'connection_base.cxx') always
|
||||
relies on the existence of the 'timeval' structure. In Linux, this
|
||||
structure is provided by the header 'sys/time.h'. If polling or select
|
||||
capabilities are detected, the structure is never included into the
|
||||
source and will result in a compilation error (GCC 7.x):
|
||||
|
||||
connection_base.cxx:1153:28: error: ‘{anonymous}::tv_milliseconds’ declared as an ‘inline’ variable
|
||||
inline int tv_milliseconds(timeval *tv = nullptr)
|
||||
^~~~~~~
|
||||
...
|
||||
|
||||
The following moves the 'HAVE_SYS_TIME_H' check outside the
|
||||
select-fallback case so that the header can be included no matter the
|
||||
event-function feature is used.
|
||||
|
||||
Signed-off-by: James Knight <james.knight@rockwellcollins.com>
|
||||
---
|
||||
configure | 28 ++++++++++++----------------
|
||||
configure.ac | 6 +-----
|
||||
src/connection_base.cxx | 2 +-
|
||||
3 files changed, 14 insertions(+), 22 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 7d6d96a98e0fcb7dde1e05adf034afe624ada6d6..dd2a33cb54dba5d3223fc2b4c8d03be7c8abde4e 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -17285,22 +17285,6 @@ fi
|
||||
done
|
||||
|
||||
|
||||
-if test "$select_h" != "yes"
|
||||
-then
|
||||
-for ac_header in sys/time.h
|
||||
-do :
|
||||
- ac_fn_cxx_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default"
|
||||
-if test "x$ac_cv_header_sys_time_h" = xyes; then :
|
||||
- cat >>confdefs.h <<_ACEOF
|
||||
-#define HAVE_SYS_TIME_H 1
|
||||
-_ACEOF
|
||||
-
|
||||
-fi
|
||||
-
|
||||
-done
|
||||
-
|
||||
-fi
|
||||
-
|
||||
# Some systems keep select() in a separate library which is not linked by
|
||||
# default. See if we need one of those.
|
||||
socklibok=no
|
||||
@@ -17419,6 +17403,18 @@ fi
|
||||
|
||||
fi # No poll()
|
||||
|
||||
+for ac_header in sys/time.h
|
||||
+do :
|
||||
+ ac_fn_cxx_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default"
|
||||
+if test "x$ac_cv_header_sys_time_h" = xyes; then :
|
||||
+ cat >>confdefs.h <<_ACEOF
|
||||
+#define HAVE_SYS_TIME_H 1
|
||||
+_ACEOF
|
||||
+
|
||||
+fi
|
||||
+
|
||||
+done
|
||||
+
|
||||
|
||||
# Add options to compiler command line, if compiler accepts them.
|
||||
add_compiler_opts_if_ok() {
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 8977c3d3900a5de66b580365d8fe7d133cd1042d..6649f7fa0ed0572489a0db09517c659012ce707c 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -117,11 +117,6 @@ then
|
||||
select_h=no
|
||||
AC_CHECK_HEADERS([sys/select.h], [select_h=yes])
|
||||
|
||||
-if test "$select_h" != "yes"
|
||||
-then
|
||||
-AC_CHECK_HEADERS([sys/time.h])
|
||||
-fi
|
||||
-
|
||||
# Some systems keep select() in a separate library which is not linked by
|
||||
# default. See if we need one of those.
|
||||
socklibok=no
|
||||
@@ -150,6 +145,7 @@ fi
|
||||
|
||||
fi # No poll()
|
||||
|
||||
+AC_CHECK_HEADERS([sys/time.h])
|
||||
|
||||
# Add options to compiler command line, if compiler accepts them.
|
||||
add_compiler_opts_if_ok() {
|
||||
diff --git a/src/connection_base.cxx b/src/connection_base.cxx
|
||||
index 37ed7728ffd02e1fded3b5d64d6fb2d5fd74d5ed..0ec55bc5bd761690f66b67396cfbf3e3c56ba618 100644
|
||||
--- a/src/connection_base.cxx
|
||||
+++ b/src/connection_base.cxx
|
||||
@@ -38,10 +38,10 @@
|
||||
#if defined(HAVE_UNISTD_H)
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
+#endif
|
||||
#if defined(HAVE_SYS_TIME_H)
|
||||
#include <sys/time.h>
|
||||
#endif
|
||||
-#endif
|
||||
|
||||
#include "libpq-fe.h"
|
||||
|
||||
--
|
||||
1.8.3.msysgit.0
|
||||
|
||||
@@ -1,13 +1,17 @@
|
||||
config BR2_PACKAGE_LIBPQXX
|
||||
bool "libpqxx"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_PACKAGE_POSTGRESQL
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
help
|
||||
libpqxx is the official C++ client API for PostgreSQL, the
|
||||
enterprise-strength open-source relational database.
|
||||
|
||||
http://pqxx.org/development/libpqxx/
|
||||
|
||||
comment "libpqxx needs toolchain w/ C++ support"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP
|
||||
comment "libpqxx needs toolchain w/ C++, gcc >= 4.8, threads"
|
||||
depends on BR2_PACKAGE_POSTGRESQL
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
|
||||
!BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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-3c
|
||||
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))
|
||||
|
||||
Reference in New Issue
Block a user