* [Buildroot] [PATCH 1/2] package/snappy: fix typo
@ 2017-07-30 14:47 Bernd Kuhls
2017-07-30 14:47 ` [Buildroot] [PATCH 2/2] package/snappy: bump version, switch to cmake Bernd Kuhls
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Bernd Kuhls @ 2017-07-30 14:47 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/snappy/snappy.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/snappy/snappy.mk b/package/snappy/snappy.mk
index 2b1da8cf5..81055594c 100644
--- a/package/snappy/snappy.mk
+++ b/package/snappy/snappy.mk
@@ -17,7 +17,7 @@ SNAPPY_INSTALL_STAGING = YES
SNAPPY_CONF_OPTS = --disable-gtest
# libsnappy links with libstdc++. Some libstdc++/arch variants use
-# pthread symbols for internal locking if built with thead
+# pthread symbols for internal locking if built with thread
# support. libstdc++ does not have a .pc file, and its .la file does
# not mention -pthread. So, static linkig to libstdc++ will fail if
# -pthread is not explicity linked to. Only do that for static builds.
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 2/2] package/snappy: bump version, switch to cmake
2017-07-30 14:47 [Buildroot] [PATCH 1/2] package/snappy: fix typo Bernd Kuhls
@ 2017-07-30 14:47 ` Bernd Kuhls
2017-07-31 18:50 ` [Buildroot] [PATCH 1/2] package/snappy: fix typo Thomas Petazzoni
2017-09-04 20:59 ` Peter Korsgaard
2 siblings, 0 replies; 4+ messages in thread
From: Bernd Kuhls @ 2017-07-30 14:47 UTC (permalink / raw)
To: buildroot
Upstream switched to CMake, host-pkgconf is not needed anymore.
Instead of using the latest release 1.1.6 we use current git HEAD
because it contains important patches:
"Support both static and shared library CMake builds."
https://github.com/google/snappy/commit/c756f7f5d90ad7591d4f96bb0da8159634943359
"Redo CMake configuration", this commit allows to disable building
Snappy's own tests.
https://github.com/google/snappy/commit/be6dc3db83c4701e3e79694dcbfd1c3da03b91dd
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/snappy/snappy.hash | 2 +-
package/snappy/snappy.mk | 11 +++--------
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/package/snappy/snappy.hash b/package/snappy/snappy.hash
index bb7f104cc..71a2500f8 100644
--- a/package/snappy/snappy.hash
+++ b/package/snappy/snappy.hash
@@ -1,2 +1,2 @@
# Locally calculated
-sha256 f50719c6dc7103d65df66882a3b4569d598eda251266463eca716928187dc12b snappy-32d6d7d8a2ef328a2ee1dd40f072e21f4983ebda.tar.gz
+sha256 e701cd80f1154d648c762c86140ad6873a5c9b09ed1d754e3157be8193d2c39e snappy-be6dc3db83c4701e3e79694dcbfd1c3da03b91dd.tar.gz
diff --git a/package/snappy/snappy.mk b/package/snappy/snappy.mk
index 81055594c..f5df6bf1f 100644
--- a/package/snappy/snappy.mk
+++ b/package/snappy/snappy.mk
@@ -4,17 +4,12 @@
#
################################################################################
-SNAPPY_VERSION = 32d6d7d8a2ef328a2ee1dd40f072e21f4983ebda
+SNAPPY_VERSION = be6dc3db83c4701e3e79694dcbfd1c3da03b91dd
SNAPPY_SITE = $(call github,google,snappy,$(SNAPPY_VERSION))
SNAPPY_LICENSE = BSD-3-Clause
SNAPPY_LICENSE_FILES = COPYING
-# from git
-SNAPPY_AUTORECONF = YES
-SNAPPY_DEPENDENCIES = host-pkgconf
SNAPPY_INSTALL_STAGING = YES
-
-# Disable tests
-SNAPPY_CONF_OPTS = --disable-gtest
+SNAPPY_CONF_OPTS = -DSNAPPY_BUILD_TESTS=OFF
# libsnappy links with libstdc++. Some libstdc++/arch variants use
# pthread symbols for internal locking if built with thread
@@ -25,4 +20,4 @@ ifeq ($(BR2_STATIC_LIBS)$(BR2_TOOLCHAIN_HAS_THREADS),yy)
SNAPPY_CONF_OPTS += LIBS=-pthread
endif
-$(eval $(autotools-package))
+$(eval $(cmake-package))
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/2] package/snappy: fix typo
2017-07-30 14:47 [Buildroot] [PATCH 1/2] package/snappy: fix typo Bernd Kuhls
2017-07-30 14:47 ` [Buildroot] [PATCH 2/2] package/snappy: bump version, switch to cmake Bernd Kuhls
@ 2017-07-31 18:50 ` Thomas Petazzoni
2017-09-04 20:59 ` Peter Korsgaard
2 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2017-07-31 18:50 UTC (permalink / raw)
To: buildroot
Hello,
On Sun, 30 Jul 2017 16:47:30 +0200, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> package/snappy/snappy.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Both applied, thanks. It is worth mentioning that the pthread related
tweak is probably no longer needed: both uClibc and musl now use the
"single library" approach, so we no longer need to link libstdc++
explicitly with libpthread.
So perhaps, we could remove this workaround? Of course, this would
require verifying by checking with the problematic toolchain
configurations.
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/2] package/snappy: fix typo
2017-07-30 14:47 [Buildroot] [PATCH 1/2] package/snappy: fix typo Bernd Kuhls
2017-07-30 14:47 ` [Buildroot] [PATCH 2/2] package/snappy: bump version, switch to cmake Bernd Kuhls
2017-07-31 18:50 ` [Buildroot] [PATCH 1/2] package/snappy: fix typo Thomas Petazzoni
@ 2017-09-04 20:59 ` Peter Korsgaard
2 siblings, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2017-09-04 20:59 UTC (permalink / raw)
To: buildroot
>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Committed to 2017.02.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-09-04 20:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-30 14:47 [Buildroot] [PATCH 1/2] package/snappy: fix typo Bernd Kuhls
2017-07-30 14:47 ` [Buildroot] [PATCH 2/2] package/snappy: bump version, switch to cmake Bernd Kuhls
2017-07-31 18:50 ` [Buildroot] [PATCH 1/2] package/snappy: fix typo Thomas Petazzoni
2017-09-04 20:59 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.