[arch-commits] Commit in rubygems/trunk (PKGBUILD stop_so_duplication.patch)

Anatol Pomozov anatolik at archlinux.org
Fri Dec 27 23:53:20 UTC 2019


    Date: Friday, December 27, 2019 @ 23:53:20
  Author: anatolik
Revision: 372333

upgpkg: rubygems 3.1.2-4: Do not push generated *.so files to lib/. Keep *.so files in extension/ dir.

Added:
  rubygems/trunk/stop_so_duplication.patch
Modified:
  rubygems/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |    7 +++++--
 stop_so_duplication.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-27 19:47:07 UTC (rev 372332)
+++ PKGBUILD	2019-12-27 23:53:20 UTC (rev 372333)
@@ -3,7 +3,7 @@
 pkgname=rubygems
 pkgdesc='Package management framework for Ruby'
 pkgver=3.1.2
-pkgrel=3
+pkgrel=4
 arch=(any)
 url='https://rubygems.org/'
 license=(MIT)
@@ -12,18 +12,21 @@
 backup=(etc/gemrc)
 checkdepends=(rake)
 source=(rubygems-$pkgver.zip::https://github.com/rubygems/rubygems/archive/v${pkgver}.zip
+        stop_so_duplication.patch
 	gemrc)
 sha512sums=('53b9d18ba5240d1f382f8128f2416870335789ceed39f4ddb1dc4a951c8beb1dd5198cde19a0ddccb9b6cd55b2614e96dfbe99dcc5f1c64ae106cf614f762076'
+            '9919490bbf7dba979a1df7543e62eb3fca48e8a516e6b6ab0a73080952e1b58599b7f233259d122dc66bf93f032b434d70e0dd448a1cb86513f01acb51b2120e'
             '8cafd14d414ee3c16aa94f79072bc6c100262f925dc1300e785846c3fabbbbffc1356b8e2223af5684e3340c55032d41231179ffa948bb12e01dbae0f4131911')
 
 prepare() {
   cd rubygems-${pkgver}
+  patch -p1 < ../stop_so_duplication.patch
 }
 
 check() {
   cd rubygems-${pkgver}
 
-  # disable as it requires a bund of ruby dependencies
+  # disable as it requires a lot of ruby-* dependencies
   #rake test
 }
 

Added: stop_so_duplication.patch
===================================================================
--- stop_so_duplication.patch	                        (rev 0)
+++ stop_so_duplication.patch	2019-12-27 23:53:20 UTC (rev 372333)
@@ -0,0 +1,26 @@
+commit ac83e58d1b9af68042433ae7ca8c9ff55b379770
+Author: Anatol Pomozov <anatol.pomozov at gmail.com>
+Date:   Fri Dec 27 15:43:14 2019 -0800
+
+    Do not put generated *.so file to 'lib/'
+    
+    Keep the *.so files under extension directory only. 'lib/' is for ruby
+    sources only.
+    
+    References:
+      https://src.fedoraproject.org/rpms/rubygems/blob/master/f/operating_system.rb
+      https://github.com/rubygems/rubygems/issues/749
+
+diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb
+index d4ff4a26..4926f322 100644
+--- a/lib/rubygems/defaults.rb
++++ b/lib/rubygems/defaults.rb
+@@ -144,7 +144,7 @@ module Gem
+   # Install extensions into lib as well as into the extension directory.
+ 
+   def self.install_extension_in_lib # :nodoc:
+-    true
++    false
+   end
+ 
+   ##



More information about the arch-commits mailing list