fix(openjdk)

This commit is contained in:
Jacob Heider 2023-10-27 13:34:14 -04:00 committed by Jacob Heider
parent 64305b2c0f
commit e190b57539

View file

@ -40,21 +40,26 @@ runtime:
build: build:
dependencies: dependencies:
linux: linux:
gnu.org/gcc: '*' llvm.org: <17
gnu.org/make: '*' gnu.org/make: '*'
gnu.org/autoconf: '*' gnu.org/autoconf: '*'
freedesktop.org/pkg-config: '*' freedesktop.org/pkg-config: '*'
gnu.org/wget: '*' gnu.org/wget: '*'
script: script:
- run: wget -c $BOOT_JDK -O - | tar xz -C . --strip-components=$STRIP - run: wget -c $BOOT_JDK -O - | tar xz -C . --strip-components=$STRIP
working-directory: boot-jdk working-directory: boot-jdk
# autoconf won't find llvm-cxxfilt for c++filt, and won't take an envvar
- run: | - run: |
bash configure $ARGS \ sed -i.bak -e's/c..filt/llvm-cxxfilt/' toolchain.m4
--with-boot-jdk="$BOOT_JDK_DIR" \ rm toolchain.m4.bak
--with-vendor-version-string="$(tea --version | grep -o '[0-9]\+\.[0-9]\+\.[0-9]\+')" \ working-directory: make/autoconf
--with-extra-cflags="$CFLAGS" \ if: linux
--with-extra-cxxflags="$CXXFLAGS" \ - bash configure $ARGS
--with-extra-ldflags="$LDFLAGS" --with-boot-jdk="$BOOT_JDK_DIR"
--with-vendor-version-string="$(tea --version | grep -o '[0-9]\+\.[0-9]\+\.[0-9]\+')"
--with-extra-cflags="$CFLAGS"
--with-extra-cxxflags="$CXXFLAGS"
--with-extra-ldflags="$LDFLAGS"
- make images - make images
- mkdir -p {{prefix}} - mkdir -p {{prefix}}
- mv $JDK_DIR {{prefix}}/ - mv $JDK_DIR {{prefix}}/