| 1 |
blueness 12/03/06 00:12:41 |
| 2 |
|
| 3 |
Added: ipsec-tools-system-kernel-headers.patch |
| 4 |
Log: |
| 5 |
Use system linux header files rather than those in /usr/src/linux |
| 6 |
|
| 7 |
(Portage version: 2.1.10.44/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-firewall/ipsec-tools/files/ipsec-tools-system-kernel-headers.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipsec-tools/files/ipsec-tools-system-kernel-headers.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipsec-tools/files/ipsec-tools-system-kernel-headers.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: ipsec-tools-system-kernel-headers.patch |
| 16 |
=================================================================== |
| 17 |
From: Anthony G. Basile <blueness@g.o> |
| 18 |
|
| 19 |
ipsec-tools tries to make use of the kernel headers in /usr/src/linux/include/linux. |
| 20 |
This is not a good idea because these are not the system exported linux header files. |
| 21 |
Unfortunately the configure.ac option which says where to look for these headers |
| 22 |
doesn't point to the directory itself, usually /usr/include/linux, but to its parent! |
| 23 |
|
| 24 |
Our solution then, although less than satifying, is to remove the --with-kernel-headers |
| 25 |
switch and hard code KERNEL_INCLUDE="/usr/include". |
| 26 |
|
| 27 |
diff -Naur ipsec-tools-0.8.0.orig/configure.ac ipsec-tools-0.8.0/configure.ac |
| 28 |
--- ipsec-tools-0.8.0.orig/configure.ac 2012-03-05 18:46:54.000000000 -0500 |
| 29 |
+++ ipsec-tools-0.8.0/configure.ac 2012-03-05 18:53:56.000000000 -0500 |
| 30 |
@@ -66,18 +66,11 @@ |
| 31 |
|
| 32 |
case "$host_os" in |
| 33 |
*linux*) |
| 34 |
- AC_ARG_WITH(kernel-headers, |
| 35 |
- AC_HELP_STRING([--with-kernel-headers=/lib/modules/<uname>/build/include], |
| 36 |
- [where your Linux Kernel headers are installed]), |
| 37 |
- [ KERNEL_INCLUDE="$with_kernel_headers" |
| 38 |
- CONFIGURE_AMFLAGS="--with-kernel-headers=$with_kernel_headers" |
| 39 |
- AC_SUBST(CONFIGURE_AMFLAGS) ], |
| 40 |
- [ KERNEL_INCLUDE="/lib/modules/`uname -r`/build/include" ]) |
| 41 |
- |
| 42 |
+ KERNEL_INCLUDE="/usr/include" |
| 43 |
AC_CHECK_HEADER($KERNEL_INCLUDE/linux/pfkeyv2.h, , |
| 44 |
[ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h, |
| 45 |
KERNEL_INCLUDE=/usr/src/linux/include , |
| 46 |
- [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) ] ) ] ) |
| 47 |
+ [ AC_MSG_ERROR([Unable to find linux kernel headers. Aborting.]) ] ) ] ) |
| 48 |
AC_SUBST(KERNEL_INCLUDE) |
| 49 |
# We need the configure script to run with correct kernel headers. |
| 50 |
# However we don't want to point to kernel source tree in compile time, |
Archives