* [Buildroot] [PATCH 1/1] monkey: new package
@ 2015-06-26 15:37 Julien CORJON
2015-06-26 16:50 ` Alexandre Belloni
2015-06-26 18:19 ` Thomas Petazzoni
0 siblings, 2 replies; 3+ messages in thread
From: Julien CORJON @ 2015-06-26 15:37 UTC (permalink / raw)
To: buildroot
From: Morgan Delestre <m.delestre@sinters.fr>
Signed-off-by: Morgan Delestre <m.delestre@sinters.fr>
Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>
---
package/Config.in | 1 +
package/monkey/0001-Configure-accept-all-conf.patch | 13 +++++++++++++
package/monkey/Config.in | 11 +++++++++++
package/monkey/monkey.mk | 20 ++++++++++++++++++++
4 files changed, 45 insertions(+)
create mode 100644 package/monkey/0001-Configure-accept-all-conf.patch
create mode 100644 package/monkey/Config.in
create mode 100644 package/monkey/monkey.mk
diff --git a/package/Config.in b/package/Config.in
index fac632f..3f5d853 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1224,6 +1224,7 @@ endif
source "package/modem-manager/Config.in"
source "package/mongoose/Config.in"
source "package/mongrel2/Config.in"
+ source "package/monkey/Config.in"
source "package/mosquitto/Config.in"
source "package/mrouted/Config.in"
source "package/mtr/Config.in"
diff --git a/package/monkey/0001-Configure-accept-all-conf.patch b/package/monkey/0001-Configure-accept-all-conf.patch
new file mode 100644
index 0000000..471e25b
--- /dev/null
+++ b/package/monkey/0001-Configure-accept-all-conf.patch
@@ -0,0 +1,13 @@
+Index: monkey-1.5.6/configure
+===================================================================
+--- monkey-1.5.6.orig/configure
++++ monkey-1.5.6/configure
+@@ -1204,7 +1204,7 @@ for arg in $*; do
+ ;;
+ --with-libtool-sysroot*)
+ ;;
+- *)
++ --help)
+ echo "Usage: ./configure [OPTION]... [VAR=VALUE]..."
+ echo
+ echo -e $bldwht"Optional Commands:" $txtrst
diff --git a/package/monkey/Config.in b/package/monkey/Config.in
new file mode 100644
index 0000000..519fd65
--- /dev/null
+++ b/package/monkey/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_MONKEY
+ bool "monkey"
+ depends on BR2_TOOLCHAIN_HAS_THREADS
+ depends on BR2_TOOLCHAIN_USES_GLIBC
+ help
+ Money Server is a fast and lightweight web server for Linux platforms.
+
+ http://monkey-project.com/
+
+comment "monkey needs an (e)glibc toolchain w/ threads, headers >= 2.6"
+ depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_USES_GLIBC
diff --git a/package/monkey/monkey.mk b/package/monkey/monkey.mk
new file mode 100644
index 0000000..20ce048
--- /dev/null
+++ b/package/monkey/monkey.mk
@@ -0,0 +1,20 @@
+#############################################################
+#
+# monkey
+#
+#############################################################
+MONKEY_VERSION_MAJOR = 1
+MONKEY_VERSION_MINOR = 5
+MONKEY_VERSION_PATCH = 6
+MONKEY_VERSION = $(MONKEY_VERSION_MAJOR).$(MONKEY_VERSION_MINOR).$(MONKEY_VERSION_PATCH)
+MONKEY_SOURCE = monkey-$(MONKEY_VERSION).tar.gz
+MONKEY_SITE = http://monkey-project.com/releases/$(MONKEY_VERSION_MAJOR).$(MONKEY_VERSION_MINOR)/
+MONKEY_INSTALL_STAGING = YES
+MONKEY_INSTALL_TARGET = YES
+
+# Monkey default memory allocator should be jemalloc
+# but monkey configure script does not handle
+# cross-compilation in a good way
+MONKEY_CONF_OPTS =--malloc-libc
+
+$(eval $(call autotools-package))
--
2.1.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] monkey: new package
2015-06-26 15:37 [Buildroot] [PATCH 1/1] monkey: new package Julien CORJON
@ 2015-06-26 16:50 ` Alexandre Belloni
2015-06-26 18:19 ` Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Alexandre Belloni @ 2015-06-26 16:50 UTC (permalink / raw)
To: buildroot
Hi,
On 26/06/2015 at 15:37:36 +0000, Julien CORJON wrote :
> diff --git a/package/monkey/Config.in b/package/monkey/Config.in
> new file mode 100644
> index 0000000..519fd65
> --- /dev/null
> +++ b/package/monkey/Config.in
> @@ -0,0 +1,11 @@
> +config BR2_PACKAGE_MONKEY
> + bool "monkey"
> + depends on BR2_TOOLCHAIN_HAS_THREADS
> + depends on BR2_TOOLCHAIN_USES_GLIBC
> + help
> + Money Server is a fast and lightweight web server for Linux platforms.
Typo -^
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] monkey: new package
2015-06-26 15:37 [Buildroot] [PATCH 1/1] monkey: new package Julien CORJON
2015-06-26 16:50 ` Alexandre Belloni
@ 2015-06-26 18:19 ` Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2015-06-26 18:19 UTC (permalink / raw)
To: buildroot
Julien, Morgan,
On Fri, 26 Jun 2015 15:37:36 +0000, Julien CORJON wrote:
> diff --git a/package/monkey/0001-Configure-accept-all-conf.patch b/package/monkey/0001-Configure-accept-all-conf.patch
> new file mode 100644
> index 0000000..471e25b
> --- /dev/null
> +++ b/package/monkey/0001-Configure-accept-all-conf.patch
All patches should have a description + Signed-off-by. See
http://buildroot.org/downloads/manual/manual.html#_format_and_licensing_of_the_package_patches.
> diff --git a/package/monkey/Config.in b/package/monkey/Config.in
> new file mode 100644
> index 0000000..519fd65
> --- /dev/null
> +++ b/package/monkey/Config.in
> @@ -0,0 +1,11 @@
> +config BR2_PACKAGE_MONKEY
> + bool "monkey"
> + depends on BR2_TOOLCHAIN_HAS_THREADS
> + depends on BR2_TOOLCHAIN_USES_GLIBC
Wrong indentation, should be one tab.
> + help
> + Money Server is a fast and lightweight web server for Linux platforms.
> +
> + http://monkey-project.com/
> +
> +comment "monkey needs an (e)glibc toolchain w/ threads, headers >= 2.6"
No need to indicate headers >= 2.6.
> + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_USES_GLIBC
> diff --git a/package/monkey/monkey.mk b/package/monkey/monkey.mk
> new file mode 100644
> index 0000000..20ce048
> --- /dev/null
> +++ b/package/monkey/monkey.mk
> @@ -0,0 +1,20 @@
> +#############################################################
> +#
> +# monkey
> +#
> +#############################################################
Wrong number of # signs, there should be 80 of them.
> +MONKEY_VERSION_MAJOR = 1
> +MONKEY_VERSION_MINOR = 5
> +MONKEY_VERSION_PATCH = 6
> +MONKEY_VERSION = $(MONKEY_VERSION_MAJOR).$(MONKEY_VERSION_MINOR).$(MONKEY_VERSION_PATCH)
No need to split that much:
MONKEY_VERSION_MAJOR = 1.5
MONKEY_VERSION = $(MONKEY_VERSION_MAJOR).6
> +MONKEY_SOURCE = monkey-$(MONKEY_VERSION).tar.gz
> +MONKEY_SITE = http://monkey-project.com/releases/$(MONKEY_VERSION_MAJOR).$(MONKEY_VERSION_MINOR)/
And:
MONKEY_SITE = http://monkey-project.com/releases/$(MONKEY_VERSION_MAJOR)/
> +MONKEY_INSTALL_STAGING = YES
> +MONKEY_INSTALL_TARGET = YES
MONKEY_INSTALL_TARGET = YES is not needed, that's the default.
> +
> +# Monkey default memory allocator should be jemalloc
> +# but monkey configure script does not handle
> +# cross-compilation in a good way
> +MONKEY_CONF_OPTS =--malloc-libc
> +
> +$(eval $(call autotools-package))
No need for $(eval $(call ...)), just $(eval $(autotools-package)).
Also, this package is not using the autotools, so please don't use
autotools-package but generic-package instead. This way, your patch
will also no longer be needed.
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-06-26 18:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-26 15:37 [Buildroot] [PATCH 1/1] monkey: new package Julien CORJON
2015-06-26 16:50 ` Alexandre Belloni
2015-06-26 18:19 ` Thomas Petazzoni
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.