From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 17 Dec 2008 10:32:06 +0000 (-0000)
Subject: openswan: revert $(strip ...) change (r24307) on patches
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2be151db5dcf41e006a3519a3f1512b0d90ac8be;p=buildroot.git

openswan: revert $(strip ...) change (r24307) on patches

Thanks to Markus for noticing.
---

diff --git a/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-klips.patch b/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-klips.patch
index 1fba869ac5..4a3338d202 100644
--- a/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-klips.patch
+++ b/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-klips.patch
@@ -9774,7 +9774,7 @@ packaging/utils/kernelpatch 2.6
 +asm-obj-$(CONFIG_MWINCHIP3D)	+= match686.o
 +
 +obj-y += $(asm-obj-y)
-+ifneq ($(asm-obj-y),)
++ifneq ($(strip $(asm-obj-y)),)
 +  EXTRA_CFLAGS += -DASMV
 +endif
 +
@@ -13864,12 +13864,12 @@ packaging/utils/kernelpatch 2.6
 +++ linux/net/ipsec/alg/Makefile     Mon Feb  9 13:51:03 2004
 @@ -0,0 +1,112 @@
 +# Makefile,v 1.1.2.1 2003/11/21 18:12:23 jjo Exp
-+ifeq ($(KLIPSMODULE),)
++ifeq ($(strip $(KLIPSMODULE)),)
 +FREESWANSRCDIR=.
 +else
 +FREESWANSRCDIR=../../../..
 +endif
-+ifeq ($(KLIPS_TOP),)
++ifeq ($(strip $(KLIPS_TOP)),)
 +KLIPS_TOP=../../..
 +override EXTRA_CFLAGS += -I$(KLIPS_TOP)/include
 +endif
diff --git a/package/openswan/linux-2.6.20.4-openswan-2.4.7.kernel-2.6-klips.patch b/package/openswan/linux-2.6.20.4-openswan-2.4.7.kernel-2.6-klips.patch
index 1fba869ac5..4a3338d202 100644
--- a/package/openswan/linux-2.6.20.4-openswan-2.4.7.kernel-2.6-klips.patch
+++ b/package/openswan/linux-2.6.20.4-openswan-2.4.7.kernel-2.6-klips.patch
@@ -9774,7 +9774,7 @@ packaging/utils/kernelpatch 2.6
 +asm-obj-$(CONFIG_MWINCHIP3D)	+= match686.o
 +
 +obj-y += $(asm-obj-y)
-+ifneq ($(asm-obj-y),)
++ifneq ($(strip $(asm-obj-y)),)
 +  EXTRA_CFLAGS += -DASMV
 +endif
 +
@@ -13864,12 +13864,12 @@ packaging/utils/kernelpatch 2.6
 +++ linux/net/ipsec/alg/Makefile     Mon Feb  9 13:51:03 2004
 @@ -0,0 +1,112 @@
 +# Makefile,v 1.1.2.1 2003/11/21 18:12:23 jjo Exp
-+ifeq ($(KLIPSMODULE),)
++ifeq ($(strip $(KLIPSMODULE)),)
 +FREESWANSRCDIR=.
 +else
 +FREESWANSRCDIR=../../../..
 +endif
-+ifeq ($(KLIPS_TOP),)
++ifeq ($(strip $(KLIPS_TOP)),)
 +KLIPS_TOP=../../..
 +override EXTRA_CFLAGS += -I$(KLIPS_TOP)/include
 +endif
diff --git a/package/openswan/linux-2.6.21.5-openswan-2.4.8.kernel-2.6-klips.patch b/package/openswan/linux-2.6.21.5-openswan-2.4.8.kernel-2.6-klips.patch
index c3541bcd93..7f25202370 100644
--- a/package/openswan/linux-2.6.21.5-openswan-2.4.8.kernel-2.6-klips.patch
+++ b/package/openswan/linux-2.6.21.5-openswan-2.4.8.kernel-2.6-klips.patch
@@ -9785,7 +9785,7 @@ packaging/utils/kernelpatch 2.6
 +asm-obj-$(CONFIG_MWINCHIP3D)	+= match686.o
 +
 +obj-y += $(asm-obj-y)
-+ifneq ($(asm-obj-y),)
++ifneq ($(strip $(asm-obj-y)),)
 +  EXTRA_CFLAGS += -DASMV
 +endif
 +
@@ -13875,12 +13875,12 @@ packaging/utils/kernelpatch 2.6
 +++ linux/net/ipsec/alg/Makefile     Mon Feb  9 13:51:03 2004
 @@ -0,0 +1,112 @@
 +# Makefile,v 1.1.2.1 2003/11/21 18:12:23 jjo Exp
-+ifeq ($(KLIPSMODULE),)
++ifeq ($(strip $(KLIPSMODULE)),)
 +FREESWANSRCDIR=.
 +else
 +FREESWANSRCDIR=../../../..
 +endif
-+ifeq ($(KLIPS_TOP),)
++ifeq ($(strip $(KLIPS_TOP)),)
 +KLIPS_TOP=../../..
 +override EXTRA_CFLAGS += -I$(KLIPS_TOP)/include
 +endif
diff --git a/package/openswan/linux-2.6.22.6-openswan-2.4.9.kernel-2.6-klips.patch b/package/openswan/linux-2.6.22.6-openswan-2.4.9.kernel-2.6-klips.patch
index 751eb2ba8a..0b8257ab8c 100644
--- a/package/openswan/linux-2.6.22.6-openswan-2.4.9.kernel-2.6-klips.patch
+++ b/package/openswan/linux-2.6.22.6-openswan-2.4.9.kernel-2.6-klips.patch
@@ -9785,7 +9785,7 @@ packaging/utils/kernelpatch 2.6
 +asm-obj-$(CONFIG_MWINCHIP3D)	+= match686.o
 +
 +obj-y += $(asm-obj-y)
-+ifneq ($(asm-obj-y),)
++ifneq ($(strip $(asm-obj-y)),)
 +  EXTRA_CFLAGS += -DASMV
 +endif
 +
@@ -13875,12 +13875,12 @@ packaging/utils/kernelpatch 2.6
 +++ linux/net/ipsec/alg/Makefile     Mon Feb  9 13:51:03 2004
 @@ -0,0 +1,112 @@
 +# Makefile,v 1.1.2.1 2003/11/21 18:12:23 jjo Exp
-+ifeq ($(KLIPSMODULE),)
++ifeq ($(strip $(KLIPSMODULE)),)
 +FREESWANSRCDIR=.
 +else
 +FREESWANSRCDIR=../../../..
 +endif
-+ifeq ($(KLIPS_TOP),)
++ifeq ($(strip $(KLIPS_TOP)),)
 +KLIPS_TOP=../../..
 +override EXTRA_CFLAGS += -I$(KLIPS_TOP)/include
 +endif