From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1S4i1K-0002w3-UV for garchives@archives.gentoo.org; Tue, 06 Mar 2012 00:12:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C3345E05AF; Tue, 6 Mar 2012 00:12:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 92A70E05AF for ; Tue, 6 Mar 2012 00:12:43 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 023081B4014 for ; Tue, 6 Mar 2012 00:12:43 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2273) id CCC1E2004C; Tue, 6 Mar 2012 00:12:41 +0000 (UTC) From: "Anthony G. Basile (blueness)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, blueness@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in net-firewall/ipsec-tools/files: ipsec-tools-system-kernel-headers.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: ipsec-tools-system-kernel-headers.patch X-VCS-Directories: net-firewall/ipsec-tools/files X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile Content-Type: text/plain; charset=utf8 Message-Id: <20120306001241.CCC1E2004C@flycatcher.gentoo.org> Date: Tue, 6 Mar 2012 00:12:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 6e9a4763-8724-4e58-82bc-96d21ba2dc4a X-Archives-Hash: 5653ba890de1387db20bccc69e91fca7 blueness 12/03/06 00:12:41 Added: ipsec-tools-system-kernel-headers.patch Log: Use system linux header files rather than those in /usr/src/linux =20 (Portage version: 2.1.10.44/cvs/Linux x86_64) Revision Changes Path 1.1 net-firewall/ipsec-tools/files/ipsec-tools-system-ke= rnel-headers.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipsec= -tools/files/ipsec-tools-system-kernel-headers.patch?rev=3D1.1&view=3Dmar= kup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipsec= -tools/files/ipsec-tools-system-kernel-headers.patch?rev=3D1.1&content-ty= pe=3Dtext/plain Index: ipsec-tools-system-kernel-headers.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D From: Anthony G. Basile ipsec-tools tries to make use of the kernel headers in /usr/src/linux/inc= lude/linux. This is not a good idea because these are not the system exported linux h= eader files. Unfortunately the configure.ac option which says where to look for these = headers doesn't point to the directory itself, usually /usr/include/linux, but to= its parent! Our solution then, although less than satifying, is to remove the --with-= kernel-headers switch and hard code KERNEL_INCLUDE=3D"/usr/include". diff -Naur ipsec-tools-0.8.0.orig/configure.ac ipsec-tools-0.8.0/configur= e.ac --- ipsec-tools-0.8.0.orig/configure.ac 2012-03-05 18:46:54.000000000 -05= 00 +++ ipsec-tools-0.8.0/configure.ac 2012-03-05 18:53:56.000000000 -0500 @@ -66,18 +66,11 @@ =20 case "$host_os" in *linux*) - AC_ARG_WITH(kernel-headers, - AC_HELP_STRING([--with-kernel-headers=3D/lib/modules//build/incl= ude], - [where your Linux Kernel headers are installed]), - [ KERNEL_INCLUDE=3D"$with_kernel_headers"=20 - CONFIGURE_AMFLAGS=3D"--with-kernel-headers=3D$with_kernel_headers= " - AC_SUBST(CONFIGURE_AMFLAGS) ], - [ KERNEL_INCLUDE=3D"/lib/modules/`uname -r`/build/include" ]) - + KERNEL_INCLUDE=3D"/usr/include" AC_CHECK_HEADER($KERNEL_INCLUDE/linux/pfkeyv2.h, , [ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h, KERNEL_INCLUDE=3D/usr/src/linux/include , - [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) = ] ) ] ) + [ AC_MSG_ERROR([Unable to find linux kernel headers. Aborting.]) ] ) = ] ) AC_SUBST(KERNEL_INCLUDE) # We need the configure script to run with correct kernel headers. # However we don't want to point to kernel source tree in compile ti= me,