From 6b7215ed565227c44149653d021ea844b12e3e4d Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Tue, 19 Nov 2024 17:30:56 +0000 Subject: [PATCH] */*: use USES=sbrk Replace various BROKEN entries for missing sbrk on aarch64 and risc64 with USES=sbrk. Fix a few missing entries (generally ports blocked by other dependences). Approved by: portmgr (mat in D47258 comment) Differential Revision: https://reviews.freebsd.org/D47259 --- cad/graywolf/Makefile | 4 +--- cad/spice/Makefile | 5 ++--- devel/llbuild/Makefile | 5 +---- devel/smv/Makefile | 2 +- editors/2bsd-vi/Makefile | 5 +---- graphics/opendx/Makefile | 4 +--- lang/gnu-apl/Makefile | 5 +---- lang/picoc/Makefile | 5 +---- lang/smalltalk/Makefile | 3 +-- security/samhain/Makefile | 4 +--- shells/44bsd-csh/Makefile | 5 +---- shells/ast-ksh/Makefile | 3 +-- shells/heirloom-sh/Makefile | 5 +---- shells/v7sh/Makefile | 5 +---- sysutils/bacula13-client-static/Makefile | 4 ++-- sysutils/cdrkit/Makefile | 2 +- sysutils/genisoimage/Makefile | 3 --- 17 files changed, 18 insertions(+), 51 deletions(-) diff --git a/cad/graywolf/Makefile b/cad/graywolf/Makefile index de5ea9acd9d8..a569d362b8b2 100644 --- a/cad/graywolf/Makefile +++ b/cad/graywolf/Makefile @@ -19,13 +19,11 @@ WWW= https://github.com/rubund/graywolf LICENSE= GPLv2 -BROKEN_aarch64= Fails to link: missing sbrk - LIB_DEPENDS= libgsl.so:math/gsl TEST_DEPENDS= bash:shells/bash \ rsync:net/rsync -USES= cmake compiler:c11 pkgconfig shebangfix xorg +USES= cmake compiler:c11 pkgconfig sbrk shebangfix xorg USE_XORG= ice sm x11 xext USE_LDCONFIG= yes diff --git a/cad/spice/Makefile b/cad/spice/Makefile index 73b9bc26f9f0..77c2f99f7aaf 100644 --- a/cad/spice/Makefile +++ b/cad/spice/Makefile @@ -20,9 +20,6 @@ WWW= http://bwrc.eecs.berkeley.edu/Classes/IcBook/SPICE/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYRIGHT -BROKEN_aarch64= Fails to link: missing sbrk -BROKEN_riscv64= Fails to link: missing sbrk - WRKSRC= ${WRKDIR}/${PORTNAME}3f5 MAKEFILE= ${FILESDIR}/Makefile CONFIGURE_ENV= CONFIGFILE="${CONFIGFILE}" \ @@ -38,6 +35,8 @@ PORTEXAMPLES= bjtnoise.cir bsim1tst.cir bsim2tst.cir diffpair.cir \ process.pro pz2.cir pzt.cir rc.cir rca3040.cir resnoise.cir \ rtlinv.cir schmitt.cir simplepz.cir +USES= sbrk + OPTIONS_DEFINE= DOCS EXAMPLES X11 DEV_BSIM3 DEV_BSIM4 DEV_HISIM2 OPTIONS_DEFAULT=X11 diff --git a/devel/llbuild/Makefile b/devel/llbuild/Makefile index 870284c3092a..2d3579b82fb5 100644 --- a/devel/llbuild/Makefile +++ b/devel/llbuild/Makefile @@ -12,12 +12,9 @@ LICENSE= APACHE20 BSD3CLAUSE NCSA LICENSE_COMB= multi LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE.txt -BROKEN_aarch64= fails to link: undefined symbol: sbrk -BROKEN_riscv64= fails to link: undefined symbol: sbrk - LIB_DEPENDS= libsqlite3.so:databases/sqlite3 -USES= cmake +USES= cmake sbrk USE_GITHUB= yes GH_ACCOUNT= apple diff --git a/devel/smv/Makefile b/devel/smv/Makefile index b2e9e0845db1..0a53603da2e2 100644 --- a/devel/smv/Makefile +++ b/devel/smv/Makefile @@ -9,10 +9,10 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Symbolic Model Verifier System for checking finite state systems WWW= https://www.cs.cmu.edu/~modelcheck/smv.html -BROKEN_aarch64= fails to build: undefined reference to sbrk BROKEN_armv6= fails to build: error: non-void function check_bdd should return a value BROKEN_armv7= fails to build: error: non-void function check_bdd should return a value +USES= sbrk USE_GCC= yes WRKSRC= ${WRKDIR}/${PORTNAME} ALL_TARGET= ${PORTNAME} diff --git a/editors/2bsd-vi/Makefile b/editors/2bsd-vi/Makefile index 907b13b69b0f..4cdb068110f4 100644 --- a/editors/2bsd-vi/Makefile +++ b/editors/2bsd-vi/Makefile @@ -13,10 +13,7 @@ WWW= https://ex-vi.sourceforge.net/ LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_aarch64= Fails to link: missing sbrk -BROKEN_riscv64= Fails to link: missing sbrk - -USES= ncurses tar:bzip2 +USES= ncurses sbrk tar:bzip2 PRESERVEDIR= /var/preserve/${PKGBASE} PLIST_SUB= PRESERVEDIR="${PRESERVEDIR}" diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile index a8e1ccdb194b..d4207d76853a 100644 --- a/graphics/opendx/Makefile +++ b/graphics/opendx/Makefile @@ -14,12 +14,10 @@ LICENSE_NAME= IBM PUBLIC LICENSE - Open Visualization Data Explorer VERSION 1.0 LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BROKEN_aarch64= fails to link: undefined symbol: sbrk - LIB_DEPENDS= libtiff.so:graphics/tiff \ libcdf.so:science/cdf -USES= bison compiler:c++17-lang gl gmake libtool localbase:ldflags magick:6 motif xorg +USES= bison compiler:c++17-lang gl gmake libtool localbase:ldflags magick:6 motif sbrk xorg USE_GL= gl glu USE_LDCONFIG= yes USE_XORG= x11 xt xinerama xext xpm xmu sm ice diff --git a/lang/gnu-apl/Makefile b/lang/gnu-apl/Makefile index 4974d6d5dd40..95093e3f0f22 100644 --- a/lang/gnu-apl/Makefile +++ b/lang/gnu-apl/Makefile @@ -11,13 +11,10 @@ WWW= https://www.gnu.org/software/apl/ LICENSE= GPLv3+ -BROKEN_aarch64= Fails to link: missing sbrk -BROKEN_riscv64= Fails to link: missing sbrk - # XXX: should be optional, but no way to disable in the configure script LIB_DEPENDS= libfftw3.so:math/fftw3 -USES= compiler:c++11-lang gmake libtool localbase +USES= compiler:c++11-lang gmake libtool localbase sbrk GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ENV= CXX_WERROR=no diff --git a/lang/picoc/Makefile b/lang/picoc/Makefile index d9d67d773fa0..2a32cc6fa1eb 100644 --- a/lang/picoc/Makefile +++ b/lang/picoc/Makefile @@ -9,14 +9,11 @@ WWW= https://gitlab.com/zsaleeba/picoc LICENSE= BSD3CLAUSE -BROKEN_aarch64= Fails to link: missing sbrk -BROKEN_riscv64= Fails to link: missing sbrk - USE_GITLAB= yes GL_ACCOUNT= zsaleeba GL_TAGNAME= dc85a51e9211cfb644f0a85ea9546e15dc1141c3 -USES= cpe gmake readline +USES= cpe gmake readline sbrk CPE_VENDOR= ${PORTNAME}_project PLIST_FILES= bin/picoc diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile index 9a0953b590d1..115a64688579 100644 --- a/lang/smalltalk/Makefile +++ b/lang/smalltalk/Makefile @@ -11,7 +11,6 @@ WWW= https://smalltalk.gnu.org/ LICENSE= GPLv2+ BROKEN_powerpc64= Fails to build: gst-package: did not understand #~ -BROKEN_riscv64= Fails to link: undefined reference to sbrk BUILD_DEPENDS= zip:archivers/zip \ gawk:lang/gawk @@ -22,7 +21,7 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \ libltdl.so:devel/libltdl USES= gl gmake gnome iconv libtool makeinfo pathfix pkgconfig \ - readline shebangfix sqlite tar:xz xorg + readline sbrk shebangfix sqlite tar:xz xorg USE_GL= gl glu glut USE_GNOME= cairo USE_XORG= ice sm x11 xi diff --git a/security/samhain/Makefile b/security/samhain/Makefile index 519e883bf4a7..6638f656c070 100644 --- a/security/samhain/Makefile +++ b/security/samhain/Makefile @@ -11,12 +11,10 @@ WWW= https://la-samhna.de/samhain/ LICENSE= GPLv2 -BROKEN_aarch64= fails to link: missing sbrk BROKEN_mips= fails to configure: error: Could not find the libwrap library BROKEN_mips64= fails to configure: error: Could not find the libwrap library -BROKEN_riscv64= fails to link: missing sbrk -USES= shebangfix +USES= sbrk shebangfix SHEBANG_FILES= scripts/samhainadmin-gpg.pl.in \ scripts/samhainadmin-sig.pl.in diff --git a/shells/44bsd-csh/Makefile b/shells/44bsd-csh/Makefile index 6ad2e33fad9f..51dbcc217d66 100644 --- a/shells/44bsd-csh/Makefile +++ b/shells/44bsd-csh/Makefile @@ -7,12 +7,9 @@ MASTER_SITES= LOCAL/cy MAINTAINER= cy@FreeBSD.org COMMENT= The traditional 4.4BSD /bin/csh C-shell -BROKEN_aarch64= Fails to link: missing sbrk -BROKEN_riscv64= Fails to link: missing sbrk - EXTRACT_DEPENDS= rcs:devel/rcs57 -USES= tar:bzip2 +USES= sbrk tar:bzip2 LDFLAGS= -Wl,--allow-multiple-definition NO_WRKSUBDIR= yes PORTDOCS= paper.ascii.gz diff --git a/shells/ast-ksh/Makefile b/shells/ast-ksh/Makefile index 2c1669929a60..e9217d3dc6b6 100644 --- a/shells/ast-ksh/Makefile +++ b/shells/ast-ksh/Makefile @@ -20,12 +20,11 @@ WWW= http://www.kornshell.com/ LICENSE= EPL -BROKEN_aarch64= Fails to compile: needs sbrk BROKEN_riscv64= Fails to compile: ast-ksh93v/src/lib/libast/hash/hashalloc.c:162:4: non-const lvalue reference to type '__builtin_va_list' cannot bind to a temporary of type 'va_list' BROKEN_FreeBSD_14= Fails to compile: error: incompatible function pointer types assigning to 'int (*)(wchar_t *, const char *, size_t)' (aka 'int (*)(int *, const char *, unsigned long)') from 'size_t (wchar_t *, const char *, size_t)' (aka 'unsigned long (int *, const char *, unsigned long)') [-Wincompatible-function-pointer-types] BROKEN_FreeBSD_15= ${BROKEN_FreeBSD_14} -USES= compiler:c11 +USES= compiler:c11 sbrk USE_GITHUB= yes GH_ACCOUNT= att diff --git a/shells/heirloom-sh/Makefile b/shells/heirloom-sh/Makefile index c97dc2bc7ace..f989f5f8ebdc 100644 --- a/shells/heirloom-sh/Makefile +++ b/shells/heirloom-sh/Makefile @@ -10,10 +10,7 @@ WWW= https://heirloom.sourceforge.net/sh.html LICENSE= CDDL -BROKEN_aarch64= fails to link: missing sbrk -BROKEN_riscv64= fails to link: missing sbrk - -USES= tar:bzip2 +USES= sbrk tar:bzip2 MAKEFILE= makefile MAKE_ARGS= ROOT=${STAGEDIR} \ diff --git a/shells/v7sh/Makefile b/shells/v7sh/Makefile index e417a12dc4ba..df5c8a792ef3 100644 --- a/shells/v7sh/Makefile +++ b/shells/v7sh/Makefile @@ -15,10 +15,7 @@ MAINTAINER= portmaster@BSDforge.com COMMENT= Implementation of the UNIX 7th Edition shell WWW= http://minnie.tuhs.org/UnixTree/V7/ -BROKEN_aarch64= Fails to link: missing sbrk -BROKEN_riscv64= Fails to link: missing sbrk - -USES= uidfix +USES= sbrk uidfix EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= EXTRACT_AFTER_ARGS= ${WRKSRC} diff --git a/sysutils/bacula13-client-static/Makefile b/sysutils/bacula13-client-static/Makefile index ef209ac76d29..78d3886af0f9 100644 --- a/sysutils/bacula13-client-static/Makefile +++ b/sysutils/bacula13-client-static/Makefile @@ -3,10 +3,10 @@ PKGNAMESUFFIX= 13-client-static COMMENT= Network backup solution (static client) -BROKEN_aarch64= Fails to link: missing sbrk -BROKEN_riscv64= Fails to link: missing sbrk BROKEN_SSL= libressl +USES= sbrk + WITH_CLIENT_ONLY= yes PLIST= ${.CURDIR}/pkg-plist MASTERDIR= ${.CURDIR}/../../sysutils/bacula13-server diff --git a/sysutils/cdrkit/Makefile b/sysutils/cdrkit/Makefile index 55165be1855e..74ed7ac859bb 100644 --- a/sysutils/cdrkit/Makefile +++ b/sysutils/cdrkit/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv2+ RUN_DEPENDS?= ${PORTNAME}-genisoimage>0:sysutils/genisoimage -USES= cmake iconv perl5 shebangfix +USES= cmake iconv perl5 sbrk shebangfix USE_PERL5= run SHEBANG_FILES= 3rd-party/dirsplit/dirsplit # Fix build with clang11 diff --git a/sysutils/genisoimage/Makefile b/sysutils/genisoimage/Makefile index b892c19870f3..715abb83c7d8 100644 --- a/sysutils/genisoimage/Makefile +++ b/sysutils/genisoimage/Makefile @@ -2,9 +2,6 @@ PKGNAMESUFFIX= -genisoimage COMMENT= Standalone genisoimage from cdrkit -BROKEN_aarch64= Fails to link: missing sbrk -BROKEN_riscv64= Fails to link: missing sbrk - RUN_DEPENDS= # nada CONFLICTS= # nada