From: Diego Elio Pettenò <flameeyes@gentoo.org>
Date: Thu, 7 Dec 2006 02:27:22 +0000 (+0000)
Subject: Use the proper platform include directory for jni (for FreeBSD and Linux at least).
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5ca916c266ef2b522b14ca94dd0b7df032f991e1;p=gentoo.git

Use the proper platform include directory for jni (for FreeBSD and Linux at least).
---

diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 0d8615f68a45..6f22c923f209 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -6,7 +6,7 @@
 #
 # Licensed under the GNU General Public License, v2
 #
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.32 2006/12/07 02:14:46 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.33 2006/12/07 02:27:22 flameeyes Exp $
 
 
 # -----------------------------------------------------------------------------
@@ -26,6 +26,8 @@
 
 inherit eutils versionator multilib
 
+IUSE="elibc_FreeBSD"
+
 # -----------------------------------------------------------------------------
 # @section-begin variables
 # @section-title Variables
@@ -1272,9 +1274,11 @@ java-pkg_javac-args() {
 java-pkg_get-jni-cflags() {
 	local flags="-I${JAVA_HOME}/include"
 
+	local platform="linux"
+	use elibc_FreeBSD && platform="freebsd"
+
 	# TODO do a check that the directories are valid
-	# TODO figure out how to cope with other things than linux...
-	flags="${flags} -I${JAVA_HOME}/include/linux"
+	flags="${flags} -I${JAVA_HOME}/include/${platform}"
 
 	echo ${flags}
 }