KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rename the patch to better match its purpose, add target optimization cflags, prevent host system detection to set compile-time options.

Browse source 
SVN-Revision: 2688
This commit is contained in:
Nicolas Thill 2005-12-15 12:55:38 +00:00
parent a8c3b7c716
commit 007140bf20
3 changed files with 39 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
openwrt/package/vpnc/Makefile
View file

@ -25,6 +25,8 @@ $(PKG_BUILD_DIR)/.configured:
$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.built:
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
CC=$(TARGET_CC) \ CC=$(TARGET_CC) \
OFLAGS="$(TARGET_CFLAGS)" \
OS="Linux" \
STAGING_DIR=$(STAGING_DIR) \ STAGING_DIR=$(STAGING_DIR) \
DESTDIR=$(PKG_INSTALL_DIR) \ DESTDIR=$(PKG_INSTALL_DIR) \
PREFIX=/usr \ PREFIX=/usr \

37
openwrt/package/vpnc/patches/01-cross.patch Normal file
View file

@ -0,0 +1,37 @@
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 @@
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)
-ifeq ($(shell uname -s), Linux)
+OS=$(shell uname -s)
+ifeq ($(OS), Linux)
SYSDEP=sysdep-linux.o
endif
-ifeq ($(shell uname -s), FreeBSD)
+ifeq ($(OS), FreeBSD)
CFLAGS += -DSOCKADDR_IN_SIN_LEN -DHAVE_SA_LEN
SYSDEP=sysdep-bsd.o
endif
-ifeq ($(shell uname -s), NetBSD)
+ifeq ($(OS), NetBSD)
CFLAGS += -DSOCKADDR_IN_SIN_LEN -DHAVE_SA_LEN
SYSDEP=sysdep-bsd.o
endif
-ifeq ($(shell uname -s), OpenBSD)
+ifeq ($(OS), OpenBSD)
CFLAGS += -DSOCKADDR_IN_SIN_LEN -DHAVE_SA_LEN -DNEED_IPLEN_FIX -DNEW_TUN
SYSDEP=sysdep-bsd.o
endif
-ifeq ($(shell uname -s), SunOS)
+ifeq ($(OS), SunOS)
CFLAGS += -DNEED_IPLEN_FIX
LDFLAGS += -lnsl -lresolv -lsocket
SYSDEP=sysdep-svr4.o

27
openwrt/package/vpnc/patches/01-no_man.patch
View file

@ -1,27 +0,0 @@
diff -urN orig/vpnc-0.3.3/Makefile vpnc-0.3.3/Makefile
--- orig/vpnc-0.3.3/Makefile 2005-05-01 22:30:35.000000000 +0200
+++ vpnc-0.3.3/Makefile 2005-12-13 10:30:56.000000000 +0100
@@ -22,9 +22,8 @@
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 -O -I$(STAGING_DIR)/usr/include '-DVERSION="$(shell cat VERSION)"' $(shell libgcrypt-config --cflags)
+LDFLAGS=-L$(STAGING_DIR)/usr/lib $(shell libgcrypt-config --libs)
ifeq ($(shell uname -s), Linux)
SYSDEP=sysdep-linux.o
@@ -83,10 +82,9 @@
all : vpnc
install :
- install -d $(DESTDIR)$(ETCDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(MANDIR)/man8
+ install -d $(DESTDIR)$(ETCDIR) $(DESTDIR)$(SBINDIR)
install vpnc.conf vpnc-script $(DESTDIR)$(ETCDIR)
install vpnc vpnc-disconnect $(DESTDIR)$(SBINDIR)
- install vpnc.8 $(DESTDIR)$(MANDIR)/man8
install-strip :
install -d $(DESTDIR)$(ETCDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(MANDIR)/man8