Romain Tartière 2022-05-30 18:12:48 -10:00
parent 757c569704
commit 89b8dcd9b0
No known key found for this signature in database
GPG Key ID: BA4D1D955112336F
3 changed files with 6 additions and 23 deletions

View File

@ -1,5 +1,5 @@
PORTNAME= opensearch-dashboards
DISTVERSION= 1.3.0
DISTVERSION= 2.0.0
DISTVERSIONSUFFIX= -linux-x64
CATEGORIES= textproc www
MASTER_SITES= https://artifacts.opensearch.org/releases/bundle/${PORTNAME}/${DISTVERSION}/
@ -42,7 +42,7 @@ post-patch:
do-configure:
(cd ${WRKSRC}/node_modules/re2 && \
${SETENV} HOME=${WRKDIR} \
${SETENV} HOME=${WRKDIR} PYTHONDONTWRITEBYTECODE=1 \
${LOCALBASE}/lib/node_modules/npm/bin/node-gyp-bin/node-gyp configure \
--python=${PYTHON_CMD} \
--nodedir ${LOCALBASE} \
@ -50,7 +50,7 @@ do-configure:
do-build:
(cd ${WRKSRC}/node_modules/re2 && \
${SETENV} HOME=${WRKDIR} \
${SETENV} HOME=${WRKDIR} PYTHONDONTWRITEBYTECODE=1 \
${LOCALBASE}/lib/node_modules/npm/bin/node-gyp-bin/node-gyp build \
--devdir=${_DEVDIR})
${RM} -r ${WRKSRC}/node_modules/re2/build/Release/.deps \

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1647637494
SHA256 (opensearch-dashboards-1.3.0-linux-x64.tar.gz) = b73e7862fe560125a96a82b91098cab1702d8519f61a301cd3cd936a6b51328e
SIZE (opensearch-dashboards-1.3.0-linux-x64.tar.gz) = 208745115
TIMESTAMP = 1653931629
SHA256 (opensearch-dashboards-2.0.0-linux-x64.tar.gz) = e2434659b02d9ee4502523198ac51f42f7b09845b0950986f4c2ff9e347fe474
SIZE (opensearch-dashboards-2.0.0-linux-x64.tar.gz) = 227494898

View File

@ -1,17 +0,0 @@
--- bin/opensearch-env.orig 2021-07-30 13:39:40 UTC
+++ bin/opensearch-env
@@ -40,13 +40,7 @@ if [ ! -z "$JAVA_HOME" ]; then
JAVA="$JAVA_HOME/bin/java"
JAVA_TYPE="JAVA_HOME"
else
- if [ "$(uname -s)" = "Darwin" ]; then
- # macOS has a different structure
- JAVA="$OPENSEARCH_HOME/jdk.app/Contents/Home/bin/java"
- else
- JAVA="$OPENSEARCH_HOME/jdk/bin/java"
- fi
- JAVA_TYPE="bundled jdk"
+ JAVA="/usr/local/bin/java"
fi
if [ ! -x "$JAVA" ]; then