Merge branch 'master' of git+ssh://git.overlays.gentoo.org/user/bircoph

Conflicts:
	sys-cluster/orangefs/Manifest

4 files changed, 21 insertions, 2 deletions

diff --git a/sys-cluster/orangefs/ChangeLog b/sys-cluster/orangefs/ChangeLog
index 5019c69..8ce442b 100644
--- a/sys-cluster/orangefs/ChangeLog
+++ b/sys-cluster/orangefs/ChangeLog
@@ -11,9 +11,10 @@
   With improper argument SIGKILL was not possible.
 
   28 Sep 2013; Andrew Savchenko <bircoph@gmail.com>
-  orangefs-2.9_beta20130530.ebuild:
+  orangefs-2.9_beta20130530.ebuild,
+  +files/orangefs-2.9_beta20130530-kernapps-lm.patch:
   Fix typo in econf argument. --without can't be used properly for
-  path-related arguments.
+  path-related arguments. Fix kernapps underlinking with libm.
 
 *orangefs-2.9_beta20130530 (24 Sep 2013)
 
diff --git a/sys-cluster/orangefs/Manifest b/sys-cluster/orangefs/Manifest
index a07e41a..154d303 100644
--- a/sys-cluster/orangefs/Manifest
+++ b/sys-cluster/orangefs/Manifest
@@ -1,6 +1,7 @@
 AUX README.gentoo 5236 SHA256 41de23798dbf8d8d4a8d733e36365b1179b0b898bc0cbb156764af46a9174aa9 SHA512 539eec804c08a20a55fe089c921b84ba00388c7a4b07a08f3fc13543e71f032bb6e57cd0dda0feffee3593db57ad430fc4527779ad94053a8dfffb74ff06e4d4 WHIRLPOOL 96153271a6b0b35b67a041dd1f84a28cfce3788e25da33f0e5fa9f052d5daafe55816707da4a3f7f7facb9c7ba18cedecdc2051e2f7eda60b151ddf07b43ded5
 AUX orangefs-2.8.5-split-kernapps.patch 571 SHA256 fe66b4f82e13c19d11fe002a15f75f251af336055fae37cbb8c2ea57f795f7d8 SHA512 0d74b2738377ab87469f5d17ba49bd364d64940e5c8ea7081ad7eb34d9ca95c48b8a8cb4ffcd294584b665d499e213e63e3055e5dd602a69ae551ef8b5fe80e1 WHIRLPOOL 779e1e79df459142a3bd2ab1d02ac9c1cf90d149cf6f3a0dd771022d2dfc1b199358f045d332efb733fae2e34df1b4bd5c93b1a9422e2a3a118f70b549ebf9b8
 AUX orangefs-2.8.6-layout.patch 4407 SHA256 5bb0646fa483fc4eb51ae71d3a1fc9e3cc43e0b1a525e8fd3939c6eddf2561a1 SHA512 8d8d463bc302382d612dc9515adf3ece4523f7f1039338a57a6f1dc3f35490c441031dd2539d4a3f80e4f4c0b4ea5ee2354e26a7942f156aa8fe59d6a2617630 WHIRLPOOL 1473407bd68a32b3a50499fa9abea4ef394cf5ed38b4a39a45e4b45d4ca0233f725b8d2fac816901044b51085753c818d70066f14b47402945dfc030178174ed
+AUX orangefs-2.9_beta20130530-kernapps-lm.patch 732 SHA256 87c7da843e71dfef2a628be102ea553b9b839e8fbf92e2d58e98fdb4c0c6e09a SHA512 00400c24c64360cab2bd9d3dfb8c99fc3072053e0e785aab0bfc884369d5ac3a119d5ff6e87de417d5f9e79d0df1e2221a391667ca0f6d528342556ccb0402c4 WHIRLPOOL 3502cc4f0544118ac8db33d80d96e18c0afad9ebeb1da9e87f1fb3e44d9cf79375ac795bf79cb6e928f51ad7f71d4c79af2d12065f66edae5c937bdb1797b5ae
 AUX pvfs2-client-conf.d 2206 SHA256 d312252ae96254b983aa0a27ea5c855298f0910020e843334bf06d34347599a5 SHA512 8daff31699cf9df87a21bd87d7c9695d27f5d83b6a1fbb0ca2a467c0bd3fef5c58a1f7fb21f48469a6a5457c5abff05733c0e007bb112519eaa8076b35ff85ec WHIRLPOOL d8a985aac965b4eacd0a36151202d9dec65faeeee34ee895ab1a023c89837139b49a2fdd6ef52f74b829717e36f864349a7d68ce8887bf7bc67cf03463e11ebd
 AUX pvfs2-client-init.d 6617 SHA256 d4042e6ed227f7488f7026da0693098f7eaf01e3d69d15a06d800936e26d18b5 SHA512 0174268be306b2c2313ddbf14a9e541a6613b884abb0933b0955a050c9e22b8d6ea68e6b89d2ba6be4955612bcf03a728d6c81e2f7ec732750189b97e440a9a7 WHIRLPOOL 337718b218a8313726f031473f66d2cf0378fff89e5da099204a809647eb85445dfa1e51bcc87e447d4e3c2e1bc4005f18ed00a38b9e683576738f17d1434692
 AUX pvfs2-server-conf.d 846 SHA256 ee0a05a593e4d78b867aa7ef008dbd553c02bb97c2bfec7865173b46c45f30d0 SHA512 25d6c1c1ca0c5c72fcb28ed30c9ffd9c833736b660d9022569ef9f224352f2e8bff1b761acc27b2bbad5b7f7a92e6172cedea9d9f543d436d53351559199f706 WHIRLPOOL ed1f45a1e563e966a0d07ae22a65c00b954089b4ad20b22364c5c6dd017c188b0e28406fcd62fe9baad0f255010360a8a14aa1450f172116d7232b162073b3c8
diff --git a/sys-cluster/orangefs/files/orangefs-2.9_beta20130530-kernapps-lm.patch b/sys-cluster/orangefs/files/orangefs-2.9_beta20130530-kernapps-lm.patch
new file mode 100644
index 0000000..b315a10
--- /dev/null
+++ b/sys-cluster/orangefs/files/orangefs-2.9_beta20130530-kernapps-lm.patch
@@ -0,0 +1,14 @@
+diff -Naurd orangefs-2.9beta.20130530.orig/src/apps/kernel/linux/module.mk.in orangefs-2.9beta.20130530/src/apps/kernel/linux/module.mk.in
+--- orangefs-2.9beta.20130530.orig/src/apps/kernel/linux/module.mk.in	2013-05-31 01:50:36.000000000 +0400
++++ orangefs-2.9beta.20130530/src/apps/kernel/linux/module.mk.in	2013-09-28 18:51:58.649517038 +0400
+@@ -27,7 +27,8 @@
+ endif
+ 
+ # explicitly uses pthreads both threaded and not-threaded versions, even if
+-# threading is turned off in the rest of libpvfs
+-MODLDFLAGS_$(DIR)/pvfs2-client-core.o = -lpthread
++# threading is turned off in the rest of libpvfs;
++# libm is needed for libpvfs2-threaded (ceil and log functions) 
++MODLDFLAGS_$(DIR)/pvfs2-client-core.o = -lpthread -lm
+ 
+ endif
diff --git a/sys-cluster/orangefs/orangefs-2.9_beta20130530-r1.ebuild b/sys-cluster/orangefs/orangefs-2.9_beta20130530-r1.ebuild
index 4db3136..a49c690 100644
--- a/sys-cluster/orangefs/orangefs-2.9_beta20130530-r1.ebuild
+++ b/sys-cluster/orangefs/orangefs-2.9_beta20130530-r1.ebuild
@@ -104,6 +104,9 @@ src_prepare() {
 	# the eclass for) and the installation of the kernapps.
 	epatch "${FILESDIR}"/${PN}-2.8.5-split-kernapps.patch
 
+	# Fix libm underliking issue for kernapps
+	epatch "${FILESDIR}"/${P}-kernapps-lm.patch
+
 	# Change defalt server logfile location to more appropriate value
 	# used by init script.
 	sed -i "s%/tmp/pvfs2-server.log%${EPREFIX}var/log/pvfs2/server.log%g" \