Date: Thu, 17 Aug 2023 18:34:34 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0df8d006f641 - main - graphics/opendx: Fix build on 14 Message-ID: <202308171834.37HIYY5r046791@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=0df8d006f641bc86f2883e28c8d96fbdcfc59bd9 commit 0df8d006f641bc86f2883e28c8d96fbdcfc59bd9 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2023-08-17 18:32:30 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2023-08-17 18:34:20 +0000 graphics/opendx: Fix build on 14 - Utilize USES=localbase - Pet portclippy Approved by: portmgr (blanket) Sponsored by: The FreeBSD Foundation --- graphics/opendx/Makefile | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile index 835c6ba1c545..dde4473f5487 100644 --- a/graphics/opendx/Makefile +++ b/graphics/opendx/Makefile @@ -19,20 +19,24 @@ BROKEN_aarch64= fails to link: undefined symbol: sbrk LIB_DEPENDS= libtiff.so:graphics/tiff \ libcdf.so:science/cdf -MAKE_JOBS_UNSAFE= yes -USES= bison compiler:c++17-lang gl gmake libtool magick:6 motif xorg -USE_XORG= x11 xt xinerama xext xpm xmu sm ice +USES= bison compiler:c++17-lang gl gmake libtool localbase:ldflags magick:6 motif xorg USE_GL= gl glu +USE_LDCONFIG= yes +USE_XORG= x11 xt xinerama xext xpm xmu sm ice + GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared -USE_LDCONFIG= yes CONFIGURE_ENV= ARCH=freebsd -CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib + +MAKE_JOBS_UNSAFE= yes + +CPPFLAGS+= ${CXXFLAGS} + NO_MTREE= yes -PLIST_SUB= ARCH=freebsd + PKGMESSAGE= ${WRKDIR}/pkg-message +PLIST_SUB= ARCH=freebsd .if defined(WITH_HDF) && !defined(WITHOUT_NETCDF) IGNORE= HDF and NETCDF are conflicting .endif @@ -66,6 +70,17 @@ PLIST_SUB+= JAVA="@comment " PLIST_SUB+= UNAMEP=${ARCH} +.include <bsd.port.options.mk> + +.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +USES+= llvm:max=15 +CC= clang${LLVM_VERSION} +CPP= clang-cpp${LLVM_VERSION} +CXX= clang++${LLVM_VERSION} +CONFIGURE_ENV+= ac_cv_requires_lstdcxx=yes +CFLAGS+= -Wno-error=incompatible-function-pointer-types +.endif + .include <bsd.port.pre.mk> post-patch:home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308171834.37HIYY5r046791>