mirror of
https://github.com/ivabus/pantry
synced 2024-11-22 08:25:07 +03:00
fix(opensearch): don't include the jna library on mac for x86-64 (#4847)
* fix(opensearch): don't include the jna library on mac for x86-64 there seems to be some linker issue with loading libc. calling these native functions doesn't seem strictly necessary. maybe better that the package works at all. in macos 13 and later, it works fine, so maybe this workaround could be removed when macos 12 is no longer supported * fix(opensearch): remove some windows-only code that is breaking * fix(opensearch): err, that was in the wrong spot
This commit is contained in:
parent
ca17ab65c1
commit
94618b6182
1 changed files with 11 additions and 0 deletions
|
@ -24,9 +24,20 @@ build:
|
||||||
openblas.net: "*"
|
openblas.net: "*"
|
||||||
|
|
||||||
script:
|
script:
|
||||||
|
# there seems to be a loader bug with trying to dlopen libc on macos 12 and earlier.
|
||||||
|
# remove this step when macos 12 and under are no longer supported.
|
||||||
|
- run: |
|
||||||
|
sed -i 's|JNAKernel32Library.getInstance();|//JNAKernel32Library.getInstance();|' server/src/main/java/org/opensearch/bootstrap/Bootstrap.java
|
||||||
|
if: darwin/x86-64
|
||||||
- gradle -Dbuild.snapshot=false ":distribution:archives:no-jdk-{{hw.platform}}-tar:assemble"
|
- gradle -Dbuild.snapshot=false ":distribution:archives:no-jdk-{{hw.platform}}-tar:assemble"
|
||||||
- run: tar --strip-components=1 -xf $SRCROOT/distribution/archives/no-jdk-{{hw.platform}}-tar/build/distributions/opensearch-*.tar.gz
|
- run: tar --strip-components=1 -xf $SRCROOT/distribution/archives/no-jdk-{{hw.platform}}-tar/build/distributions/opensearch-*.tar.gz
|
||||||
working-directory: ${{prefix}}
|
working-directory: ${{prefix}}
|
||||||
|
# there seems to be a loader bug with trying to dlopen libc on macos 12 and earlier.
|
||||||
|
# remove this step when macos 12 and under are no longer supported.
|
||||||
|
- run: |
|
||||||
|
rm -f lib/jna-*.jar
|
||||||
|
if: darwin/x86-64
|
||||||
|
working-directory: ${{prefix}}
|
||||||
- run: 'sed -i "s|#\s*cluster.name: .*|cluster.name: opensearch_pkgx|" opensearch.yml'
|
- run: 'sed -i "s|#\s*cluster.name: .*|cluster.name: opensearch_pkgx|" opensearch.yml'
|
||||||
working-directory: ${{prefix}}/config
|
working-directory: ${{prefix}}/config
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue