summaryrefslogtreecommitdiff
path: root/package/openswan
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-22 22:37:50 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-22 22:37:50 +0100
commit9436a026e2e23d207fbdcb9e8bc9b076e3573700 (patch)
treeadb1937bc90be8869a5f7c9636da84773414eb3b /package/openswan
parent52b1b0100c53b1f8699955df618fcb47744e0a7e (diff)
activate GCC cflags check, cleanup FLAGS stuff in OpenADK.
* remove TCFLAGS/TLDFLAGS/TCPPFLAGS and only use TARGET_CFLAGS/TARGET_LDFLAGS/TARGET_CPPFLAGS, ... * activate GCC_HONOUR_COPTS and fix all packages to honour CFLAGS * use CC_FOR_BUILD, CFLAGS_FOR_BUILD, ... for all build compilation, remove HOST* variants * introduce KERNEL_MODULE_FLAGS for external kernel modules * mark rpm package as broken, mark syslinux for native builds only, mark libhugetlb for eglibc/glibc only usage
Diffstat (limited to 'package/openswan')
-rw-r--r--package/openswan/patches/patch-Makefile_top11
-rw-r--r--package/openswan/patches/patch-lib_libdns_Makefile22
-rw-r--r--package/openswan/patches/patch-lib_libdns_Makefile_in20
-rw-r--r--package/openswan/patches/patch-lib_libisc_Makefile11
-rw-r--r--package/openswan/patches/patch-lib_libisc_Makefile_in23
5 files changed, 81 insertions, 6 deletions
diff --git a/package/openswan/patches/patch-Makefile_top b/package/openswan/patches/patch-Makefile_top
new file mode 100644
index 000000000..e3edd3bd6
--- /dev/null
+++ b/package/openswan/patches/patch-Makefile_top
@@ -0,0 +1,11 @@
+--- openswan-2.6.28.orig/Makefile.top 2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/Makefile.top 2011-01-21 19:00:28.518658360 +0100
+@@ -29,7 +29,7 @@ ERRCHECK=${MAKEUTILS}/errcheck
+ KVUTIL=${MAKEUTILS}/kernelversion
+ KVSHORTUTIL=${MAKEUTILS}/kernelversion-short
+
+-SUBDIRS?=doc lib programs testing
++SUBDIRS?=lib programs
+
+ clean::
+ -(cd ${OPENSWANSRCDIR} && $(MAKE) modclean && $(MAKE) mod26clean)
diff --git a/package/openswan/patches/patch-lib_libdns_Makefile b/package/openswan/patches/patch-lib_libdns_Makefile
index bfb17431c..ec4c4ef8b 100644
--- a/package/openswan/patches/patch-lib_libdns_Makefile
+++ b/package/openswan/patches/patch-lib_libdns_Makefile
@@ -1,10 +1,20 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- openswan-2.6.18.orig/lib/libdns/Makefile 2008-10-06 18:52:49.000000000 +0200
-+++ openswan-2.6.18/lib/libdns/Makefile 2008-10-14 13:08:03.000000000 +0200
-@@ -102,5 +102,5 @@ code.h: gen
+--- openswan-2.6.28.orig/lib/libdns/Makefile 2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/lib/libdns/Makefile 2011-01-21 19:15:22.484901748 +0100
+@@ -53,7 +53,7 @@ SRCS += time.c key.c lib.c
+ programs all: ${LIB}.a
+
+ version.o: version.c
+- ${LIBTOOL} --mode=compile ${CC} ${ALL_CFLAGS} \
++ ${CC} ${CFLAGS} ${ALL_CFLAGS} \
+ -DVERSION=\"${VERSION}\" \
+ -DLIBINTERFACE=${LIBINTERFACE} \
+ -DLIBREVISION=${LIBREVISION} \
+@@ -100,7 +100,6 @@ code.h: gen
+
+ # this program is to be built on the host, and should not be
# cross-compiled!
- HOSTCC?=cc
+-HOSTCC?=cc
gen: gen.c
- ${HOSTCC} ${HOSTCINCLUDES} ${LDFLAGS} -o $@ ${srcdir}gen.c ${LIBS}
-+ ${HOSTCC} ${HOSTCINCLUDES} -o $@ ${srcdir}gen.c ${LIBS}
++ ${CC_FOR_BUILD} ${HOSTCINCLUDES} -o $@ ${srcdir}gen.c ${LIBS}
diff --git a/package/openswan/patches/patch-lib_libdns_Makefile_in b/package/openswan/patches/patch-lib_libdns_Makefile_in
new file mode 100644
index 000000000..dcef159ea
--- /dev/null
+++ b/package/openswan/patches/patch-lib_libdns_Makefile_in
@@ -0,0 +1,20 @@
+--- openswan-2.6.28.orig/lib/libdns/Makefile.in 2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/lib/libdns/Makefile.in 2011-01-21 19:01:49.208658272 +0100
+@@ -103,7 +103,7 @@ DEPENDEXTRA = ./gen -F include/dns/rdata
+ @BIND9_MAKE_RULES@
+
+ version.@O@: version.c
+- ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
++ ${CC} ${CFLAGS} ${ALL_CFLAGS} \
+ -DVERSION=\"${VERSION}\" \
+ -DLIBINTERFACE=${LIBINTERFACE} \
+ -DLIBREVISION=${LIBREVISION} \
+@@ -160,7 +160,7 @@ code.h: gen
+ ./gen -s ${srcdir} > code.h
+
+ gen: gen.c
+- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS}
++ ${CC_FOR_BUILD} ${ALL_CFLAGS} ${CFLAGS_FOR_BUILD} -o $@ ${srcdir}/gen.c ${LIBS}
+
+ rbtdb64.@O@: rbtdb.c
+
diff --git a/package/openswan/patches/patch-lib_libisc_Makefile b/package/openswan/patches/patch-lib_libisc_Makefile
new file mode 100644
index 000000000..77844c089
--- /dev/null
+++ b/package/openswan/patches/patch-lib_libisc_Makefile
@@ -0,0 +1,11 @@
+--- openswan-2.6.28.orig/lib/libisc/Makefile 2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/lib/libisc/Makefile 2011-01-21 19:10:30.838658764 +0100
+@@ -50,7 +50,7 @@ SRCS += rwlock.c random.c inet_aton.c i
+ programs all: ${LIB}.a
+
+ version.o: version.c
+- ${LIBTOOL} --mode=compile ${CC} ${ALL_CFLAGS} \
++ ${CC} ${CFLAGS} ${ALL_CFLAGS} \
+ -DVERSION=\"${VERSION}\" \
+ -DLIBINTERFACE=${LIBINTERFACE} \
+ -DLIBREVISION=${LIBREVISION} \
diff --git a/package/openswan/patches/patch-lib_libisc_Makefile_in b/package/openswan/patches/patch-lib_libisc_Makefile_in
new file mode 100644
index 000000000..4cde48e35
--- /dev/null
+++ b/package/openswan/patches/patch-lib_libisc_Makefile_in
@@ -0,0 +1,23 @@
+--- openswan-2.6.28.orig/lib/libisc/Makefile.in 2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/lib/libisc/Makefile.in 2011-01-21 19:04:37.798658397 +0100
+@@ -82,7 +82,7 @@ TARGETS = timestamp
+ @BIND9_MAKE_RULES@
+
+ version.@O@: version.c
+- ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
++ ${CC} ${CFLAGS} ${ALL_CFLAGS} \
+ -DVERSION=\"${VERSION}\" \
+ -DLIBINTERFACE=${LIBINTERFACE} \
+ -DLIBREVISION=${LIBREVISION} \
+@@ -94,10 +94,7 @@ libisc.@SA@: ${OBJS}
+ ${RANLIB} $@
+
+ libisc.la: ${OBJS}
+- ${LIBTOOL_MODE_LINK} \
+- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc.la -rpath ${libdir} \
+- -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
+- ${OBJS} ${LIBS}
++ ${CC} ${CFLAGS} ${ALL_CFLAGS} ${LDFLAGS} -o libisc.la ${OBJS} ${LIBS}
+
+ timestamp: libisc.@A@
+ touch timestamp