diff options
| author | wbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-12-23 22:48:22 +0000 |
|---|---|---|
| committer | wbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-12-23 22:48:22 +0000 |
| commit | 5828c5f0070269f6591b85355d04cdf5dd686b46 (patch) | |
| tree | c802f4334585feac81be4162461181f0b8c19f9a | |
| parent | ce0f96ce9ab153f668491a0fc8b3035e38094eec (diff) | |
fix build on systems without libgcrypt-config
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2752 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | openwrt/package/vpnc/patches/01-cross.patch | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/openwrt/package/vpnc/patches/01-cross.patch b/openwrt/package/vpnc/patches/01-cross.patch index 4f27fbd00..ff96a8365 100644 --- a/openwrt/package/vpnc/patches/01-cross.patch +++ b/openwrt/package/vpnc/patches/01-cross.patch @@ -1,14 +1,21 @@ -diff -ruN vpnc-0.3.3-old/Makefile vpnc-0.3.3-new/Makefile ---- vpnc-0.3.3-old/Makefile 2005-05-01 22:30:35.000000000 +0200 -+++ vpnc-0.3.3-new/Makefile 2005-12-13 17:23:26.000000000 +0100 -@@ -23,25 +23,26 @@ +diff -Nur vpnc-0.3.3/Makefile vpnc-0.3.3.patched/Makefile +--- vpnc-0.3.3/Makefile 2005-05-01 22:30:35.000000000 +0200 ++++ vpnc-0.3.3.patched/Makefile 2005-12-23 23:43:55.222055250 +0100 +@@ -17,31 +17,32 @@ + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + DESTDIR= +-PREFIX=/usr/local ++PREFIX=/usr + ETCDIR=/etc/vpnc + SBINDIR=$(PREFIX)/sbin MANDIR=$(PREFIX)/share/man CC=gcc -CFLAGS=-W -Wall -O -g '-DVERSION="$(shell cat VERSION)"' $(shell libgcrypt-config --cflags) -LDFLAGS=-g $(shell libgcrypt-config --libs) -+CFLAGS=-W -Wall -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include $(OFLAGS) '-DVERSION="$(shell cat VERSION)"' $(shell libgcrypt-config --cflags) -+LDFLAGS=-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib $(shell libgcrypt-config --libs) ++CFLAGS=-W -Wall -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include $(OFLAGS) '-DVERSION="$(shell cat VERSION)"' ++LDFLAGS=-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -lgcrypt -lgpg-error -ifeq ($(shell uname -s), Linux) +OS=$(shell uname -s) |