diff --git a/projects/ruby-lang.org/package.yml b/projects/ruby-lang.org/package.yml index 6f068e293e..1e163fd699 100644 --- a/projects/ruby-lang.org/package.yml +++ b/projects/ruby-lang.org/package.yml @@ -26,7 +26,7 @@ build: script: - patch -p1 -F5 < props/mkconfig.rb.diff - - ./configure $ARGS + - CC=cc CXX=c++ ./configure $ARGS # clang17 doesn't like [[maybe_unused]] on types # fix cribbed from https://github.com/ruby/ruby/pull/4603/commits/fbdff085ef3c8a56e0a33404e8795879e3167549 @@ -79,10 +79,21 @@ build: # weirdly files get put here and we can't figure out how to stop it - run: | if test -d pkgconfig; then rm -rf pkgconfig; fi - mv *-{{hw.platform}}*/* . - rmdir *-{{hw.platform}}* + if test -d *-{{hw.platform}}* ; then + mv *-{{hw.platform}}*/* . + rmdir *-{{hw.platform}}* + fi working-directory: ${{prefix}}/lib if: '>=2.6' + - run: | + if test *-{{hw.platform}}*/bin/ruby ; then + unlink bin/ruby + mv *-{{hw.platform}}*/bin/ruby bin/ruby + rmdir *-{{hw.platform}}*/bin + rmdir *-{{hw.platform}}* + fi + working-directory: ${{prefix}} + if: '>=3.4' - run: sed -i -e 's|$(DESTDIR){{prefix}}|$(topdir)|g'