From 23ce501c7a3fe833c62d6966f3e49a0f05fbfac3 Mon Sep 17 00:00:00 2001
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Wed, 19 Sep 2007 10:30:02 +0000
Subject: - add missing dependency on libgcrypt   Ulf, this should be updated
 to 0.5.1

---
 package/vpnc/vpnc-0.4.0.patch | 12 ------------
 package/vpnc/vpnc.mk          | 17 ++++++-----------
 2 files changed, 6 insertions(+), 23 deletions(-)
 delete mode 100644 package/vpnc/vpnc-0.4.0.patch

(limited to 'package/vpnc')

diff --git a/package/vpnc/vpnc-0.4.0.patch b/package/vpnc/vpnc-0.4.0.patch
deleted file mode 100644
index 9520c3fa1..000000000
--- a/package/vpnc/vpnc-0.4.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN vpnc-0.4.0-0rig/Makefile vpnc-0.4.0/Makefile
---- vpnc-0.4.0-0rig/Makefile	2007-02-19 21:51:12.000000000 +0100
-+++ vpnc-0.4.0/Makefile	2007-07-17 19:59:53.000000000 +0200
-@@ -35,7 +35,7 @@
- RELEASE_VERSION := $(shell cat VERSION)
- 
- CC=gcc
--CFLAGS += -W -Wall -O3 -Wmissing-declarations -Wwrite-strings -g
-+CFLAGS += -W -Wall -O3 -Wmissing-declarations -Wwrite-strings -g -I$(INCLUDE)
- CPPFLAGS = -DVERSION=\"$(VERSION)\"
- LDFLAGS = -g $(shell libgcrypt-config --libs)
- CFLAGS +=  $(shell libgcrypt-config --cflags)
diff --git a/package/vpnc/vpnc.mk b/package/vpnc/vpnc.mk
index 254145382..9ddbd42d6 100644
--- a/package/vpnc/vpnc.mk
+++ b/package/vpnc/vpnc.mk
@@ -20,15 +20,12 @@ $(DL_DIR)/$(VPNC_SOURCE):
 $(VPNC_DIR)/.unpacked: $(DL_DIR)/$(VPNC_SOURCE)
 	$(VPNC_CAT) $(DL_DIR)/$(VPNC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	toolchain/patch-kernel.sh $(VPNC_DIR) package/vpnc \*.patch
-	touch $(VPNC_DIR)/.unpacked
+	touch $@
 
-$(VPNC_DIR)/.configured: $(VPNC_DIR)/.unpacked
-	touch $(VPNC_DIR)/.configured
-
-$(VPNC_BINARY): $(VPNC_DIR)/.configured
+$(VPNC_BINARY): $(VPNC_DIR)/.unpacked
 	rm -f $@
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) INCLUDE=$(STAGING_DIR)/usr/include \
-		CC=$(TARGET_CC) -C $(VPNC_DIR)
+		CC="$(TARGET_CC)" -C $(VPNC_DIR)
 
 $(VPNC_TARGET_BINARY): $(VPNC_BINARY)
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) \
@@ -39,18 +36,16 @@ $(VPNC_TARGET_BINARY): $(VPNC_BINARY)
 		MANDIR=/usr/share/man \
 		VERSION=$(VPNC_VERSION) \
 		INCLUDE=$(STAGING_DIR)/usr/include \
-		LDFLAGS="-g -lgcrypt -lgpg-error" \
+		LDFLAGS="-lgcrypt -lgpg-error" \
 		-C $(VPNC_DIR) install
 	$(STRIP) $(STRIP_STRIP_UNNEEDED) $(VPNC_TARGET_BINARY)
 
-vpnc: uclibc $(VPNC_TARGET_BINARY)
+vpnc: uclibc libgcrypt $(VPNC_TARGET_BINARY)
 
 vpnc-source: $(DL_DIR)/$(VPNC_SOURCE)
 
 vpnc-clean:
-	@if [ -d $(VPNC_DIR)/Makefile ]; then \
-		$(MAKE) -C $(VPNC_DIR) clean; \
-	fi
+	-$(MAKE) -C $(VPNC_DIR) clean
 	rm -f $(STAGING_DIR)/usr/bin/vpnc
 
 vpnc-dirclean:
-- 
cgit v1.2.3