From 1f17715dc54de71288757402013ec75ef39107e7 Mon Sep 17 00:00:00 2001 From: Lionel Orry Date: Tue, 8 Apr 2014 20:40:21 +0200 Subject: [PATCH] mongrel2: bump to version 1.9.0 The github helper does not retrieve a suitable tarball including the polarssl source code, thus the change on the download url. This version of mongrel2 should be compliant with latest ZeroMQ versions. Signed-off-by: Lionel Orry Tested-by: Jerzy Grzegorek Signed-off-by: Peter Korsgaard --- ...l2-0003-Fix-Makefiles-for-cross-compilation.patch | 12 ++++++------ package/mongrel2/mongrel2.mk | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/mongrel2/mongrel2-0003-Fix-Makefiles-for-cross-compilation.patch b/package/mongrel2/mongrel2-0003-Fix-Makefiles-for-cross-compilation.patch index 164d7f9e1..730d8ebfc 100644 --- a/package/mongrel2/mongrel2-0003-Fix-Makefiles-for-cross-compilation.patch +++ b/package/mongrel2/mongrel2-0003-Fix-Makefiles-for-cross-compilation.patch @@ -23,8 +23,8 @@ index 6dce4a6..d48e05e 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ --CFLAGS=-g -O2 -Wall -Wextra -Isrc -pthread -rdynamic -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64 -+override CFLAGS += -g -O2 -Wall -Wextra -Isrc -pthread -rdynamic -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64 +-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 @@ -34,8 +34,8 @@ index 398490c..53f2255 100644 +++ b/tools/config_modules/Makefile @@ -1,5 +1,5 @@ PREFIX?=/usr/local --CFLAGS=-I../../src $(OPTFLAGS) -fPIC -shared -nostartfiles -L../../build -+override CFLAGS += -I../../src $(OPTFLAGS) -fPIC -shared -nostartfiles -L../../build +-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 \ @@ -45,8 +45,8 @@ index f9f4556..6077b79 100644 +++ b/tools/filters/Makefile @@ -1,5 +1,5 @@ PREFIX?=/usr/local --CFLAGS=-I../../src $(OPTFLAGS) -fPIC -shared -nostartfiles -L../../build -+override CFLAGS += -I../../src $(OPTFLAGS) -fPIC -shared -nostartfiles -L../../build +-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/package/mongrel2/mongrel2.mk b/package/mongrel2/mongrel2.mk index e6a7be38f..590a5225a 100644 --- a/package/mongrel2/mongrel2.mk +++ b/package/mongrel2/mongrel2.mk @@ -4,8 +4,8 @@ # ################################################################################ -MONGREL2_VERSION = v1.8.0 -MONGREL2_SITE = $(call github,zedshaw,mongrel2,$(MONGREL2_VERSION)) +MONGREL2_VERSION = v1.9.0 +MONGREL2_SITE = https://github.com/zedshaw/mongrel2/releases/download/$(MONGREL2_VERSION)/ MONGREL2_LICENSE = BSD-3c MONGREL2_LICENSE_FILES = LICENSE MONGREL2_DEPENDENCIES = sqlite zeromq