Mageia Bugzilla – Attachment 11804 Details for
Bug 27009
"gem install licensee" fails with an error with mageia's ruby
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
An attempt to fix the bug , but it still exhibits the same problem
ruby-mga8-bug27009-non-fix--v0.0.1.patch (text/plain), 3.28 KB, created by
Shlomi Fish
on 2020-08-13 19:26:56 CEST
(
hide
)
Description:
An attempt to fix the bug , but it still exhibits the same problem
Filename:
MIME Type:
Creator:
Shlomi Fish
Created:
2020-08-13 19:26:56 CEST
Size:
3.28 KB
patch
obsolete
>Index: SPECS/ruby.spec >=================================================================== >--- SPECS/ruby.spec (revision 1613922) >+++ SPECS/ruby.spec (working copy) >@@ -1,4 +1,4 @@ >-# Taken from the fedora ruby-2.2.3 .spec. Thanks! >+# Taken from the fedora ruby-2.2.3 .spec. Thanks! configure.ac > > %global major_version 2 > %global minor_version 7 >@@ -225,12 +225,12 @@ > Patch2: ruby-2.1.0-Enable-configuration-of-archlibdir.patch > # Force multiarch directories for i.86 to be always named i386. This solves > # some differencies in build between Fedora and RHEL. >-Patch3: ruby-2.1.0-always-use-i386.patch >+# Patch3: ruby-2.1.0-always-use-i386.patch > # Allows to install RubyGems into custom directory, outside of Ruby's tree. > # http://bugs.ruby-lang.org/issues/5617 > Patch4: ruby-2.1.0-custom-rubygems-location.patch > # Make mkmf verbose by default >-Patch5: ruby-1.9.3-mkmf-verbose.patch >+# Patch5: ruby-1.9.3-mkmf-verbose.patch > # The ABRT hook used to be initialized by preludes via following patches: > # https://bugs.ruby-lang.org/issues/8566 > # https://bugs.ruby-lang.org/issues/15306 >@@ -239,18 +239,18 @@ > # this would require boostrapping: > # https://lists.fedoraproject.org/archives/list/ruby-sig@lists.fedoraproject.org/message/LH6L6YJOYQT4Y5ZNOO4SLIPTUWZ5V45Q/ > # For now, load the ABRT hook via this simple patch: >-Patch6: ruby-2.7.0-Initialize-ABRT-hook.patch >+# Patch6: ruby-2.7.0-Initialize-ABRT-hook.patch > # Workaround "an invalid stdio handle" error on PPC, due to recently introduced > # hardening features of glibc (rhbz#1361037). > # https://bugs.ruby-lang.org/issues/12666 >-Patch9: ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch >+# Patch9: ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch > # Revert commit which breaks bundled net-http-persistent version check. > # https://github.com/drbrain/net-http-persistent/pull/109 >-Patch10: ruby-2.7.0-Remove-RubyGems-dependency.patch >+# Patch10: ruby-2.7.0-Remove-RubyGems-dependency.patch > > # Add support for .include directive used by OpenSSL config files. > # https://github.com/ruby/openssl/pull/216 >-Patch22: ruby-2.6.0-config-support-include-directive.patch >+# Patch22: ruby-2.6.0-config-support-include-directive.patch > # == FEDORA PATCHES ENDS == > # operating_system.rb sets default_dir to user_dir for non root, this causes the build > # to install gems into user dir >@@ -257,7 +257,7 @@ > #Patch20: ruby-2.3.0-Do-not-install-to-user-dir.patch > > # Upstream fix for popen_deadlock test missing -ldl >-Patch30: ruby-2.7.0-Fix-linkage-of-popen_deadlock-test.patch >+# Patch30: ruby-2.7.0-Fix-linkage-of-popen_deadlock-test.patch > > # Fix build with recent autoconf > Patch50: ruby-2.7.1-autoconf-fix.patch >@@ -594,6 +594,7 @@ > %prep > %setup -q -n ruby-%{rubyver} > %autopatch -p1 >+perl -i.llllkkk -p -E 's/\$\{[^\}]+\}//ms if m#\AAC_SUBST\(libdirname,#ms' configure.ac > > # Remove bundled libraries to be sure they are not used. > rm -rf ext/psych/yaml >@@ -602,6 +603,7 @@ > %build > autoreconf -vfi > CFLAGS=`echo %optflags | sed 's/-fomit-frame-pointer//'` >+export LDFLAGS=" -l dl " > %configure --enable-shared --disable-rpath --enable-pthread \ > --enable-multiarch \ > --with-rubylibprefix='%{ruby_libdir}' \ >@@ -624,6 +626,7 @@ > --with-setjmp-type=setjmp \ > %endif > >+perl -i -p -E 's/archlibdir/libdir/ if m#^\s*CONFIG\["libdirname"\]\s*=#' rbconfig.rb > %make_build Q= > > %install
Index: SPECS/ruby.spec =================================================================== --- SPECS/ruby.spec (revision 1613922) +++ SPECS/ruby.spec (working copy) @@ -1,4 +1,4 @@ -# Taken from the fedora ruby-2.2.3 .spec. Thanks! +# Taken from the fedora ruby-2.2.3 .spec. Thanks! configure.ac %global major_version 2 %global minor_version 7 @@ -225,12 +225,12 @@ Patch2: ruby-2.1.0-Enable-configuration-of-archlibdir.patch # Force multiarch directories for i.86 to be always named i386. This solves # some differencies in build between Fedora and RHEL. -Patch3: ruby-2.1.0-always-use-i386.patch +# Patch3: ruby-2.1.0-always-use-i386.patch # Allows to install RubyGems into custom directory, outside of Ruby's tree. # http://bugs.ruby-lang.org/issues/5617 Patch4: ruby-2.1.0-custom-rubygems-location.patch # Make mkmf verbose by default -Patch5: ruby-1.9.3-mkmf-verbose.patch +# Patch5: ruby-1.9.3-mkmf-verbose.patch # The ABRT hook used to be initialized by preludes via following patches: # https://bugs.ruby-lang.org/issues/8566 # https://bugs.ruby-lang.org/issues/15306 @@ -239,18 +239,18 @@ # this would require boostrapping: # https://lists.fedoraproject.org/archives/list/ruby-sig@lists.fedoraproject.org/message/LH6L6YJOYQT4Y5ZNOO4SLIPTUWZ5V45Q/ # For now, load the ABRT hook via this simple patch: -Patch6: ruby-2.7.0-Initialize-ABRT-hook.patch +# Patch6: ruby-2.7.0-Initialize-ABRT-hook.patch # Workaround "an invalid stdio handle" error on PPC, due to recently introduced # hardening features of glibc (rhbz#1361037). # https://bugs.ruby-lang.org/issues/12666 -Patch9: ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch +# Patch9: ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch # Revert commit which breaks bundled net-http-persistent version check. # https://github.com/drbrain/net-http-persistent/pull/109 -Patch10: ruby-2.7.0-Remove-RubyGems-dependency.patch +# Patch10: ruby-2.7.0-Remove-RubyGems-dependency.patch # Add support for .include directive used by OpenSSL config files. # https://github.com/ruby/openssl/pull/216 -Patch22: ruby-2.6.0-config-support-include-directive.patch +# Patch22: ruby-2.6.0-config-support-include-directive.patch # == FEDORA PATCHES ENDS == # operating_system.rb sets default_dir to user_dir for non root, this causes the build # to install gems into user dir @@ -257,7 +257,7 @@ #Patch20: ruby-2.3.0-Do-not-install-to-user-dir.patch # Upstream fix for popen_deadlock test missing -ldl -Patch30: ruby-2.7.0-Fix-linkage-of-popen_deadlock-test.patch +# Patch30: ruby-2.7.0-Fix-linkage-of-popen_deadlock-test.patch # Fix build with recent autoconf Patch50: ruby-2.7.1-autoconf-fix.patch @@ -594,6 +594,7 @@ %prep %setup -q -n ruby-%{rubyver} %autopatch -p1 +perl -i.llllkkk -p -E 's/\$\{[^\}]+\}//ms if m#\AAC_SUBST\(libdirname,#ms' configure.ac # Remove bundled libraries to be sure they are not used. rm -rf ext/psych/yaml @@ -602,6 +603,7 @@ %build autoreconf -vfi CFLAGS=`echo %optflags | sed 's/-fomit-frame-pointer//'` +export LDFLAGS=" -l dl " %configure --enable-shared --disable-rpath --enable-pthread \ --enable-multiarch \ --with-rubylibprefix='%{ruby_libdir}' \ @@ -624,6 +626,7 @@ --with-setjmp-type=setjmp \ %endif +perl -i -p -E 's/archlibdir/libdir/ if m#^\s*CONFIG\["libdirname"\]\s*=#' rbconfig.rb %make_build Q= %install
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 27009
: 11804