From 8576c4495f56358046b322db5737cc08df659a1e Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Fri, 22 Dec 2006 11:29:52 +0000 Subject: - add option to enable debugging support --- package/openswan/Config.in | 10 ++++++++++ package/openswan/openswan.mk | 10 +++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/package/openswan/Config.in b/package/openswan/Config.in index b301875c0..e9e682857 100644 --- a/package/openswan/Config.in +++ b/package/openswan/Config.in @@ -7,3 +7,13 @@ config BR2_PACKAGE_OPENSWAN Openswan is an implementation of IPsec for Linux. http://openswan.org/ +config BR2_PACKAGE_OPENSWAN_DEBUGGING + bool "debugging support" + default n + depends on BR2_PACKAGE_OPENSWAN + help + Enable debugging support. + This is not needed if you know what you do but makes it quite + hard to diagnose eventual problems. + It is safe to say Yes here. + diff --git a/package/openswan/openswan.mk b/package/openswan/openswan.mk index 306fc09b3..7c9909cea 100644 --- a/package/openswan/openswan.mk +++ b/package/openswan/openswan.mk @@ -14,6 +14,10 @@ OPENSWAN_CAT:=$(ZCAT) OPENSWAN_BINARY:=programs/pluto/pluto OPENSWAN_TARGET_BINARY:=usr/sbin/ipsec +ifneq ($(BR2_PACKAGE_OPENSWAN_DEBUGGING),y) +OPENSWAN_CFLAGS=-UDEBUG -DNO_DEBUG -ULEAK_DETECTIVE +endif + $(DL_DIR)/$(OPENSWAN_SOURCE): $(WGET) -P $(DL_DIR) $(OPENSWAN_SITE)/$(OPENSWAN_SOURCE) @@ -25,17 +29,17 @@ $(OPENSWAN_DIR)/.unpacked: $(DL_DIR)/$(OPENSWAN_SOURCE) touch $(OPENSWAN_DIR)/.unpacked $(OPENSWAN_DIR)/$(OPENSWAN_BINARY): $(OPENSWAN_DIR)/.unpacked - @echo $(LINUX_KERNEL) + @echo "using kernel $(LINUX_KERNEL)" $(TARGET_CONFIGURE_OPTS) \ $(MAKE) -C $(OPENSWAN_DIR) \ KERNELSRC=$(LINUX_DIR) DESTDIR=$(TARGET_DIR) INC_USRLOCAL=/usr \ - CC=$(TARGET_CC) USERCOMPILE="-UDEBUG -DNO_DEBUG -ULEAK_DETECTIVE $(TARGET_CFLAGS) -I$(TARGET_DIR)/usr/include" LD_LIBRARY_PATH=$(TARGET_DIR)/usr/lib programs + CC=$(TARGET_CC) USERCOMPILE="$(OPENSWAN_CFLAGS) $(TARGET_CFLAGS) -I$(TARGET_DIR)/usr/include" LD_LIBRARY_PATH="$(TARGET_DIR)/lib:$(TARGET_DIR)/usr/lib" programs $(TARGET_DIR)/$(OPENSWAN_TARGET_BINARY): $(OPENSWAN_DIR)/$(OPENSWAN_BINARY) $(TARGET_CONFIGURE_OPTS) \ $(MAKE) -C $(OPENSWAN_DIR) \ KERNELSRC=$(LINUX_DIR) DESTDIR=$(TARGET_DIR) INC_USRLOCAL=/usr \ - CC=$(TARGET_CC) USERCOMPILE="-UDEBUG -DNO_DEBUG -ULEAK_DETECTIVE $(TARGET_CFLAGS) -I$(TARGET_DIR)/usr/include" LD_LIBRARY_PATH=$(TARGET_DIR)/usr/lib install + CC=$(TARGET_CC) USERCOMPILE="$(OPENSWAN_CFLAGS) $(TARGET_CFLAGS) -I$(TARGET_DIR)/usr/include" LD_LIBRARY_PATH="$(TARGET_DIR)/lib:$(TARGET_DIR)/usr/lib" install rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc -- cgit v1.2.3