diff options
| -rw-r--r-- | package/mongoose/Config.in | 5 | ||||
| -rwxr-xr-x | package/mongoose/S85mongoose | 2 | ||||
| -rw-r--r-- | package/mongoose/mongoose.mk | 17 |
3 files changed, 11 insertions, 13 deletions
diff --git a/package/mongoose/Config.in b/package/mongoose/Config.in index 35723dea23..2526112d30 100644 --- a/package/mongoose/Config.in +++ b/package/mongoose/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_MONGOOSE bool "mongoose" + depends on BR2_LARGEFILE depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() help @@ -7,6 +8,6 @@ config BR2_PACKAGE_MONGOOSE https://github.com/valenok/mongoose -comment "mongoose needs a toolchain w/ threads" +comment "mongoose needs a toolchain w/ threads, largefile" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_LARGEFILE diff --git a/package/mongoose/S85mongoose b/package/mongoose/S85mongoose index dc042d0e2e..98e537fd62 100755 --- a/package/mongoose/S85mongoose +++ b/package/mongoose/S85mongoose @@ -10,7 +10,7 @@ NAME=mongoose DESC="Mongoose HTTP server" DAEMON=`which mongoose` -OPTIONS="-num_threads 3 -document_root /var/www -listening_ports 80" +OPTIONS="-document_root /var/www -listening_port 80" [ -e /etc/default/mongoose ] && . /etc/default/mongoose diff --git a/package/mongoose/mongoose.mk b/package/mongoose/mongoose.mk index d928dd8077..75a4d3f59f 100644 --- a/package/mongoose/mongoose.mk +++ b/package/mongoose/mongoose.mk @@ -4,10 +4,9 @@ # ################################################################################ -MONGOOSE_VERSION = 3.7 -MONGOOSE_SOURCE = mongoose-$(MONGOOSE_VERSION).tgz -MONGOOSE_SITE = https://mongoose.googlecode.com/files -MONGOOSE_LICENSE = MIT +MONGOOSE_VERSION = 5.3 +MONGOOSE_SITE = $(call github,cesanta,mongoose,$(MONGOOSE_VERSION)) +MONGOOSE_LICENSE = GPLv2 MONGOOSE_LICENSE_FILES = LICENSE MONGOOSE_CFLAGS = $(TARGET_CFLAGS) $(TARGET_LDFLAGS) @@ -15,18 +14,16 @@ MONGOOSE_CFLAGS = $(TARGET_CFLAGS) $(TARGET_LDFLAGS) ifeq ($(BR2_PACKAGE_OPENSSL),y) MONGOOSE_DEPENDENCIES += openssl # directly linked -MONGOOSE_CFLAGS += -DNO_SSL_DL -lssl -lcrypto -lz -else -MONGOOSE_CFLAGS += -DNO_SSL +MONGOOSE_CFLAGS += -DNS_ENABLE_SSL -lssl -lcrypto -lz endif define MONGOOSE_BUILD_CMDS - $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D) \ - linux COPT="$(MONGOOSE_CFLAGS)" + $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D)/examples \ + CFLAGS_EXTRA="$(MONGOOSE_CFLAGS)" server endef define MONGOOSE_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 755 $(@D)/mongoose $(TARGET_DIR)/usr/sbin/mongoose + $(INSTALL) -D -m 755 $(@D)/examples/server $(TARGET_DIR)/usr/sbin/mongoose $(INSTALL) -D -m 755 package/mongoose/S85mongoose \ $(TARGET_DIR)/etc/init.d/S85mongoose endef |
