diff --git a/projects/ruby-lang.org/package.yml b/projects/ruby-lang.org/package.yml index 16c70350..dc018a5c 100644 --- a/projects/ruby-lang.org/package.yml +++ b/projects/ruby-lang.org/package.yml @@ -73,6 +73,11 @@ build: mv lib/*-{{hw.platform}}*/* lib rmdir lib/*-{{hw.platform}}* + sed -i.bak \ + -e 's|$(DESTDIR){{prefix}}|$(topdir)|g' \ + -e 's|CONFIG\["topdir"\] = .*|CONFIG\["topdir"\] = TOPDIR|g' \ + {{prefix}}/lib/ruby/{{version.marketing}}.0/rbconfig.rb + test: dependencies: tea.xyz/gx/cc: c99 # for native extensions diff --git a/projects/rubygems.org/package.yml b/projects/rubygems.org/package.yml index d92b508f..8eb9bac2 100644 --- a/projects/rubygems.org/package.yml +++ b/projects/rubygems.org/package.yml @@ -11,29 +11,30 @@ dependencies: build: dependencies: gnu.org/patch: '*' - script: | - ruby setup.rb --prefix={{prefix}} --env-shebang --no-ri --no-rdoc + script: + - ruby setup.rb --prefix={{prefix}} --env-shebang --no-ri --no-rdoc - mkdir {{prefix}}/shim - cp props/proxy {{prefix}}/shim + - working-directory: ${{prefix}}/shim + run: cp $SRCROOT/props/proxy . - cd "{{prefix}}" - patch -p1 < "$SRCROOT"/props/fit-n-finish.patch + - working-directory: ${{prefix}} + run: patch -p1 < "$SRCROOT"/props/fit-n-finish.patch - # these are provided by ruby-lang.org - # we don’t know why they turn up here too… - for x in rake rbs rdbg typeprof; do - rm {{prefix}}/bin/$x - done + - working-directory: ${{prefix}}/bin + # these are provided by ruby-lang.org + # we don’t know why they turn up here too… + run: rm rake rbs rdbg typeprof - # We’re not a “GEMHOME” since we *are* gem, so yeah instead - # we have a RUBYLIB hack via our proxy script - for x in bin/*; do - mv $x shim - ln shim/proxy $x - done + - working-directory: ${{prefix}}/bin + # We’re not a “GEMHOME” since we *are* gem, so yeah instead + # we have a RUBYLIB hack via our proxy script + run: | + for x in *; do + mv $x ../shim + ln -s ../shim/proxy $x + done - rmdir {{prefix}}/plugins + - rmdir {{prefix}}/plugins test: dependencies: @@ -41,15 +42,16 @@ test: tea.xyz/gx/make: '*' env: HOME: $PWD + vRUBY: ${{deps.ruby-lang.org.version.marketing}}.0 script: | gem install awesome_print ruby -e 'require "rubygems"' -e 'require "awesome_print"' -e'ap $LOAD_PATH' gem install hexapdf v="$(~/.local/bin/hexapdf version | cut -d' ' -f2)" - test -d ~/.gem/ruby/3.2.0/gems/hexapdf-$v #FIXME ruby version + test -d ~/.gem/ruby/$vRUBY/gems/hexapdf-$v #FIXME ruby version gem install bundle - test -d ~/.gem/ruby/{{version.marketing}}.0/gems/bundle-0.0.1 + test -d ~/.gem/ruby/{{deps.ruby-lang.org.version.marketing}}.0/gems/bundle-0.0.1 test -f ~/.local/bin/bundle ~/.local/bin/bundle --version @@ -57,7 +59,3 @@ provides: - bin/bundle - bin/bundler - bin/gem - - bin/rake - - bin/rbs - - bin/rdbg - - bin/typeprof