Move all to deprecated folder.
This commit is contained in:
@@ -0,0 +1,43 @@
|
||||
From 3cbef2195533f357c8a80c2840108662461273b7 Mon Sep 17 00:00:00 2001
|
||||
From: Lionel Orry <lionel.orry@gmail.com>
|
||||
Date: Wed, 27 Mar 2013 14:48:19 +0100
|
||||
Subject: [PATCH 4/4] Do not run tests.
|
||||
|
||||
This patch is specific to cross-compiled environments and avoids running
|
||||
the tests on the host. It is not meant to be applied upstream.
|
||||
|
||||
Signed-off-by: Lionel Orry <lionel.orry@gmail.com>
|
||||
---
|
||||
Makefile | 2 +-
|
||||
tools/m2sh/Makefile | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 7dc4089..ca72630 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -16,7 +16,7 @@ TEST_SRC=$(wildcard tests/*_tests.c)
|
||||
TESTS=$(patsubst %.c,%,${TEST_SRC})
|
||||
MAKEOPTS=OPTFLAGS="${NOEXTCFLAGS} ${OPTFLAGS}" OPTLIBS="${OPTLIBS}" LIBS="${LIBS}" DESTDIR="${DESTDIR}" PREFIX="${PREFIX}"
|
||||
|
||||
-all: bin/mongrel2 tests m2sh procer
|
||||
+all: bin/mongrel2 m2sh procer filters config_modules
|
||||
|
||||
dev: CFLAGS=-g -Wall -Isrc -Wall -Wextra $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
|
||||
dev: all
|
||||
diff --git a/tools/m2sh/Makefile b/tools/m2sh/Makefile
|
||||
index b50d8a0..334e4da 100644
|
||||
--- a/tools/m2sh/Makefile
|
||||
+++ b/tools/m2sh/Makefile
|
||||
@@ -9,7 +9,7 @@ TESTS=$(patsubst %.c,%,${TEST_SRC})
|
||||
LIB_SRC=$(filter-out src/m2sh.c,${SOURCES})
|
||||
LIB_OBJ=$(filter-out src/m2sh.o,${OBJECTS})
|
||||
|
||||
-all: ../lemon/lemon tests build/m2sh
|
||||
+all: ../lemon/lemon build/m2sh
|
||||
|
||||
dev: CFLAGS=-g -Wall -Wextra -Isrc -I../../src $(OPTFLAGS)
|
||||
dev: all
|
||||
--
|
||||
1.8.1.4
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
From 298356c44a7df2b34c4e307c531d2010e2cb4b79 Mon Sep 17 00:00:00 2001
|
||||
From: Lionel Orry <lionel.orry@gmail.com>
|
||||
Date: Wed, 27 Mar 2013 15:56:56 +0100
|
||||
Subject: [PATCH 1/1] Fix Makefiles for cross-compilation
|
||||
|
||||
The CFLAGS handling in mongrel2 is really messy and it is hard to make
|
||||
it behave correctly with cross-compiling environments. This patch
|
||||
restricts the Makefiles syntax to GNU Make, but help cross-compiling.
|
||||
|
||||
This is not meant to be applied upstream.
|
||||
|
||||
Signed-off-by: Lionel Orry <lionel.orry@gmail.com>
|
||||
---
|
||||
Makefile | 2 +-
|
||||
tools/config_modules/Makefile | 2 +-
|
||||
tools/filters/Makefile | 2 +-
|
||||
tools/m2sh/Makefile | 2 +-
|
||||
tools/procer/Makefile | 2 +-
|
||||
5 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 6dce4a6..d48e05e 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1,4 +1,4 @@
|
||||
-CFLAGS=-g -O2 -Wall -Wextra -Isrc -Isrc/polarssl/include -pthread -rdynamic -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
|
||||
+override CFLAGS += -g -O2 -Wall -Wextra -Isrc -Isrc/polarssl/include -pthread -rdynamic -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
|
||||
LIBS=-lzmq -ldl -lsqlite3 $(OPTLIBS)
|
||||
PREFIX?=/usr/local
|
||||
|
||||
diff --git a/tools/config_modules/Makefile b/tools/config_modules/Makefile
|
||||
index 398490c..53f2255 100644
|
||||
--- a/tools/config_modules/Makefile
|
||||
+++ b/tools/config_modules/Makefile
|
||||
@@ -1,5 +1,5 @@
|
||||
PREFIX?=/usr/local
|
||||
-CFLAGS=-I../../src -I../../src/polarssl/include $(OPTFLAGS) -fPIC -shared -nostartfiles -L../../build
|
||||
+override CFLAGS += -I../../src -I../../src/polarssl/include $(OPTFLAGS) -fPIC -shared -nostartfiles -L../../build
|
||||
LDFLAGS=$(OPTLIBS)
|
||||
|
||||
MONGO_SRC = mongo-c-driver/src/bson.c \
|
||||
diff --git a/tools/filters/Makefile b/tools/filters/Makefile
|
||||
index f9f4556..6077b79 100644
|
||||
--- a/tools/filters/Makefile
|
||||
+++ b/tools/filters/Makefile
|
||||
@@ -1,5 +1,5 @@
|
||||
PREFIX?=/usr/local
|
||||
-CFLAGS=-I../../src -I../../src/polarssl/include $(OPTFLAGS) -g -fPIC -shared -nostartfiles -L../../build
|
||||
+ override CFLAGS += -I../../src -I../../src/polarssl/include $(OPTFLAGS) -g -fPIC -shared -nostartfiles -L../../build
|
||||
LDFLAGS=$(OPTLIBS)
|
||||
|
||||
all: null.so
|
||||
diff --git a/tools/m2sh/Makefile b/tools/m2sh/Makefile
|
||||
index b50d8a0..ba378c5 100644
|
||||
--- a/tools/m2sh/Makefile
|
||||
+++ b/tools/m2sh/Makefile
|
||||
@@ -1,4 +1,4 @@
|
||||
-CFLAGS=-DNDEBUG -DNO_LINENOS -pthread -g -I../../src -Isrc -Wall $(OPTFLAGS)
|
||||
+override CFLAGS += -DNDEBUG -DNO_LINENOS -pthread -g -I../../src -Isrc -Wall $(OPTFLAGS)
|
||||
LIBS=-lzmq -lsqlite3 ../../build/libm2.a $(OPTLIBS)
|
||||
|
||||
PREFIX?=/usr/local
|
||||
diff --git a/tools/procer/Makefile b/tools/procer/Makefile
|
||||
index d0d7de0..629b2e9 100644
|
||||
--- a/tools/procer/Makefile
|
||||
+++ b/tools/procer/Makefile
|
||||
@@ -1,4 +1,4 @@
|
||||
-CFLAGS=-DNDEBUG -pthread -g -I../../src -Wall $(OPTFLAGS)
|
||||
+override CFLAGS += -DNDEBUG -pthread -g -I../../src -Wall $(OPTFLAGS)
|
||||
PREFIX?=/usr/local
|
||||
LIBS?=-lzmq
|
||||
SOURCES=$(wildcard *.c)
|
||||
--
|
||||
1.8.1.4
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
From 8d0bc79f38913b1a55e7d151b32bbc9462c24b47 Mon Sep 17 00:00:00 2001
|
||||
From: Jason Miller <jason@jasom.org>
|
||||
Date: Fri, 14 Aug 2015 19:03:09 -0700
|
||||
Subject: [PATCH] Rename symbol to prevent conflict
|
||||
|
||||
One of the standard headers defines max_align_t on some versions of linux.
|
||||
|
||||
[Backported from upstream commit
|
||||
https://github.com/mongrel2/mongrel2/commit/563bac8c59b9b32205164d237cf1ec0cb48d189f.]
|
||||
|
||||
Signed-off-by: Rodrigo Rebello <rprebello@gmail.com>
|
||||
---
|
||||
src/mem/align.h | 2 +-
|
||||
src/mem/halloc.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/mem/align.h b/src/mem/align.h
|
||||
index 4c6e183..03a4999 100644
|
||||
--- a/src/mem/align.h
|
||||
+++ b/src/mem/align.h
|
||||
@@ -30,7 +30,7 @@ union max_align
|
||||
void (*q)(void);
|
||||
};
|
||||
|
||||
-typedef union max_align max_align_t;
|
||||
+typedef union max_align h_max_align_t;
|
||||
|
||||
#endif
|
||||
|
||||
diff --git a/src/mem/halloc.c b/src/mem/halloc.c
|
||||
index b097d1f..40d0c09 100644
|
||||
--- a/src/mem/halloc.c
|
||||
+++ b/src/mem/halloc.c
|
||||
@@ -34,7 +34,7 @@ typedef struct hblock
|
||||
#endif
|
||||
hlist_item_t siblings; /* 2 pointers */
|
||||
hlist_head_t children; /* 1 pointer */
|
||||
- max_align_t data[1]; /* not allocated, see below */
|
||||
+ h_max_align_t data[1]; /* not allocated, see below */
|
||||
|
||||
} hblock_t;
|
||||
|
||||
--
|
||||
2.1.4
|
||||
|
||||
33
deprecated/firmware/buildroot/package/mongrel2/Config.in
Normal file
33
deprecated/firmware/buildroot/package/mongrel2/Config.in
Normal file
@@ -0,0 +1,33 @@
|
||||
# mongrel2 uses {get,make,swap}context() functions, which are
|
||||
# available in glibc for all architectures and in uClibc only for a
|
||||
# subset of the architectures
|
||||
config BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS
|
||||
bool
|
||||
default y if BR2_TOOLCHAIN_USES_GLIBC
|
||||
default y if BR2_TOOLCHAIN_USES_UCLIBC && \
|
||||
(BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || BR2_x86_64)
|
||||
|
||||
comment "mongrel2 needs a uClibc or glibc toolchain w/ C++, threads, wchar, dynamic library"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || \
|
||||
!BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \
|
||||
BR2_STATIC_LIBS || !BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS
|
||||
|
||||
config BR2_PACKAGE_MONGREL2
|
||||
bool "mongrel2"
|
||||
select BR2_PACKAGE_SQLITE
|
||||
select BR2_PACKAGE_ZEROMQ
|
||||
depends on BR2_INSTALL_LIBSTDCPP # zeromq
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
|
||||
depends on BR2_USE_WCHAR # zeromq -> util-linux
|
||||
depends on !BR2_STATIC_LIBS # uses dlopen()
|
||||
depends on BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS
|
||||
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.
|
||||
|
||||
http://www.mongrel2.org
|
||||
@@ -0,0 +1,2 @@
|
||||
# Locally computed
|
||||
sha256 543553c3082f2b992649a975f6cb7324ae2aea93af05288ea4f2c1262a7f63b2 mongrel2-v1.9.2.tar.bz2
|
||||
41
deprecated/firmware/buildroot/package/mongrel2/mongrel2.mk
Normal file
41
deprecated/firmware/buildroot/package/mongrel2/mongrel2.mk
Normal file
@@ -0,0 +1,41 @@
|
||||
################################################################################
|
||||
#
|
||||
# mongrel2
|
||||
#
|
||||
################################################################################
|
||||
|
||||
MONGREL2_VERSION = 1.9.2
|
||||
MONGREL2_SOURCE = mongrel2-v$(MONGREL2_VERSION).tar.bz2
|
||||
# Do not use the github helper here, the generated tarball is *NOT* the same
|
||||
# as the one uploaded by upstream for the release.
|
||||
MONGREL2_SITE = https://github.com/mongrel2/mongrel2/releases/download/$(MONGREL2_VERSION)
|
||||
MONGREL2_LICENSE = BSD-3c
|
||||
MONGREL2_LICENSE_FILES = LICENSE
|
||||
MONGREL2_DEPENDENCIES = sqlite zeromq
|
||||
|
||||
define MONGREL2_POLARSSL_DISABLE_ASM
|
||||
$(SED) '/^#define POLARSSL_HAVE_ASM/d' $(@D)/src/polarssl/include/polarssl/config.h
|
||||
endef
|
||||
|
||||
# ARM in thumb mode breaks debugging with asm optimizations
|
||||
# Microblaze asm optimizations are broken in general
|
||||
# MIPS R6 asm is not yet supported
|
||||
ifeq ($(BR2_ENABLE_DEBUG)$(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_ARM_INSTRUCTIONS_THUMB2),yy)
|
||||
MONGREL2_POST_CONFIGURE_HOOKS += MONGREL2_POLARSSL_DISABLE_ASM
|
||||
else ifeq ($(BR2_microblaze),y)
|
||||
MONGREL2_POST_CONFIGURE_HOOKS += MONGREL2_POLARSSL_DISABLE_ASM
|
||||
else ifeq ($(BR2_mips_32r6)$(BR2_mips_64r6),y)
|
||||
MONGREL2_POST_CONFIGURE_HOOKS += MONGREL2_POLARSSL_DISABLE_ASM
|
||||
endif
|
||||
|
||||
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
|
||||
|
||||
$(eval $(generic-package))
|
||||
Reference in New Issue
Block a user