Skip to content

Commit

Permalink
attempt 3.3.3 (#127)
Browse files Browse the repository at this point in the history
automerged PR by conda-forge/automerge-action
  • Loading branch information
github-actions[bot] authored Jun 28, 2024
2 parents 70a43bc + add651c commit 05d7453
Show file tree
Hide file tree
Showing 12 changed files with 31 additions and 168 deletions.
2 changes: 2 additions & 0 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ openssl:
- '3'
readline:
- '8'
rust_compiler:
- rust
target_platform:
- linux-64
zip_keys:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ openssl:
- '3'
readline:
- '8'
rust_compiler:
- rust
target_platform:
- linux-aarch64
zip_keys:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ openssl:
- '3'
readline:
- '8'
rust_compiler:
- rust
target_platform:
- linux-ppc64le
zip_keys:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ openssl:
- '3'
readline:
- '8'
rust_compiler:
- rust
target_platform:
- osx-64
zip_keys:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ openssl:
- '3'
readline:
- '8'
rust_compiler:
- rust
target_platform:
- osx-arm64
zip_keys:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ libffi:
- '3.4'
openssl:
- '3'
rust_compiler:
- rust
target_platform:
- win-64
zlib:
Expand Down
24 changes: 0 additions & 24 deletions recipe/0001-Dont-t-add-SDKROOT-to-vals.patch

This file was deleted.

42 changes: 10 additions & 32 deletions recipe/build.sh
Original file line number Diff line number Diff line change
@@ -1,49 +1,27 @@
#!/bin/bash
# Get an updated config.sub and config.guess
cp $BUILD_PREFIX/share/gnuconfig/config.* ./tool
set -e
set -x

# Get an updated config.sub and config.guess
cp $BUILD_PREFIX/share/gnuconfig/config.* ./tool

# install an old version of ruby
mamba install "ruby=3.2.*" --yes

# We don't want to leak the $BUILD_PREFIX into the final output
export CC=$(basename $CC)
export CPP=$(basename $CPP)
export CXX=$(basename $CXX)
export STRIP=$(basename $STRIP)
export NM=$(basename $NM)
export OBJDUMP=$(basename $OBJDUMP)
export AS=$(basename $AS)
export AR=$(basename $AR)
export RANLIB=$(basename $RANLIB)
export LD=$(basename $LD)

if [[ "$CONDA_BUILD_CROSS_COMPILATION" == 1 ]]; then
(
mkdir -p build-host
pushd build-host

export CC=$CC_FOR_BUILD
export CXX=$CXX_FOR_BUILD
export LDFLAGS=${LDFLAGS//$PREFIX/$BUILD_PREFIX}

# Unset them as we're ok with builds that are either slow or non-portable
unset CFLAGS
unset CXXFLAGS

# --enable-shared \
../configure \
--host=$BUILD \
--prefix="$BUILD_PREFIX" \
--disable-install-doc \
--enable-load-relative \
--with-libffi-dir="$BUILD_PREFIX" \
--with-libyaml-dir="$BUILD_PREFIX" \
--with-openssl-dir="$BUILD_PREFIX" \
--with-readline-dir="$BUILD_PREFIX" \
--with-zlib-dir="$BUILD_PREFIX"

make -j ${CPU_COUNT}
make install
)
fi
# we have to use `llvm-nm` instead of `nm` for the ruby build
# because of the Rust YJIT dependency
export NM=llvm-nm

autoconf

Expand Down
19 changes: 0 additions & 19 deletions recipe/disable-backtrace-with-lines.patch

This file was deleted.

25 changes: 0 additions & 25 deletions recipe/fix-isinf-redefinition-msvc.patch

This file was deleted.

32 changes: 9 additions & 23 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set name = "ruby" %}
{% set version = "3.2.2" %}
{% set version = "3.3.3" %}
{% set major_minor = '.'.join(version.split('.')[0:2]) %}

package:
Expand All @@ -8,53 +8,39 @@ package:

source:
url: https://cache.ruby-lang.org/pub/ruby/{{ major_minor }}/ruby-{{ version }}.tar.gz
sha256: 96c57558871a6748de5bc9f274e93f4b5aad06cd8f37befa0e8d94e7b8a423bc
patches:
# Patches/work-arounds for passing make check
- disable-backtrace-with-lines.patch
- fix-isinf-redefinition-msvc.patch # [win]
- 0001-Dont-t-add-SDKROOT-to-vals.patch
sha256: 83c05b2177ee9c335b631b29b8c077b4770166d02fa527f3a9f6a40d13f3cce2

build:
number: 2
number: 0
track_features:
- rb{{ major_minor | replace(".", "") }}
run_exports:
- {{ pin_subpackage(name, max_pin='x.x') }}
ignore_run_exports:
ignore_run_exports_from:
# We need CXX during build time to generate rbconfig.rb
- libstdcxx-ng
- {{ compiler('cxx') }}

requirements:
build:
- gnuconfig # [unix]
- {{ compiler('c') }}
- {{ compiler('cxx') }}
- {{ stdlib("c") }}
- {{ compiler("rust") }}
- autoconf # [unix]
- automake # [unix]
- make # [unix]
- pkg-config
# We need all host deps also in build for cross-compiling
- gettext # [build_platform != target_platform]
- gmp # [build_platform != target_platform]
- libffi # [build_platform != target_platform]
- libxcrypt # [build_platform != target_platform]
- ncurses # [build_platform != target_platform]
- openssl # [build_platform != target_platform]
- readline # [build_platform != target_platform]
- yaml # [build_platform != target_platform]
- zlib # [build_platform != target_platform]
host:
- gdbm # [x86 and unix]
- gettext # [osx]
- gmp # [unix]
- libffi
- libxcrypt # [linux]
- ncurses # [unix]
- openssl
- readline # [unix]
- yaml # [unix or win]
- gmp # [unix]
- openssl
- yaml
- zlib
run:
- gettext # [osx]
Expand Down
45 changes: 0 additions & 45 deletions recipe/undo-libtool.patch

This file was deleted.

0 comments on commit 05d7453

Please sign in to comment.