Skip to contentSkip to conversation

mongrel2: bump to version 1.9.0

PATCH New Lionel Orry 3 participants 3 messages Apr 8, 2014 – Apr 10, 2014

lore
Share & tools
lore

Lionel Orry

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 .../mongrel2-0003-Fix-Makefiles-for-cross-compilation.patch  | 12 ++++++------
 package/mongrel2/mongrel2.mk                                 |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)
package/mongrel2/mongrel2-0003-Fix-Makefiles-for-cross-compilation.patch +6 -6
index 164d7f9..730d8eb 100644
@@ -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
package/mongrel2/mongrel2.mk +2 -2
index e6a7be3..590a522 100644
@@ -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
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 1/1 mongrel2: bump to version 1.9.0

Hi Lionel,

Quoted 53 lines

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 <[email protected]>
---
  .../mongrel2-0003-Fix-Makefiles-for-cross-compilation.patch  | 12 ++++++------
  package/mongrel2/mongrel2.mk                                 |  4 ++--
  2 files changed, 8 insertions(+), 8 deletions(-)
package/mongrel2/mongrel2-0003-Fix-Makefiles-for-cross-compilation.patch +6 -6
index 164d7f9..730d8eb 100644
@@ -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
package/mongrel2/mongrel2.mk +0 -0
index e6a7be3..590a522 100644

package/mongrel2/mongrel2.mk line 11

Quoted 10 lines
package/mongrel2/mongrel2.mk +2 -2
@@ -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

It builds fine against zeromq v3.2.4 as well as v4.0.1

Tested-by Jerzy Grzegorek <[email protected]>

Regards,
Jerzy

#2 lore raw

PATCH 1/1 mongrel2: bump to version 1.9.0

In reply to Lionel Orry
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

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

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 <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard