diff options
author | Ralph Sennhauser <sera@gentoo.org> | 2012-01-21 08:49:23 +0000 |
---|---|---|
committer | Ralph Sennhauser <sera@gentoo.org> | 2012-01-21 08:49:23 +0000 |
commit | a6570caef94868737a71488a112040abf96c9ee9 (patch) | |
tree | d2c5057d598b689315a05b99a1228b6adb01bc72 /dev-java | |
parent | Version bump. (diff) | |
download | gentoo-2-a6570caef94868737a71488a112040abf96c9ee9.tar.gz gentoo-2-a6570caef94868737a71488a112040abf96c9ee9.tar.bz2 gentoo-2-a6570caef94868737a71488a112040abf96c9ee9.zip |
Fix building with Linux 3.x. #379283
Thanks to Andreis_Vinogradovs ( slepnoga ) <andreis.vinogradovs@gmail.com>
(Portage version: 2.1.10.44/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/jss/ChangeLog | 8 | ||||
-rw-r--r-- | dev-java/jss/jss-4.3.ebuild | 13 |
2 files changed, 16 insertions, 5 deletions
diff --git a/dev-java/jss/ChangeLog b/dev-java/jss/ChangeLog index f5fd8c21507b..e5c0be9aa89e 100644 --- a/dev-java/jss/ChangeLog +++ b/dev-java/jss/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/jss -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jss/ChangeLog,v 1.24 2010/08/04 09:11:57 xarthisius Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jss/ChangeLog,v 1.25 2012/01/21 08:49:23 sera Exp $ + + 21 Jan 2012; Ralph Sennhauser <sera@gentoo.org> jss-4.3.ebuild: + Fix building with Linux 3.x. #379283 + Thanks to Andreis_Vinogradovs ( slepnoga ) <andreis.vinogradovs@gmail.com> 04 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org> jss-4.3.ebuild, +files/jss-4.3-ldflags.patch: diff --git a/dev-java/jss/jss-4.3.ebuild b/dev-java/jss/jss-4.3.ebuild index 38305573ccf7..37c15a22f5ee 100644 --- a/dev-java/jss/jss-4.3.ebuild +++ b/dev-java/jss/jss-4.3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jss/jss-4.3.ebuild,v 1.3 2010/08/04 09:11:57 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jss/jss-4.3.ebuild,v 1.4 2012/01/21 08:49:23 sera Exp $ -inherit base java-pkg-2 versionator +inherit base java-pkg-2 linux-info versionator RTM_NAME="JSS_${PV//./_}_RTM" DESCRIPTION="Network Security Services for Java (JSS)" @@ -42,6 +42,13 @@ src_compile() { export JAVA_GENTOO_OPTS="-target $(java-pkg_get-target) -source $(java-pkg_get-source)" use amd64 && export USE_64=1 cd "${S}/security/coreconf" || die + + # Hotfix for kernel 3.x #379283 + get_running_version || die "Failed to determine kernel version" + if [[ ${KV_MAJOR} -ge 3 ]]; then + cp Linux2.6.mk Linux${KV_MAJOR}.${KV_MINOR}.mk || die + fi + emake -j1 BUILD_OPT=1 || die "coreconf make failed" cd "${S}/security/jss" || die |