Skip to contentSkip to conversation

rhash: new package

PATCH Superseded Vicente Olivert Riera 2 participants 4 messages Apr 19, 2017

v2 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 rhash: new package

---
Changes v1 -> v2:
- rename package to rhash
- take the help text of the library instead of the console utility
- sub-config option for the rhash binary starts with the package name
- conditionals for shared/static/shared-static reordered
- put make options into a make_opts variable
- install the console utility to staging as well
(All suggestions by Arnout)

---
 package/Config.in        |  1 +
 package/rhash/Config.in  | 24 +++++++++++++++++
 package/rhash/rhash.hash |  3 +++
 package/rhash/rhash.mk   | 69 ++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 97 insertions(+)
 create mode 100644 package/rhash/Config.in
 create mode 100644 package/rhash/rhash.hash
 create mode 100644 package/rhash/rhash.mk
package/Config.in +1 -0
index 4eaa95b..df38b4e 100644
@@ -959,6 +959,7 @@ menu "Crypto"
 	source "package/mbedtls/Config.in"
 	source "package/nettle/Config.in"
 	source "package/openssl/Config.in"
+	source "package/rhash/Config.in"
 	source "package/tinydtls/Config.in"
 	source "package/trousers/Config.in"
 	source "package/ustream-ssl/Config.in"
package/rhash/Config.in new file +24 -0
new file mode 100644
index 0000000..6581243
@@ -0,0 +1,24 @@
+config BR2_PACKAGE_RHASH
+	bool "rhash"
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+	help
+	  LibRHash is a professional,  portable,  thread-safe  C library for
+	  computing a wide variety of hash sums, such as  CRC32, MD4, MD5,
+	  SHA1, SHA256, SHA512, SHA3, AICH, ED2K, Tiger, DC++ TTH, BitTorrent
+	  BTIH,  GOST R 34.11-94, RIPEMD-160, HAS-160, EDON-R, Whirlpool and
+	  Snefru.
+
+	  https://github.com/rhash/RHash
+
+if BR2_PACKAGE_RHASH
+
+config BR2_PACKAGE_RHASH_BIN
+	bool "rhash binary"
+	depends on !BR2_STATIC_LIBS
+	help
+	  Install rhash console utility
+
+comment "rhash binary needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
+
+endif
package/rhash/rhash.hash new file +3 -0
new file mode 100644
index 0000000..5efc3a6
@@ -0,0 +1,3 @@
+# From https://sourceforge.net/projects/rhash/files/rhash/1.3.4/
+md5 0b51010604659e9e99f6307b053ba13b  rhash-1.3.4-src.tar.gz
+sha1 411d8c7ba84fa9763bc49fa2fd3a7587712fd52c  rhash-1.3.4-src.tar.gz
package/rhash/rhash.mk new file +69 -0

69 lines not on this page · raw message

Signature · 1 line
2.10.2
#1 lore raw

PATCH v2 2/2 cmake: bump version to 3.8.0

cmake depends on librhash, but host-cmake doesn't. This is because we use the bundled dependencies for host-cmake but not for target.

---
Changes v1 -> v2:
- Added explanation in the commit log about why rhash dependency is needed for cmake but not for host-cmake. (Arnout)

---
 package/cmake/Config.in  | 1 +
 package/cmake/cmake.hash | 4 ++--
 package/cmake/cmake.mk   | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)
package/cmake/Config.in +1 -0
index 2706db5..00b7d8a 100644
@@ -21,6 +21,7 @@ config BR2_PACKAGE_CMAKE_CTEST
 	select BR2_PACKAGE_BZIP2
 	select BR2_PACKAGE_XZ
 	select BR2_PACKAGE_LIBUV
+	select BR2_PACKAGE_LIBRHASH
 	depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # from jsoncpp
 	depends on BR2_USE_WCHAR # libarchive
package/cmake/cmake.hash +2 -2
index 13c0237..f16f876 100644
@@ -1,2 +1,2 @@
-# From http://www.cmake.org/files/v3.7/cmake-3.7.2-SHA-256.txt
-sha256 dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0  cmake-3.7.2.tar.gz
+# From http://www.cmake.org/files/v3.8/cmake-3.8.0-SHA-256.txt
+sha256 cab99162e648257343a20f61bcd0b287f5e88e36fcb2f1d77959da60b7f35969  cmake-3.8.0.tar.gz
package/cmake/cmake.mk +3 -3
index d9eea32..2b4a512 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-CMAKE_VERSION_MAJOR = 3.7
-CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).2
+CMAKE_VERSION_MAJOR = 3.8
+CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).0
 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR)
 CMAKE_LICENSE = BSD-3-Clause
 CMAKE_LICENSE_FILES = Copyright.txt
@@ -22,7 +22,7 @@ CMAKE_LICENSE_FILES = Copyright.txt
 #   the system-wide libraries instead of rebuilding and statically
 #   linking with the ones bundled into the CMake sources.
 
-CMAKE_DEPENDENCIES = zlib jsoncpp libcurl libarchive expat bzip2 xz libuv
+CMAKE_DEPENDENCIES = zlib jsoncpp libcurl libarchive expat bzip2 xz libuv librhash
 
 CMAKE_CONF_OPTS = \
 	-DKWSYS_LFS_WORKS=TRUE \
Signature · 1 line
2.10.2
#2 lore raw

PATCH v2 2/2 cmake: bump version to 3.8.0

Hello,

Quoted 4 lines · Vicente Olivert Riera

cmake depends on librhash, but host-cmake doesn't. This is because we use the bundled dependencies for host-cmake but not for target.

Thanks for this update. Did you test building a large number of cmake-package packages of Buildroot with this new CMake version?

(Of course, to really test this, you need to uninstall your system-wide CMake, or at least make Buildroot believe it's not available/appropriate).

Thanks!

Thomas

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

PATCH v2 2/2 cmake: bump version to 3.8.0

Hi Thomas,

Quoted 10 lines · Thomas Petazzoni

Hello,

Quoted 4 lines · Vicente Olivert Riera

cmake depends on librhash, but host-cmake doesn't. This is because we use the bundled dependencies for host-cmake but not for target.

Thanks for this update. Did you test building a large number of cmake-package packages of Buildroot with this new CMake version?

yes, I've tested with some of them:

~/git-clones/buildroot-1/output/build $ find . -maxdepth 2 -type f -name "CMakeLists.txt" | cut -d'/' -f2 libuci-49ec6efbdac4819033d34f08927d795f83a3932d bullet-2.85.1
cannelloni-20160414
tinyxml2-3.0.0
rabbitmq-c-v0.8.0
host-cmake-3.8.0
libssh-0.7.3
librtlsdr-v0.5.3 ubus-34c6e818e431cc53478a0f7c7c1eca07d194d692 bctoolbox-0.4.0
taglib-1.11.1
jasper-2.0.12
yajl-2.1.0
cjson-v1.4.6
libiqrf-v0.1.2
yaml-cpp-0.5.2
libical-1.0.1
zlib-1.2.11
expat-2.2.0
cdrkit-1.1.11 libubox-723730214732862de7e892bae2f7a7889e66bf1b uhttpd-a8bf9c00842224edb394e79909053f7628ee6a82
exiv2-0.25

Quoted 4 lines

(Of course, to really test this, you need to uninstall your system-wide CMake, or at least make Buildroot believe it's not available/appropriate).

$ cmake
bash: /usr/bin/cmake: No such file or directory

Regards,

Vincent

Quoted 5 lines

Thanks!

Thomas