git: 8630a2a43b0b - main - x11-toolkits/swt: fix build with OpenJDK debug enabled
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 09 Nov 2022 18:57:01 UTC
The branch main has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=8630a2a43b0b883813694548fe5783f11ad7330f commit 8630a2a43b0b883813694548fe5783f11ad7330f Author: Max Brazhnikov <makc@FreeBSD.org> AuthorDate: 2022-11-09 18:56:22 +0000 Commit: Max Brazhnikov <makc@FreeBSD.org> CommitDate: 2022-11-09 18:56:22 +0000 x11-toolkits/swt: fix build with OpenJDK debug enabled PR: 265747 Submitted by: chadf at triularity.org --- x11-toolkits/swt/files/patch-build.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/x11-toolkits/swt/files/patch-build.sh b/x11-toolkits/swt/files/patch-build.sh index 19afc49f5095..e8c4eb342bfc 100644 --- a/x11-toolkits/swt/files/patch-build.sh +++ b/x11-toolkits/swt/files/patch-build.sh @@ -1,4 +1,4 @@ ---- build.sh.orig 2021-06-11 17:24:22 UTC +--- build.sh.orig 2021-09-06 06:22:24 UTC +++ build.sh @@ -72,7 +72,7 @@ echo -e "${RED}*** ${@}${NC}" @@ -62,7 +62,7 @@ export XLIB64 fi if [ ${MODEL} = 'ppc64le' ]; then -@@ -163,11 +171,13 @@ if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64le' -o ${ +@@ -163,18 +171,20 @@ if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64le' -o ${ export SWT_PTR_CFLAGS fi @@ -72,10 +72,18 @@ MAKE_CAIRO=make_cairo else func_echo_error "Cairo not found: Advanced graphics support using cairo will not be compiled." -+fi fi ++fi # Find AWT if available + if [ ${SWT_OS} = 'win32' ]; then + AWT_LIB_EXPR="jawt.dll" + else +- AWT_LIB_EXPR="libjawt.*" ++ AWT_LIB_EXPR="libjawt.so" + fi + + if [ -z "${AWT_LIB_PATH}" ]; then @@ -332,4 +342,4 @@ elif [ "${GTK_VERSION}" = "4.0" ]; then elif [ "${GTK_VERSION}" = "3.0" -o "${GTK_VERSION}" = "" ]; then export GTK_VERSION="3.0"