ruby: Update to 3.1.3
This commit is contained in:
parent
18b9680dfe
commit
7c62dcf137
@ -1,28 +1,28 @@
|
||||
--- src/ruby-2.5.0/configure.ac.orig 2016-12-17 02:48:58.000000000 -0500
|
||||
+++ src/ruby-2.5.0/configure.ac 2017-03-07 22:19:28.115668500 -0500
|
||||
@@ -3607,7 +3607,7 @@ else
|
||||
--- ruby-3.1.3/configure.ac.orig 2022-11-24 11:20:31.000000000 +0100
|
||||
+++ ruby-3.1.3/configure.ac 2022-12-04 06:32:29.964233300 +0100
|
||||
@@ -3198,7 +3198,7 @@
|
||||
[darwin*], [
|
||||
RUBY_APPEND_OPTION(XLDFLAGS, [-Wl,-u,_objc_msgSend])
|
||||
SOEXT=dylib
|
||||
DLEXT=bundle],
|
||||
- [cygwin*|mingw*|*djgpp*], [
|
||||
- [cygwin*|msys*|mingw*|*djgpp*], [
|
||||
+ [mingw*|*djgpp*], [
|
||||
LOAD_RELATIVE=1
|
||||
SOEXT=dll
|
||||
DLEXT=so],
|
||||
[
|
||||
@@ -3918,7 +3918,7 @@ AS_CASE("$enable_shared", [yes], [
|
||||
@@ -3529,7 +3529,7 @@
|
||||
[interix*], [
|
||||
LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
|
||||
],
|
||||
- [mingw*|cygwin*|mswin*], [
|
||||
- [cygwin*|msys*|mingw*|mswin*], [
|
||||
+ [mingw*|mswin*], [
|
||||
LIBRUBY_RELATIVE=yes
|
||||
])
|
||||
], [
|
||||
@@ -4336,7 +4336,7 @@ test "$program_suffix" != NONE &&
|
||||
@@ -3978,7 +3978,7 @@
|
||||
|
||||
RUBY_INSTALL_NAME="${ri_prefix}"'$(RUBY_BASE_NAME)'"${ri_suffix}"
|
||||
AS_CASE(["$target_os"],
|
||||
- [cygwin*|mingw*], [
|
||||
- [cygwin*|msys*|mingw*], [
|
||||
+ [mingw*], [
|
||||
RUBYW_INSTALL_NAME="${ri_prefix}"'$(RUBYW_BASE_NAME)'"${ri_suffix}"
|
||||
rubyw_install_name='$(RUBYW_INSTALL_NAME)'
|
||||
|
||||
11
ruby/3.1.3-rmdir-for-force-ln.patch
Normal file
11
ruby/3.1.3-rmdir-for-force-ln.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- ruby-3.1.3/tool/ln_sr.rb.orig 2022-12-04 06:53:40.359961100 +0100
|
||||
+++ ruby-3.1.3/tool/ln_sr.rb 2022-12-04 06:54:01.343228700 +0100
|
||||
@@ -57,7 +57,7 @@
|
||||
end
|
||||
fu_output_message "ln -s#{options} #{s} #{d}" if verbose
|
||||
next if noop
|
||||
- remove_file d, true if force
|
||||
+ FileUtils.remove_dir(d, true) if force
|
||||
File.symlink s, d
|
||||
end
|
||||
case srcs.size
|
||||
@ -1,27 +1,29 @@
|
||||
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
|
||||
|
||||
pkgname=('ruby' 'ruby-docs')
|
||||
pkgver=2.7.7
|
||||
pkgrel=2
|
||||
pkgver=3.1.3
|
||||
pkgrel=1
|
||||
arch=('i686' 'x86_64')
|
||||
url='https://www.ruby-lang.org/en/'
|
||||
license=('BSD' 'custom')
|
||||
makedepends=('openssl-devel' 'libffi-devel' 'doxygen' 'libcrypt-devel' 'gmp-devel' 'libyaml-devel' 'libgdbm-devel' 'libiconv-devel' 'libreadline-devel' 'zlib-devel' 'autotools' 'gcc')
|
||||
source=(https://cache.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2
|
||||
source=(https://cache.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.xz
|
||||
2.5.0-cygwin-configure.patch
|
||||
2.4.0-cygwin-rubygems.patch
|
||||
2.4.0-cygwin-compile.patch
|
||||
2.5.0-pkgconfig-version.patch
|
||||
gemrc
|
||||
2.7.7-msys2.patch)
|
||||
sha256sums=('cf800820c9e69cdd31a8cdab920391f74ed935db2397a905afabd48961913658'
|
||||
'2f5eec5a7835b63fd1f0fb2af6a6a42e9bba1ee06fee35e4eafb0c5ad5fbfd03'
|
||||
2.7.7-msys2.patch
|
||||
3.1.3-rmdir-for-force-ln.patch)
|
||||
sha256sums=('4ee161939826bcdfdafa757cf8e293a7f14e357f62be7144f040335cc8c7371a'
|
||||
'14bc6cb41d610d820a327bb9eeffb8c320f90dda1fdee1449a1b999de09dd1c9'
|
||||
'01a59cbfffa98eeca6b66f2f179474793dbb6ec32063d717a24e5ca03f28d767'
|
||||
'5fffe4fa469721bfe271650dae142c5a0274c22705e4be01541371d74a5de23d'
|
||||
'ee88cfec3610b21908a8c0725b43b4d1157ec394179489dd9c86309b1f663e4b'
|
||||
'4bb7eb2fe66e396ed16b589cdb656831407b39ad4e138d88536754c0448ac614'
|
||||
'a4ec80d3da58969068112a26cc2a40eee0c6052ac61d789a84b6e5d74ef9246a')
|
||||
noextract=(ruby-${pkgver}.tar.bz2)
|
||||
'a4ec80d3da58969068112a26cc2a40eee0c6052ac61d789a84b6e5d74ef9246a'
|
||||
'd37409413b40e560a9d0e8977e711a6f47e7e92ef8dea8b85dee7e7784a47524')
|
||||
noextract=(ruby-${pkgver}.tar.xz)
|
||||
|
||||
# Helper macros to help make tasks easier #
|
||||
apply_patch_with_msg() {
|
||||
@ -48,15 +50,18 @@ del_file_exists() {
|
||||
|
||||
prepare() {
|
||||
[[ -d ${srcdir}/ruby-${pkgver} ]] && rm -rf ${srcdir}/ruby-${pkgver}
|
||||
tar -xjf ${srcdir}/ruby-${pkgver}.tar.bz2 -C ${srcdir} || true
|
||||
tar -xf ${srcdir}/ruby-${pkgver}.tar.xz -C ${srcdir} || true
|
||||
|
||||
cd ${srcdir}/ruby-${pkgver//_/-}
|
||||
apply_patch_with_msg_p2 2.5.0-cygwin-configure.patch
|
||||
apply_patch_with_msg 2.5.0-cygwin-configure.patch
|
||||
apply_patch_with_msg_p2 2.4.0-cygwin-rubygems.patch
|
||||
apply_patch_with_msg_p2 2.4.0-cygwin-compile.patch
|
||||
apply_patch_with_msg 2.5.0-pkgconfig-version.patch
|
||||
apply_patch_with_msg 2.7.7-msys2.patch
|
||||
|
||||
# the script assumes that symlinks are files, but we deepcopy
|
||||
apply_patch_with_msg 3.1.3-rmdir-for-force-ln.patch
|
||||
|
||||
autoreconf -fi
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user