[Buildroot] [PATCH 1/2] mongoose: bump to version 5.4

[Buildroot] [PATCH 1/2] mongoose: bump to version 5.4

[Davide Viti]

Avoid compilation of the server via the upstream Makefile which
unconditionally uses -lssl

Signed-off-by: Davide Viti <zinosat@tiscali.it>
---
 package/mongoose/mongoose.mk |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/mongoose/mongoose.mk b/package/mongoose/mongoose.mk
index ee93846..4182a30 100644
--- a/package/mongoose/mongoose.mk
+++ b/package/mongoose/mongoose.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MONGOOSE_VERSION = 5.3
+MONGOOSE_VERSION = 5.4
 MONGOOSE_SITE = $(call github,cesanta,mongoose,$(MONGOOSE_VERSION))
 MONGOOSE_LICENSE = GPLv2
 MONGOOSE_LICENSE_FILES = LICENSE
@@ -19,8 +19,8 @@ MONGOOSE_CFLAGS += -DNS_ENABLE_SSL -lssl -lcrypto -lz
 endif
 
 define MONGOOSE_BUILD_CMDS
-	$(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D)/examples \
-		CFLAGS_EXTRA="$(MONGOOSE_CFLAGS)" server
+	$(TARGET_CC) $(@D)/examples/server.c $(@D)/mongoose.c \
+		-o $(@D)/examples/server $(MONGOOSE_CFLAGS) -pthread -ldl
 	$(TARGET_CC) -c $(@D)/mongoose.c $(MONGOOSE_CFLAGS) -o $(@D)/mongoose.o
 	$(TARGET_AR) rcs $(@D)/libmongoose.a $(@D)/mongoose.o
 endef
-- 
1.7.10.4

[Buildroot] [PATCH 2/2] mongoose: patch to avoid _LARGEFILE_SOURCE redefinition warning

[Davide Viti]

Signed-off-by: Davide Viti <zinosat@tiscali.it>
---
 package/mongoose/largefile-conditional-define.patch |   12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 package/mongoose/largefile-conditional-define.patch

diff --git a/package/mongoose/largefile-conditional-define.patch b/package/mongoose/largefile-conditional-define.patch
new file mode 100644
index 0000000..4fbaa04
--- /dev/null
+++ b/package/mongoose/largefile-conditional-define.patch
@@ -0,0 +1,12 @@
+--- mongoose-5.4/mongoose.c~	2014-07-28 13:19:00.000000000 +0200
++++ mongoose-5.4/mongoose.c	2014-08-04 23:10:59.164092500 +0200
+@@ -49,7 +49,9 @@
+ #define _XOPEN_SOURCE 600       // For flockfile() on Linux
+ #define __STDC_FORMAT_MACROS    // <inttypes.h> wants this for C++
+ #define __STDC_LIMIT_MACROS     // C++ wants that for INT64_MAX
++#ifndef _LARGEFILE_SOURCE
+ #define _LARGEFILE_SOURCE       // Enable fseeko() and ftello() functions
++#endif
+ #define _FILE_OFFSET_BITS 64    // Enable 64-bit file offsets
+ 
+ #ifdef _MSC_VER
-- 
1.7.10.4

[Buildroot] [PATCH 2/2] mongoose: patch to avoid _LARGEFILE_SOURCE redefinition warning

[Thomas Petazzoni]

Dear Davide Viti,

On Mon,  4 Aug 2014 23:31:43 +0200, Davide Viti wrote:
> 
> Signed-off-by: Davide Viti <zinosat@tiscali.it>
> ---
>  package/mongoose/largefile-conditional-define.patch |   12 ++++++++++++
>  1 file changed, 12 insertions(+)
>  create mode 100644 package/mongoose/largefile-conditional-define.patch
> 
> diff --git a/package/mongoose/largefile-conditional-define.patch b/package/mongoose/largefile-conditional-define.patch
> new file mode 100644
> index 0000000..4fbaa04
> --- /dev/null
> +++ b/package/mongoose/largefile-conditional-define.patch

The file name of the patch does not follow the Buildroot convention
(see the Buildroot manual for details), and lacks a description +
Signed-off-by line.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 1/2] mongoose: bump to version 5.4

[Thomas Petazzoni]

Dear Davide Viti,

On Mon,  4 Aug 2014 23:31:42 +0200, Davide Viti wrote:
> Avoid compilation of the server via the upstream Makefile which
> unconditionally uses -lssl

Ok, but then, don't we want to optionally use the SSL support when
available (i.e when BR2_PACKAGE_OPENSSL=y) ?

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com