Skip to contentSkip to conversation

mongrel2: new package

PATCH New Lionel Orry 2 participants 3 messages Mar 27, 2013 – Apr 27, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mongrel2: new package

---
 package/Config.in                                  |  1 +
 package/mongrel2/Config.in                         | 19 ++++++
 ...l2-0001-use-CC-variable-to-compile-procer.patch | 28 ++++++++
 .../mongrel2/mongrel2-0002-Do-not-run-tests.patch  | 43 +++++++++++++
 ...-0003-Fix-Makefiles-for-cross-compilation.patch | 75 ++++++++++++++++++++++
 package/mongrel2/mongrel2.mk                       | 31 +++++++++
 6 files changed, 197 insertions(+)
 create mode 100644 package/mongrel2/Config.in
 create mode 100644 package/mongrel2/mongrel2-0001-use-CC-variable-to-compile-procer.patch
 create mode 100644 package/mongrel2/mongrel2-0002-Do-not-run-tests.patch
 create mode 100644 package/mongrel2/mongrel2-0003-Fix-Makefiles-for-cross-compilation.patch
 create mode 100644 package/mongrel2/mongrel2.mk
package/Config.in +1 -0
index 5d8f4f6..f27dae6 100644
@@ -680,6 +680,7 @@ source "package/linphone/Config.in"
 source "package/lrzsz/Config.in"
 source "package/macchanger/Config.in"
 source "package/mii-diag/Config.in"
+source "package/mongrel2/Config.in"
 source "package/mrouted/Config.in"
 source "package/msmtp/Config.in"
 source "package/mutt/Config.in"
package/mongrel2/Config.in new file +19 -0
new file mode 100644
index 0000000..13dd787
@@ -0,0 +1,19 @@
+config BR2_PACKAGE_MONGREL2
+	bool "mongrel2"
+	select BR2_PACKAGE_SQLITE
+	select BR2_PACKAGE_ZEROMQ
+	depends on BR2_INSTALL_LIBSTDCPP # zeromq
+	depends on BR2_INET_IPV6 # zeromq
+	depends on BR2_LARGEFILE # zeromq -> util-linux
+	depends on BR2_USE_WCHAR # zeromq -> util-linux
+	help
+	  Mongrel2 is an application, language, and network architecture agnostic
+	  web server that focuses on web applications using modern browser
+	  technologies.
+
+	  Mongrel2 supports 17 languages and platforms, HTTP, Flash sockets,
+	  WebSockets, Long Polling, and many ways to deploy and hack on it.
+
+	  Mongrel2 depends on sqlite3 and zeromq.
+
+	  http://www.mongrel2.org
package/mongrel2/mongrel2-0001-use-CC-variable-to-compile-procer.patch new file +28 -0
new file mode 100644
index 0000000..310177a
@@ -0,0 +1,28 @@
+From d30cf797af4828e49fd3c0f25841e669dec05ed5 Mon Sep 17 00:00:00 2001
+From: Lionel Orry <[email protected]>
+Date: Wed, 27 Mar 2013 14:02:00 +0100
+Subject: [PATCH 3/4] use CC variable to compile procer.
+
+This fixes procer tool cross-compilation issues.
+
+Signed-off-by: Lionel Orry <[email protected]>
+---
+ tools/procer/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/procer/Makefile b/tools/procer/Makefile
+index d0d7de0..bb9aa31 100644
+--- a/tools/procer/Makefile
++++ b/tools/procer/Makefile
+@@ -8,7 +8,7 @@ all: procer
+ 
+ 
+ procer: ../../build/libm2.a ${OBJECTS}
+-	gcc $(OPTFLAGS) $(OPTLIBS) -o $@ ${OBJECTS} ../../build/libm2.a ${LIBS}
++	$(CC) $(OPTFLAGS) $(OPTLIBS) -o $@ ${OBJECTS} ../../build/libm2.a ${LIBS}
+ 
+ clean:
+ 	rm -f *.o procer
+-- 
+1.8.1.4
+
package/mongrel2/mongrel2-0002-Do-not-run-tests.patch new file +43 -0

43 lines not on this page · raw message

package/mongrel2/mongrel2-0003-Fix-Makefiles-for-cross-compilation.patch new file +75 -0

75 lines not on this page · raw message

package/mongrel2/mongrel2.mk new file +31 -0
new file mode 100644
index 0000000..6382d59
@@ -0,0 +1,31 @@
+#############################################################
+#
+# Mongrel2
+#
+#############################################################
+
+MONGREL2_VERSION = 1.8.0
+MONGREL2_SOURCE = mongrel2_$(MONGREL2_VERSION).tar.gz
+MONGREL2_SITE = https://github.com/zedshaw/mongrel2/tarball/v1.8.0
+MONGREL2_LICENSE = BSD-3c
+MONGREL2_LICENSE_FILES = LICENSE
+MONGREL2_DEPENDENCIES = sqlite zeromq
+
+define MONGREL2_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
+		PREFIX=/usr all
+endef
+
+define MONGREL2_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
+		PREFIX=/usr DESTDIR=$(TARGET_DIR) install
+endef
+
+define MONGREL2_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/bin/mongrel2
+	rm -f $(TARGET_DIR)/usr/bin/m2sh
+	rm -f $(TARGET_DIR)/usr/bin/procer
+endef
+
+$(eval $(generic-package))
+
Signature · 1 line
1.8.1.4
#1 lore raw

PATCH 1/1 mongrel2: new package

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Lionel" == Lionel Orry <[email protected]> writes:

Lionel> Signed-off-by: Lionel Orry <[email protected]> Lionel> ---

 Lionel>  package/Config.in                                  |  1 +
 Lionel>  package/mongrel2/Config.in                         | 19 ++++++
 Lionel>  ...l2-0001-use-CC-variable-to-compile-procer.patch | 28 ++++++++
 Lionel>  .../mongrel2/mongrel2-0002-Do-not-run-tests.patch  | 43 +++++++++++++
 Lionel>  ...-0003-Fix-Makefiles-for-cross-compilation.patch | 75 ++++++++++++++++++++++
 Lionel>  package/mongrel2/mongrel2.mk                       | 31 +++++++++
 Lionel>  6 files changed, 197 insertions(+)
 Lionel>  create mode 100644 package/mongrel2/Config.in
 Lionel>  create mode 100644 package/mongrel2/mongrel2-0001-use-CC-variable-to-compile-procer.patch
 Lionel>  create mode 100644 package/mongrel2/mongrel2-0002-Do-not-run-tests.patch
 Lionel>  create mode 100644 package/mongrel2/mongrel2-0003-Fix-Makefiles-for-cross-compilation.patch
 Lionel>  create mode 100644 package/mongrel2/mongrel2.mk

Lionel> diff --git a/package/Config.in b/package/Config.in Lionel> index 5d8f4f6..f27dae6 100644
Lionel> --- a/package/Config.in
Lionel> +++ b/package/Config.in
Lionel> @@ -680,6 +680,7 @@ source "package/linphone/Config.in"

 Lionel>  source "package/lrzsz/Config.in"
 Lionel>  source "package/macchanger/Config.in"
 Lionel>  source "package/mii-diag/Config.in"
 Lionel> +source "package/mongrel2/Config.in"
 Lionel>  source "package/mrouted/Config.in"
 Lionel>  source "package/msmtp/Config.in"
 Lionel>  source "package/mutt/Config.in"
 Lionel> diff --git a/package/mongrel2/Config.in b/package/mongrel2/Config.in
 Lionel> new file mode 100644
 Lionel> index 0000000..13dd787
 Lionel> --- /dev/null
 Lionel> +++ b/package/mongrel2/Config.in
 Lionel> @@ -0,0 +1,19 @@
 Lionel> +config BR2_PACKAGE_MONGREL2
 Lionel> +	bool "mongrel2"
 Lionel> +	select BR2_PACKAGE_SQLITE
 Lionel> +	select BR2_PACKAGE_ZEROMQ
 Lionel> +	depends on BR2_INSTALL_LIBSTDCPP # zeromq
 Lionel> +	depends on BR2_INET_IPV6 # zeromq
 Lionel> +	depends on BR2_LARGEFILE # zeromq -> util-linux
 Lionel> +	depends on BR2_USE_WCHAR # zeromq -> util-linux
 Lionel> +	help
 Lionel> +	  Mongrel2 is an application, language, and network architecture agnostic
 Lionel> +	  web server that focuses on web applications using modern browser
 Lionel> +	  technologies.

Lionel> +
Lionel> + Mongrel2 supports 17 languages and platforms, HTTP, Flash sockets,
Lionel> + WebSockets, Long Polling, and many ways to deploy and hack on it.
Lionel> +
Lionel> + Mongrel2 depends on sqlite3 and zeromq.

These lines are too long. Please wrap at ~70 chars.

Lionel> new file mode 100644
Lionel> index 0000000..6382d59
Lionel> --- /dev/null
Lionel> +++ b/package/mongrel2/mongrel2.mk
Lionel> @@ -0,0 +1,31 @@
Lionel> +############################################################# Lionel> +#
Lionel> +# Mongrel2
Lionel> +#
Lionel> +############################################################# Lionel> +
Lionel> +MONGREL2_VERSION = 1.8.0
Lionel> +MONGREL2_SOURCE = mongrel2_$(MONGREL2_VERSION).tar.gz Lionel> +MONGREL2_SITE = https://github.com/zedshaw/mongrel2/tarball/v1.8.0

This should use _VERSION instead of hardcoding 1.8.0.

Committed with these fixes, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 mongrel2: new package

Hi Peter,

Quoted 47 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Lionel" == Lionel Orry <[email protected]> writes:

Lionel> Signed-off-by: Lionel Orry <[email protected]> Lionel> ---

 Lionel>  package/Config.in                                  |  1 +
 Lionel>  package/mongrel2/Config.in                         | 19 ++++++
 Lionel>  ...l2-0001-use-CC-variable-to-compile-procer.patch | 28 ++++++++
 Lionel>  .../mongrel2/mongrel2-0002-Do-not-run-tests.patch  | 43 +++++++++++++
 Lionel>  ...-0003-Fix-Makefiles-for-cross-compilation.patch | 75 ++++++++++++++++++++++
 Lionel>  package/mongrel2/mongrel2.mk                       | 31 +++++++++
 Lionel>  6 files changed, 197 insertions(+)
 Lionel>  create mode 100644 package/mongrel2/Config.in
 Lionel>  create mode 100644 package/mongrel2/mongrel2-0001-use-CC-variable-to-compile-procer.patch
 Lionel>  create mode 100644 package/mongrel2/mongrel2-0002-Do-not-run-tests.patch
 Lionel>  create mode 100644 package/mongrel2/mongrel2-0003-Fix-Makefiles-for-cross-compilation.patch
 Lionel>  create mode 100644 package/mongrel2/mongrel2.mk

Lionel> diff --git a/package/Config.in b/package/Config.in Lionel> index 5d8f4f6..f27dae6 100644
Lionel> --- a/package/Config.in
Lionel> +++ b/package/Config.in
Lionel> @@ -680,6 +680,7 @@ source "package/linphone/Config.in"

 Lionel>  source "package/lrzsz/Config.in"
 Lionel>  source "package/macchanger/Config.in"
 Lionel>  source "package/mii-diag/Config.in"
 Lionel> +source "package/mongrel2/Config.in"
 Lionel>  source "package/mrouted/Config.in"
 Lionel>  source "package/msmtp/Config.in"
 Lionel>  source "package/mutt/Config.in"
 Lionel> diff --git a/package/mongrel2/Config.in b/package/mongrel2/Config.in
 Lionel> new file mode 100644
 Lionel> index 0000000..13dd787
 Lionel> --- /dev/null
 Lionel> +++ b/package/mongrel2/Config.in
 Lionel> @@ -0,0 +1,19 @@
 Lionel> +config BR2_PACKAGE_MONGREL2
 Lionel> +      bool "mongrel2"
 Lionel> +      select BR2_PACKAGE_SQLITE
 Lionel> +      select BR2_PACKAGE_ZEROMQ
 Lionel> +      depends on BR2_INSTALL_LIBSTDCPP # zeromq
 Lionel> +      depends on BR2_INET_IPV6 # zeromq
 Lionel> +      depends on BR2_LARGEFILE # zeromq -> util-linux
 Lionel> +      depends on BR2_USE_WCHAR # zeromq -> util-linux
 Lionel> +      help
 Lionel> +        Mongrel2 is an application, language, and network architecture agnostic
 Lionel> +        web server that focuses on web applications using modern browser
 Lionel> +        technologies.
Quoted 7 lines

Lionel> +
Lionel> + Mongrel2 supports 17 languages and platforms, HTTP, Flash sockets,
Lionel> + WebSockets, Long Polling, and many ways to deploy and hack on it.
Lionel> +
Lionel> + Mongrel2 depends on sqlite3 and zeromq.

These lines are too long. Please wrap at ~70 chars.

I thought that was 80 chars, sorry for that. I'll remember. :)

Quoted 16 lines

Lionel> new file mode 100644
Lionel> index 0000000..6382d59
Lionel> --- /dev/null
Lionel> +++ b/package/mongrel2/mongrel2.mk
Lionel> @@ -0,0 +1,31 @@
Lionel> +############################################################# Lionel> +#
Lionel> +# Mongrel2
Lionel> +#
Lionel> +############################################################# Lionel> +
Lionel> +MONGREL2_VERSION = 1.8.0
Lionel> +MONGREL2_SOURCE = mongrel2_$(MONGREL2_VERSION).tar.gz Lionel> +MONGREL2_SITE = https://github.com/zedshaw/mongrel2/tarball/v1.8.0

Quoted 3 lines

This should use _VERSION instead of hardcoding 1.8.0.

Committed with these fixes, thanks.

Great, thanks a lot !

Best regards,
Lionel

Quoted 3 lines

--
Bye, Peter Korsgaard