openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-17 23:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

adjust handling of erlang's -wx subpackage. it doesn't actually build on

Browse Source 
machines that don't have wxWidgets,-webview, so disable wx completely on
those archs, rather than try to build it without webview present (which
fails).

this both fixes the build, and allows DPB to attempt to build erlang (it
was previously disabling it due to webkitgtk4 not being available, for
some reason).

ok volker
This commit is contained in:
sthen
2026-06-15 15:02:30 +00:00
parent be21d7b368
commit 9b74985bb1
4 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/erlang/26/Makefile
+8 -6
View File
@@ -1,4 +1,5 @@
BROKEN-alpha= beam/erl_process.c:6692: internal compiler error: in final_scan_insn, at final.c:2449
NOT_FOR_ARCHS-wx= alpha arm hppa i386
USE_NOBTCFI= Yes
USE_WXNEEDED= Yes
@@ -43,17 +44,12 @@ WANTLIB-main = ${WANTLIB} c crypto kvm curses util z
WANTLIB-wx += ${WANTLIB} GL GLU
WANTLIB-wx += wx_baseu-3.2 wx_baseu_xml-3.2 wx_gtk3u_aui-3.2
WANTLIB-wx += wx_gtk3u_core-3.2 wx_gtk3u_gl-3.2 wx_gtk3u_html-3.2
WANTLIB-wx += wx_gtk3u_stc-3.2 wx_gtk3u_xrc-3.2
WANTLIB-wx += wx_gtk3u_stc-3.2 wx_gtk3u_webview-3.2 wx_gtk3u_xrc-3.2
WANTLIB-wx += glib-2.0 intl
LIB_DEPENDS-wx +=x11/wxWidgets>=2.8.12p10
LIB_DEPENDS-wx +=devel/glib2
.if ${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "arm" \
&& ${MACHINE_ARCH} != "hppa" && ${MACHINE_ARCH} != "i386"
LIB_DEPENDS-wx +=x11/wxWidgets,-webview
WANTLIB-wx += wx_gtk3u_webview-3.2
.endif
RUN_DEPENDS-wx =${BASE_PKGPATH},-main>=${MAJ_V}
@@ -105,4 +101,10 @@ WX_VSN 2.4.1.1 \
XMERL_VSN 1.3.34.3 \
ERTS_VSN 14.2.5.15
.include <bsd.port.arch.mk>
.if !${BUILD_PACKAGES:M-wx}
CONFIGURE_ARGS += --without-wx
.endif
.include <bsd.port.mk>
lang/erlang/27/Makefile
+8 -6
View File
@@ -1,4 +1,5 @@
BROKEN-alpha= beam/erl_process.c:6692: internal compiler error: in final_scan_insn, at final.c:2449
NOT_FOR_ARCHS-wx= alpha arm hppa i386
USE_NOBTCFI= Yes
USE_WXNEEDED= Yes
@@ -42,17 +43,12 @@ WANTLIB-main = ${WANTLIB} c crypto kvm curses util z
WANTLIB-wx += ${WANTLIB} GL GLU
WANTLIB-wx += wx_baseu-3.2 wx_baseu_xml-3.2 wx_gtk3u_aui-3.2
WANTLIB-wx += wx_gtk3u_core-3.2 wx_gtk3u_gl-3.2 wx_gtk3u_html-3.2
WANTLIB-wx += wx_gtk3u_stc-3.2 wx_gtk3u_xrc-3.2
WANTLIB-wx += wx_gtk3u_stc-3.2 wx_gtk3u_webview-3.2 wx_gtk3u_xrc-3.2
WANTLIB-wx += glib-2.0 intl
LIB_DEPENDS-wx +=x11/wxWidgets>=2.8.12p10
LIB_DEPENDS-wx +=devel/glib2
.if ${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "arm" \
&& ${MACHINE_ARCH} != "hppa" && ${MACHINE_ARCH} != "i386"
LIB_DEPENDS-wx +=x11/wxWidgets,-webview
WANTLIB-wx += wx_gtk3u_webview-3.2
.endif
RUN_DEPENDS-wx =${BASE_PKGPATH},-main>=${MAJ_V}
@@ -104,4 +100,10 @@ WX_VSN 2.4.3.1 \
XMERL_VSN 2.1.3.3 \
ERTS_VSN 15.2.7.9
.include <bsd.port.arch.mk>
.if !${BUILD_PACKAGES:M-wx}
CONFIGURE_ARGS += --without-wx
.endif
.include <bsd.port.mk>
lang/erlang/28/Makefile
+9 -7
View File
@@ -1,4 +1,5 @@
BROKEN-alpha= beam/erl_process.c:6692: internal compiler error: in final_scan_insn, at final.c:2449
NOT_FOR_ARCHS-wx= alpha arm hppa i386
USE_NOBTCFI= Yes
USE_WXNEEDED= Yes
@@ -42,16 +43,11 @@ WANTLIB-main += ${WANTLIB} c crypto curses util z
WANTLIB-wx += ${WANTLIB}
WANTLIB-wx += GLU glib-2.0 wx_baseu-3.2 wx_gtk3u_aui-3.2 wx_gtk3u_core-3.2
WANTLIB-wx += wx_gtk3u_gl-3.2 wx_gtk3u_html-3.2 wx_gtk3u_stc-3.2
WANTLIB-wx += wx_gtk3u_xrc-3.2
WANTLIB-wx += wx_gtk3u_webview-3.2 wx_gtk3u_xrc-3.2
LIB_DEPENDS-wx +=x11/wxWidgets>=2.8.12p10
LIB_DEPENDS-wx +=devel/glib2
.if ${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "arm" \
&& ${MACHINE_ARCH} != "hppa" && ${MACHINE_ARCH} != "i386"
LIB_DEPENDS-wx +=x11/wxWidgets,-webview
WANTLIB-wx += wx_gtk3u_webview-3.2
.endif
LIB_DEPENDS-wx +=devel/glib2
RUN_DEPENDS-wx =${BASE_PKGPATH},-main>=${MAJ_V}
@@ -100,4 +96,10 @@ WX_VSN 2.5.4.1 \
XMERL_VSN 2.1.9 \
ERTS_VSN 16.4.0.2
.include <bsd.port.arch.mk>
.if !${BUILD_PACKAGES:M-wx}
CONFIGURE_ARGS += --without-wx
.endif
.include <bsd.port.mk>
lang/erlang/29/Makefile
+8 -6
View File
@@ -1,4 +1,5 @@
BROKEN-alpha= beam/erl_process.c:6692: internal compiler error: in final_scan_insn, at final.c:2449
NOT_FOR_ARCHS-wx= alpha arm hppa i386
USE_NOBTCFI= Yes
USE_WXNEEDED= Yes
@@ -41,16 +42,11 @@ WANTLIB-main += ${WANTLIB} c crypto curses util z
WANTLIB-wx += ${WANTLIB}
WANTLIB-wx += GLU glib-2.0 wx_baseu-3.2 wx_gtk3u_aui-3.2 wx_gtk3u_core-3.2
WANTLIB-wx += wx_gtk3u_gl-3.2 wx_gtk3u_html-3.2 wx_gtk3u_stc-3.2
WANTLIB-wx += wx_gtk3u_xrc-3.2
WANTLIB-wx += wx_gtk3u_webview-3.2 wx_gtk3u_xrc-3.2
LIB_DEPENDS-wx +=x11/wxWidgets
LIB_DEPENDS-wx +=devel/glib2
.if ${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "arm" \
&& ${MACHINE_ARCH} != "hppa" && ${MACHINE_ARCH} != "i386"
LIB_DEPENDS-wx +=x11/wxWidgets,-webview
WANTLIB-wx += wx_gtk3u_webview-3.2
.endif
RUN_DEPENDS-wx =${BASE_PKGPATH},-main>=${MAJ_V}
@@ -99,4 +95,10 @@ WX_VSN 2.6 \
XMERL_VSN 2.2 \
ERTS_VSN 17.0.2
.include <bsd.port.arch.mk>
.if !${BUILD_PACKAGES:M-wx}
CONFIGURE_ARGS += --without-wx
.endif
.include <bsd.port.mk>