Skip to contentSkip to conversation

monkey: switch to cmake package

PATCH New Baruch Siach 2 participants 3 messages Sep 23, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 monkey: switch to cmake package

Since version 1.6.x the configure script is a wrapper around cmake. Use cmake directly since we want to make sure that cmake is available.

monkey no longer provides the libmonkey.so shared library. Remove the BR2_PACKAGE_MONKEY_SHARED option.

Fixes:
http://autobuild.buildroot.net/results/b07/b077720c16857b752f4f38b73619a6a62862f35f/
http://autobuild.buildroot.net/results/799/799bcbd332f254fbf3d3547e5e52ac9463d58bcc/
http://autobuild.buildroot.net/results/3b0/3b095ca77a900af724fbc79d9cc20cbb9931fe15/

Cc Morgan Delestre <[email protected]>
Cc David Pierret <[email protected]>
---
 package/monkey/Config.in |  6 -----
 package/monkey/monkey.mk | 49 +++++++---------------------------------
 2 files changed, 8 insertions(+), 47 deletions(-)
package/monkey/Config.in +0 -6
index fdfa1481e4ce..32a95ee62336 100644
@@ -11,12 +11,6 @@ config BR2_PACKAGE_MONKEY
 
 if BR2_PACKAGE_MONKEY
 
-config BR2_PACKAGE_MONKEY_SHARED
-	bool "install shared library"
-	help
-	  Build Monkey as a shared library in addition to stand-alone
-	  server
-
 config BR2_PACKAGE_MONKEY_SSL
 	bool "enable SSL/TLS"
 	select BR2_PACKAGE_MBEDTLS
package/monkey/monkey.mk +8 -41

66 lines not on this page · raw message

Signature · 1 line
2.19.0
#1 lore raw

PATCH 2/2 monkey: add license file hash

Cc Morgan Delestre <[email protected]>
---
 package/monkey/monkey.hash | 1 +
 1 file changed, 1 insertion(+)
package/monkey/monkey.hash +1 -0
index 47e0e0db0060..83fc0def604a 100644
@@ -1,3 +1,4 @@
 # md5 from http://monkey-project.com/releases/1.6/monkey-1.6.9.tar.gz.md5, sha256 locally computed:
 md5    c401734985a936ee07dbff5eca7d176a 				monkey-1.6.9.tar.gz
 sha256 f1122e89cda627123286542b0a18fcaa131cbe9d4f5dd897d9455157289148fb	monkey-1.6.9.tar.gz
+sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594	LICENSE
Signature · 1 line
2.19.0
#2 lore raw

PATCH 1/2 monkey: switch to cmake package

In reply to Baruch Siach

Hello,

Quoted 11 lines · Baruch Siach

Since version 1.6.x the configure script is a wrapper around cmake. Use cmake directly since we want to make sure that cmake is available.

monkey no longer provides the libmonkey.so shared library. Remove the BR2_PACKAGE_MONKEY_SHARED option.

Fixes:
http://autobuild.buildroot.net/results/b07/b077720c16857b752f4f38b73619a6a62862f35f/
http://autobuild.buildroot.net/results/799/799bcbd332f254fbf3d3547e5e52ac9463d58bcc/
http://autobuild.buildroot.net/results/3b0/3b095ca77a900af724fbc79d9cc20cbb9931fe15/

Quoted 7 lines
Cc Morgan Delestre <[email protected]>
Cc David Pierret <[email protected]>
---
 package/monkey/Config.in |  6 -----
 package/monkey/monkey.mk | 49 +++++++---------------------------------
 2 files changed, 8 insertions(+), 47 deletions(-)

Both applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com