Skip to contentSkip to conversation

mongoose: drop unused MONGOOSE_NO_DL define

PATCH New Peter Korsgaard 1 participant 5 messages Sep 21, 2017 – Sep 22, 2017

lore
Share & tools
lore

Peter Korsgaard

author
#0 lore raw

PATCH 1/4 mongoose: drop unused MONGOOSE_NO_DL define

This define is not used anywhere in the mongoose sources since v6.0 (commit 8927c9d22b3f), so drop it.

Signed-off-by Peter Korsgaard <[email protected]>
---
 package/mongoose/mongoose.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/mongoose/mongoose.mk +1 -1
index 36fd8f899a..702342b3b1 100644
@@ -10,7 +10,7 @@ MONGOOSE_LICENSE = GPL-2.0
 MONGOOSE_LICENSE_FILES = LICENSE
 MONGOOSE_INSTALL_STAGING = YES
 
-MONGOOSE_CFLAGS = $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -DMONGOOSE_NO_DL
+MONGOOSE_CFLAGS = $(TARGET_CFLAGS) $(TARGET_LDFLAGS)
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 MONGOOSE_DEPENDENCIES += openssl
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH 1/4 mongoose: drop unused MONGOOSE_NO_DL define

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

This define is not used anywhere in the mongoose sources since v6.0 (commit 8927c9d22b3f), so drop it.

Signed-off-by Peter Korsgaard <[email protected]>

Committed all 4, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#2 lore raw

PATCH 2/4 mongoose: drop unused openssl linker flags

In reply to Peter Korsgaard

No linking is done since the package was reworked for v6.x in commit 9860746ff (mongoose: bump to version 6.1), so drop LDFLAGS and the list of libraries to link against.

Signed-off-by Peter Korsgaard <[email protected]>
---
 package/mongoose/mongoose.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
package/mongoose/mongoose.mk +2 -3
index 702342b3b1..2705bdd4a5 100644
@@ -10,12 +10,11 @@ MONGOOSE_LICENSE = GPL-2.0
 MONGOOSE_LICENSE_FILES = LICENSE
 MONGOOSE_INSTALL_STAGING = YES
 
-MONGOOSE_CFLAGS = $(TARGET_CFLAGS) $(TARGET_LDFLAGS)
+MONGOOSE_CFLAGS = $(TARGET_CFLAGS)
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 MONGOOSE_DEPENDENCIES += openssl
-# directly linked
-MONGOOSE_CFLAGS += -DNS_ENABLE_SSL -lssl -lcrypto -lz
+MONGOOSE_CFLAGS += -DNS_ENABLE_SSL
 endif
 
 define MONGOOSE_BUILD_CMDS
Signature · 1 line
2.11.0
author
#3 lore raw

PATCH 3/4 mongoose: correct openssl define

In reply to Peter Korsgaard

NS_ENABLE_SSL was renamed to MG_ENABLE_SSL in v6.0, commit e1dd3f06fe33 (Rename Mongoose constants: NS_ -> MG_, NSF_ -> MG_F_), so use the new name instead.

Signed-off-by Peter Korsgaard <[email protected]>
---
 package/mongoose/mongoose.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/mongoose/mongoose.mk +1 -1
index 2705bdd4a5..39d5b85531 100644
@@ -14,7 +14,7 @@ MONGOOSE_CFLAGS = $(TARGET_CFLAGS)
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 MONGOOSE_DEPENDENCIES += openssl
-MONGOOSE_CFLAGS += -DNS_ENABLE_SSL
+MONGOOSE_CFLAGS += -DMG_ENABLE_SSL
 endif
 
 define MONGOOSE_BUILD_CMDS
Signature · 1 line
2.11.0
author
#4 lore raw

PATCH 4/4 mongoose: don't install to target

In reply to Peter Korsgaard

Only a static library is built (and no _INSTALL_TARGET_CMDS are defined), so there is no need to run the target-install step.

Signed-off-by Peter Korsgaard <[email protected]>
---
 package/mongoose/mongoose.mk | 2 ++
 1 file changed, 2 insertions(+)
package/mongoose/mongoose.mk +2 -0
index 39d5b85531..e2149e06e8 100644
@@ -9,6 +9,8 @@ MONGOOSE_SITE = $(call github,cesanta,mongoose,$(MONGOOSE_VERSION))
 MONGOOSE_LICENSE = GPL-2.0
 MONGOOSE_LICENSE_FILES = LICENSE
 MONGOOSE_INSTALL_STAGING = YES
+# static library
+MONGOOSE_INSTALL_TARGET = NO
 
 MONGOOSE_CFLAGS = $(TARGET_CFLAGS)
Signature · 1 line
2.11.0