Skip to contentSkip to conversation

package/snappy: fix typo

PATCH New Bernd Kuhls 3 participants 4 messages Jul 30, 2017 – Sep 4, 2017

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/2 package/snappy: fix typo

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/snappy/snappy.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/snappy/snappy.mk +1 -1
index 2b1da8cf5..81055594c 100644
@@ -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.
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH 2/2 package/snappy: bump version, switch to cmake

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 <[email protected]>
---
 package/snappy/snappy.hash |  2 +-
 package/snappy/snappy.mk   | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)
package/snappy/snappy.hash +1 -1
index bb7f104cc..71a2500f8 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 f50719c6dc7103d65df66882a3b4569d598eda251266463eca716928187dc12b  snappy-32d6d7d8a2ef328a2ee1dd40f072e21f4983ebda.tar.gz
+sha256 e701cd80f1154d648c762c86140ad6873a5c9b09ed1d754e3157be8193d2c39e  snappy-be6dc3db83c4701e3e79694dcbfd1c3da03b91dd.tar.gz
package/snappy/snappy.mk +3 -8
index 81055594c..f5df6bf1f 100644
@@ -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))
Signature · 1 line
2.11.0
#2 lore raw

PATCH 1/2 package/snappy: fix typo

In reply to Bernd Kuhls

Hello,

Quoted 4 lines · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 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

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com