diff options
-rw-r--r-- | dev-lang/ruby/Manifest | 3 | ||||
-rw-r--r-- | dev-lang/ruby/files/ruby-1.8.7_p249-pthread-linking.patch | 26 | ||||
-rw-r--r-- | dev-lang/ruby/ruby-1.8.7_p249.ebuild | 1 |
3 files changed, 29 insertions, 1 deletions
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest index c6b11cfc63..60f9c9de30 100644 --- a/dev-lang/ruby/Manifest +++ b/dev-lang/ruby/Manifest @@ -4,6 +4,7 @@ AUX ruby-1.8.6-uclibc-udp.patch 572 RMD160 7f460b16cbb1385aa9be62bd5df5e4f8fa919 AUX ruby-1.8.6_p36-only-ncurses.patch 427 RMD160 4439363eb8b16057df2d84cb3f52e4af2401c722 SHA1 3a6171c89e3b78cc51942259c91e2c6ce258ecdb SHA256 eea2296db3035fe34af65e399218180c1d985f53cf5468d4767feecad8a7b2a2 AUX ruby-1.8.6_p36-prefix.patch 294 RMD160 f0688fb2a91fe00c9bcab6b98d5f938220bd3751 SHA1 28c1fce091cfe70d18f3bab7ce8a56ed09eccf34 SHA256 7fef3910324a682c02a0df2162eabd53a46fe2e26f4989632829c485895d80c5 AUX ruby-1.8.7_p160-solaris.patch 288 RMD160 31be3afed06eb7339c0ab906d89002b7c92c821b SHA1 8d85d3fbd3b11b08fc02b1c1bd15a297a220c0b6 SHA256 b6ced456516a730a2486cc8de2544fcd8f77dc30644b76c1d56826539baad194 +AUX ruby-1.8.7_p249-pthread-linking.patch 610 RMD160 bf020b44bf538df751ddc3e286f4325fa4c966d0 SHA1 9dcebc1798660f8d663d94cc48b3ef4b7fabdc9e SHA256 1cc215e92a65fb64cdd804baa3da6c0164b5716c14dee8b42082d46b8fccc15f AUX ruby-1.9.1-only-ncurses.patch 482 RMD160 ff2c50c5f21d8ea99e009d78a4f57a9b87046d09 SHA1 bae8c2e12d52fc27f3c6bde870a2ec260c370626 SHA256 5485c7a9fbeb91427a9dcd1e3bdb80e3199a17a5bf95454e34883e14f26cf382 AUX ruby-1.9.1-prefix.patch 495 RMD160 65895f35b6a26d0356e66655883ca094dbb2fbcc SHA1 1dbfcc675393df4b3522315e8460c80acbb3a613 SHA256 20ff9e74050caa25db82ac7ed148f2a2548ba201d474eff844f029ddd3a9552a AUX ruby-mkconfig.patch 407 RMD160 8fdec98672ce845a94c1b28a17747c1e9dd7ec72 SHA1 1e2b97282f4fa55d213dd0b4e7c75fc53367ce7f SHA256 b1ca3500ac50fa49fa1f478aa34f318cff8d92abcd75edfc80fd96338a59e2f4 @@ -20,7 +21,7 @@ DIST ruby-patches-1.9.1_p243.tar.bz2 2460 RMD160 06f23fc2c3483cb3f552eabaa4fe226 EBUILD ruby-1.8.6_p369.ebuild 5874 RMD160 4262ba979c8a5dc49b2704cf97401950b8a4b9d7 SHA1 9187cc8d897cac11e81cdb59c77bd37866c779bd SHA256 e580c0ce4cf0b738456d88a3dd3b03dcd11b9b88efce52eee2afbd72bfb409f7 EBUILD ruby-1.8.6_p388.ebuild 5761 RMD160 cbbb807262631f938d956bb7647795e15c1f7eea SHA1 5ded316e7324ccd971b4ab3fe8a40d8ee18f44fb SHA256 9e6e70e1f6d3d4a5bad111f9d6e1e9a56cd88102fbbc1ca1aa0b4c478db25e31 EBUILD ruby-1.8.7_p174-r1.ebuild 5729 RMD160 422fb7495e2ba3b85f779170124e4ea599187b7e SHA1 feb93e8c5b0dcee4385a53388e9b0ef7d89b4379 SHA256 355236deab9375ab25410697b3ecdd1b6c9cb0a667ac89b5c11e14af5c137300 -EBUILD ruby-1.8.7_p249.ebuild 5722 RMD160 e63602a410801d21a21681e938f7afa6a0bbc41a SHA1 1ff519748731c8663ce135329e7936d9c856d862 SHA256 7af0bbe75cb9ffb3dc4cddc26de6d3250249d77ead696336deca0990478df72f +EBUILD ruby-1.8.7_p249.ebuild 5771 RMD160 2b108cc9f36f13bd4f6c67cac084900698c4e0f9 SHA1 faea764c33b2dc60b04fe12911a9cc05bda4517b SHA256 4d8af770a3a768b89a6afe2f0c40fec389084662c78bf1bcbce7ab3c66486511 EBUILD ruby-1.9.1_p243.ebuild 5912 RMD160 6f401cf72c4edb8247cc501f6bd5a4313e5376a6 SHA1 8e4d58b945a6a366339bdb4e6cb0e4d715af3bd8 SHA256 5c6b6a4d5b66371c1743946e5fbff99cbbc9e79a78cf517153b814bc5e2c55fc MISC ChangeLog 67944 RMD160 d75bc90928e0a937f08930e1ed09319c29d10f3c SHA1 612a3c9390359c6e6772ca28dd8caaf858f57e44 SHA256 aa1a05c25676859e803c4c1ac816109e46e75376d5a76eb08c7f15a96b66a27d MISC metadata.xml 262 RMD160 f8642aa78425fe09dc0e0660cb20a5bd4233d5bb SHA1 64def0369477ecf76b9285fb9c1cf0e6a4f334e5 SHA256 5ee3c0cfedcb966505e4fafcfc5321a8ee20c128da9bbcafff5aa268df588d59 diff --git a/dev-lang/ruby/files/ruby-1.8.7_p249-pthread-linking.patch b/dev-lang/ruby/files/ruby-1.8.7_p249-pthread-linking.patch new file mode 100644 index 0000000000..50902ee099 --- /dev/null +++ b/dev-lang/ruby/files/ruby-1.8.7_p249-pthread-linking.patch @@ -0,0 +1,26 @@ +http://bugs.gentoo.org/show_bug.cgi?id=307159 + +E.g. on Solaris you can't just do -lpthread, even though you can find +symbols there. In general, GCC knows best how to properly do it, so let +it do it for us, instead of relying on our own deviced logic. + +--- configure.in ++++ configure.in +@@ -1018,10 +1018,14 @@ + AC_DEFINE(_REENTRANT) + AC_DEFINE(_THREAD_SAFE) + AC_DEFINE(HAVE_LIBPTHREAD) +- case $pthread_lib in +- c) ++ case $pthread_lib::$GCC in ++ *::yes) ++ # GCC knows best, let it handle it ++ LIBS="-pthread $LIBS" ++ ;; ++ c::*) + ;; +- c_r) ++ c_r::*) + MAINLIBS="-pthread $MAINLIBS" + ;; + *) diff --git a/dev-lang/ruby/ruby-1.8.7_p249.ebuild b/dev-lang/ruby/ruby-1.8.7_p249.ebuild index d703f1d822..e983435d25 100644 --- a/dev-lang/ruby/ruby-1.8.7_p249.ebuild +++ b/dev-lang/ruby/ruby-1.8.7_p249.ebuild @@ -63,6 +63,7 @@ src_unpack() { epatch "${FILESDIR}/${PN}-1.8.6_p36-only-ncurses.patch" epatch "${FILESDIR}/${PN}-1.8.6_p36-prefix.patch" + epatch "${FILESDIR}/${P}-pthread-linking.patch" # Fix a hardcoded lib path in configure script sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \ |