public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Anthony G. Basile (blueness)" <blueness@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in net-firewall/ipsec-tools/files: ipsec-tools-system-kernel-headers.patch
Date: Tue,  6 Mar 2012 00:12:41 +0000 (UTC)	[thread overview]
Message-ID: <20120306001241.CCC1E2004C@flycatcher.gentoo.org> (raw)

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
  
  (Portage version: 2.1.10.44/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-firewall/ipsec-tools/files/ipsec-tools-system-kernel-headers.patch

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
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

Index: ipsec-tools-system-kernel-headers.patch
===================================================================
From: Anthony G. Basile <blueness@gentoo.org>

ipsec-tools tries to make use of the kernel headers in /usr/src/linux/include/linux.
This is not a good idea because these are not the system exported linux header 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="/usr/include".

diff -Naur ipsec-tools-0.8.0.orig/configure.ac ipsec-tools-0.8.0/configure.ac
--- ipsec-tools-0.8.0.orig/configure.ac	2012-03-05 18:46:54.000000000 -0500
+++ ipsec-tools-0.8.0/configure.ac	2012-03-05 18:53:56.000000000 -0500
@@ -66,18 +66,11 @@
 
 case "$host_os" in
  *linux*)
-    AC_ARG_WITH(kernel-headers,
-	AC_HELP_STRING([--with-kernel-headers=/lib/modules/<uname>/build/include],
-		       [where your Linux Kernel headers are installed]),
-	    [ KERNEL_INCLUDE="$with_kernel_headers" 
-	      CONFIGURE_AMFLAGS="--with-kernel-headers=$with_kernel_headers"
-	      AC_SUBST(CONFIGURE_AMFLAGS) ],
-	    [ KERNEL_INCLUDE="/lib/modules/`uname -r`/build/include" ])
-
+    KERNEL_INCLUDE="/usr/include"
     AC_CHECK_HEADER($KERNEL_INCLUDE/linux/pfkeyv2.h, ,
 	[ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h,
 	  KERNEL_INCLUDE=/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 time,






             reply	other threads:[~2012-03-06  0:12 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-06  0:12 Anthony G. Basile (blueness) [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-03-08 12:06 [gentoo-commits] gentoo-x86 commit in net-firewall/ipsec-tools/files: ipsec-tools-system-kernel-headers.patch Anthony G. Basile (blueness)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120306001241.CCC1E2004C@flycatcher.gentoo.org \
    --to=blueness@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox