summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Savchenko <bircoph@gmail.com>2012-08-31 00:28:52 +0400
committerAndrew Savchenko <bircoph@gmail.com>2012-08-31 00:28:52 +0400
commit90a1f8e41e9c4bccc5e94239f98961887b3e95ea (patch)
tree0e80506472f8e586d784e821fabbff0d654d2899 /sys-cluster
parentorangefs: version bump to 2.8.6 with some updates (diff)
downloadbircoph-90a1f8e41e9c4bccc5e94239f98961887b3e95ea.tar.gz
bircoph-90a1f8e41e9c4bccc5e94239f98961887b3e95ea.tar.bz2
bircoph-90a1f8e41e9c4bccc5e94239f98961887b3e95ea.zip
orangefs: fix parallel build issue
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/orangefs/ChangeLog4
-rw-r--r--sys-cluster/orangefs/Manifest5
-rw-r--r--sys-cluster/orangefs/files/orangefs-2.8.6-parallel-make.patch18
-rw-r--r--sys-cluster/orangefs/orangefs-2.8.6.ebuild3
4 files changed, 28 insertions, 2 deletions
diff --git a/sys-cluster/orangefs/ChangeLog b/sys-cluster/orangefs/ChangeLog
index 8377b1c..8aed203 100644
--- a/sys-cluster/orangefs/ChangeLog
+++ b/sys-cluster/orangefs/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 30 Aug 2012; Andrew Savchenko <bircoph@gmail.com> orangefs-2.8.6.ebuild,
+ +files/orangefs-2.8.6-parallel-make.patch:
+ orangefs: fix parallel build in 2.8.6
+
*orangefs-2.8.6 (30 Aug 2012)
30 Aug 2012; Andrew Savchenko <bircoph@gmail.com> +orangefs-2.8.6.ebuild,
diff --git a/sys-cluster/orangefs/Manifest b/sys-cluster/orangefs/Manifest
index 0ea986f..54505e6 100644
--- a/sys-cluster/orangefs/Manifest
+++ b/sys-cluster/orangefs/Manifest
@@ -8,6 +8,7 @@ AUX orangefs-2.8.5-split-kernapps.patch 571 SHA256 fe66b4f82e13c19d11fe002a15f75
AUX orangefs-2.8.5-static-server.patch 625 SHA256 69b0d94a9b17c3c9fa37644dc6d8649e4a254fbdb8da7e13e0b094f35928874b SHA512 71dc84fe6e2a99a446e086d58e4ee1b045adfa053c811c9410bce704ef0041fb9ccc0974e9453f4fcc7a172765aefde26a35184db3217ab801a75a82dca9f973 WHIRLPOOL 99a16f8eeb17c926cac4ab51605aeedc6a3461c37a58833a6dfd8f82a1fb3693e1fc794a3b933154e85b80f6ffffb9a17ba0b5a09b0e262025e79def4784d768
AUX orangefs-2.8.5-vis.patch 2410 SHA256 88c139a3eb35832860911c2580af8e1bb699437a399549d4dfb39f882af98520 SHA512 1be2d7ee50d83cec4ae342279638988866f43340a117763efd20cc402c9caf963b47194c94b41c08dc8049dbb61dc669efd07bcbf26d0e1c4dbeca961d77cf8d WHIRLPOOL 3564092b6aaaa9fceb23eb13c9bead7e04698fb8ba5821ae71c012eb7c2f4f30e878bad7bc2ea5c0c3fd53ae86ffc860ed114b826176af41f55ec8bc741c33d7
AUX orangefs-2.8.6-layout.patch 4407 SHA256 5bb0646fa483fc4eb51ae71d3a1fc9e3cc43e0b1a525e8fd3939c6eddf2561a1 SHA512 8d8d463bc302382d612dc9515adf3ece4523f7f1039338a57a6f1dc3f35490c441031dd2539d4a3f80e4f4c0b4ea5ee2354e26a7942f156aa8fe59d6a2617630 WHIRLPOOL 1473407bd68a32b3a50499fa9abea4ef394cf5ed38b4a39a45e4b45d4ca0233f725b8d2fac816901044b51085753c818d70066f14b47402945dfc030178174ed
+AUX orangefs-2.8.6-parallel-make.patch 744 SHA256 07beba9f30b704452f78ea0dee075fe682605ec698810b5f42ca220e32c47e95 SHA512 aac8471f5f80b7d555a8f02a916139efc141fdd3289660b973e24b0225cbac02fc4ebc28ac2ca1559d56a9c1acd8296a675830b0db89db16f4ae7384793a9e23 WHIRLPOOL 149bb040f155492b6fdfc6fa081db78ad07be3f10d0d5abd11b94c0cd03fc7116afead0c7b305ee0f71f6e3bcd1b9557f0977323497161110adbcddb4c365da9
AUX pvfs2-client-conf.d 2204 SHA256 c12b1be67e02d011b3c234283ffd3d9b85b8a7d7a2e0644487c4cfc8c3a8536e SHA512 d3e2f2cf4e4072171c39b77117b58346333a8d9501f40aea7a49c001330ef1b1b78da0375deaa6aa94b7d31c4450a6699fe624c7093736bfa94ff98ef6390399 WHIRLPOOL 986cde79995604a818da72508be7dd802bfdc0e27c92d2886ecb64683fdc7eb903068368c7f04149a1ec97db7d59a037fa545a7a5c9cc6d921e23500e851235c
AUX pvfs2-client-init.d 6617 SHA256 d4042e6ed227f7488f7026da0693098f7eaf01e3d69d15a06d800936e26d18b5 SHA512 0174268be306b2c2313ddbf14a9e541a6613b884abb0933b0955a050c9e22b8d6ea68e6b89d2ba6be4955612bcf03a728d6c81e2f7ec732750189b97e440a9a7 WHIRLPOOL 337718b218a8313726f031473f66d2cf0378fff89e5da099204a809647eb85445dfa1e51bcc87e447d4e3c2e1bc4005f18ed00a38b9e683576738f17d1434692
AUX pvfs2-server-conf.d 846 SHA256 ee0a05a593e4d78b867aa7ef008dbd553c02bb97c2bfec7865173b46c45f30d0 SHA512 25d6c1c1ca0c5c72fcb28ed30c9ffd9c833736b660d9022569ef9f224352f2e8bff1b761acc27b2bbad5b7f7a92e6172cedea9d9f543d436d53351559199f706 WHIRLPOOL ed1f45a1e563e966a0d07ae22a65c00b954089b4ad20b22364c5c6dd017c188b0e28406fcd62fe9baad0f255010360a8a14aa1450f172116d7232b162073b3c8
@@ -15,6 +16,6 @@ AUX pvfs2-server-init.d 4484 SHA256 644dbe0e7a276e383a79c9ce2fea1a3cd69bedd96232
DIST orangefs-2.8.5.tar.gz 10163182 SHA256 00dd5bf1fea76573e0203aaad206dfe4ef087cdbfcfda1e7fd0969dafd16a0d3 SHA512 8a71d192130db022a862402bd57b3769b221e423b3d7e321d7fe9c2ec192718365455d25cee1be23d2ea8ae861ec84f02e9cf192ea3734a388fbabc111eeef8f WHIRLPOOL d6cfbaae8c9277f0973eb7a284b0b56c7494f33b292d1f34d05e77cabc29b20da0d200d518180781cdeb7b986a1f323159b38974de50391ed670dd27d34aaa8f
DIST orangefs-2.8.6.tar.gz 2778466 SHA256 cc2a9df9750abe6ea97c9e6259083a45d22d8cbf56bc4a8c35376940ba8108f8 SHA512 0eb22b217fdfc4bd1384551bbe4c946223eba09db1dae361204cc3624abc0c681a1b99265f7b2c01034fbdcb3d52a5366f43e941639ef7ee5c2ce0bccc140697 WHIRLPOOL f8ac9dccc0bd7f76978173f501e58ed92d75d280198e1426bdd3fa8953821c9dc47dbd088ea5d5b546bee7c330e8e3edb55d2829ee61e04980e58cbd8122fdc5
EBUILD orangefs-2.8.5-r1.ebuild 7496 SHA256 fd21bf129cd2e0a9a3c04826724c2e87234d78736e2db6acebb290398d5fbfdc SHA512 c12e251cdae702e2064b767b88355d51ac171ad573e9e2afae62e2ef48abbaa51d882bf2342ed5b8bb14d436d57e453a9b9c5cd38b53724a671c4237205622b1 WHIRLPOOL 4ea24fd0964117ac3b68420697232c2003008f4eea942f4ffe372f12f3ac8f489b464ffc811eb7e8bfa1e3abe5e5d6f2d0cfad03067df680a52ca16c28d31b50
-EBUILD orangefs-2.8.6.ebuild 6879 SHA256 d8a5b991ca70c95147754ad00b816018623ff5570eadb94f18188c71a0cdcacb SHA512 f01c3ed09875eb052f58972da185768a394a34cea7688d68db5905954e1473945b1981eb644271c747173a7c5850dc059dea83de8af5e7ff4ccaacf9fbc7e860 WHIRLPOOL ebe2fc0440237b0789924244b4d5320077feeb171d7dd47ede1f63bf8bdeb79bf53ee7c13f371c02c17dacdd123d8c38617f380e98b8c016450a468d98a1426a
-MISC ChangeLog 6261 SHA256 67c6d94a055fba4b76dcb95094b2eb6ff4d917b12a37b1322c8c9f3b5c6fa39a SHA512 5acb7dc7b6c135e844ba7a1f258e6850a5b0b443a9d05b521b640da8b8fed4f9fd27eccb82f3e3994e53e1c2dcd9832b2682ed9ebbf32e1ef9bc7e021af79b60 WHIRLPOOL 3706f5fd4032899fde062673b325e72a768343e6df197f449418a6c32bd0b3580a0e90f8408c7c385d8ccc15d396a9499dbc2155325ba2e325d1da7c2b3ab387
+EBUILD orangefs-2.8.6.ebuild 6969 SHA256 2454f7e695abdbb66d944031f8d1a7e71d93b4d756c05ab796a70f92a33affcd SHA512 059ea9c7542e59149cba20cdf2df1260bbc558619ae837294e86dbffc46c508dafad1d95dba81d81c2dd81b19112dd5847704e6186ffc1259f0c90c4a2484c18 WHIRLPOOL f4ae889267c7da13b14c4ae1b52d763f0c96354a59a7e48e11cd83bad9b4768f2f2de7203d2651ad76142d48704df34cc5c44debb385c9d079e552727d479b96
+MISC ChangeLog 6422 SHA256 fc6898c9a2a6749be19abc571811715866c2b77e359e921ef17ba92327569185 SHA512 f76891acf42567b07368e43b612a7215ec636ef9ffa7561fda1a51b6ae2214bb356d4f9bd6abead5df43612aa7474f75d5e558e0c56988505af53dc33937604c WHIRLPOOL 7ff1e823c1f5089d74c4f0b7f8d7804a8358eaf9dc7714ef327a3abe5ee4a389b37e248325e9a1322506d2fe595a50c9a97ad7110052bec2dcc7c07bc1b54942
MISC metadata.xml 1636 SHA256 e471df95801404fbfa1b2bbda973b18868a839f7148879911b093f32e8e24756 SHA512 68475f3c406de29f2c852a0dd311abee9ec9ad0e3b53c01590fc8e122cb96e92a99b2b3c0c939c16abeeb6999676386be83981b66fae528ad49c8486871a9e4f WHIRLPOOL 332ae4d82dfa20f262fed28606fe4f6b2253fef336f5c8e84b279031b60ff9fa05b26bc6e6d797de6d80726735f9a3a98b7dabf809303c7495902e9c6d9f7323
diff --git a/sys-cluster/orangefs/files/orangefs-2.8.6-parallel-make.patch b/sys-cluster/orangefs/files/orangefs-2.8.6-parallel-make.patch
new file mode 100644
index 0000000..7d73f19
--- /dev/null
+++ b/sys-cluster/orangefs/files/orangefs-2.8.6-parallel-make.patch
@@ -0,0 +1,18 @@
+--- Makefile.in.orig 2012-08-30 13:41:32.000000000 +0400
++++ Makefile.in 2012-08-30 23:55:17.000000000 +0400
+@@ -856,13 +856,13 @@
+ $(E)ar rcs $@ $(ULIBTHREADEDOBJS)
+
+ # rule for building the shared ofs library
+-lib/libofs.so: $(ULIBPICOBJS)
++lib/libofs.so: $(ULIBPICOBJS) lib/libpvfs2.so
+ $(Q) " LDSO $@"
+ $(E)$(INSTALL) -d lib
+ $(E)$(LDSHARED) -Wl,-soname,libofs.so -o $@ $(ULIBPICOBJS) $(ULIBDEPLIBS) $(DEPLIBS)
+
+ # rule for building the shared ofs _multithreaded_ library
+-lib/libofs-threaded.so: $(ULIBTHREADEDPICOBJS)
++lib/libofs-threaded.so: $(ULIBTHREADEDPICOBJS) lib/libpvfs2.so
+ $(Q) " LDSO $@"
+ $(E)$(INSTALL) -d lib
+ $(E)$(LDSHARED) -Wl,-soname,libofs-threaded.so -o $@ $(ULIBTHREADEDPICOBJS) $(ULIBDEPLIBS) $(DEPLIBS)
diff --git a/sys-cluster/orangefs/orangefs-2.8.6.ebuild b/sys-cluster/orangefs/orangefs-2.8.6.ebuild
index 9aa43c7..5def2cc 100644
--- a/sys-cluster/orangefs/orangefs-2.8.6.ebuild
+++ b/sys-cluster/orangefs/orangefs-2.8.6.ebuild
@@ -83,6 +83,9 @@ src_prepare() {
# Allow data layout control (proposed by upstream)
epatch "${FILESDIR}"/${P}-layout.patch
+ # Fix parallel build deps, sent upstream
+ epatch "${FILESDIR}"/${P}-parallel-make.patch
+
# Change defalt server logfile location to more appropriate value
# used by init script.
sed -i "s%/tmp/pvfs2-server.log%/var/log/pvfs2/server.log%g" \