From nobody Thu Aug 17 18:34:34 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRYZM150Dz4mX1J; Thu, 17 Aug 2023 18:34:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRYZL6GHhz3Ssd; Thu, 17 Aug 2023 18:34:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692297274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1lCk9GWYpbLTFuLtsyDC8vG/Nn5ZZJYlhGMWQv+ZfDE=; b=cFX6e+EiWDV8McmCoUdh1tQeZ4qFeNNAO6WPnlDrOk5MTNq4Jmc4NekuRHyhhj+G9i8LJn lNqmRTst7A8na0o+/rEiidDdbPKfX5PowR9UdzCAqgJ4BteqOQ1qYodWqL2jQ7X5J1U3JQ dvaTkkyhCb1JB9VLQFnwjWzvdkPv6wb+HtTvGf8oDOUIRuVi9NhEyfWBT88RWY/7+I/zqV XmeFdBdJo7n3kU65jYlnVFHAV3TDrKrm6A2iV1YkWf2afinFT9ZhbeNoT5VAvtLEMdCgrz DR7YySD7ZO/um1pRRa6EJaoEL7iILK1jMobErhyjztTfma7hat1wkW78VEtFjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692297274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1lCk9GWYpbLTFuLtsyDC8vG/Nn5ZZJYlhGMWQv+ZfDE=; b=IiURQXHDKDIkUItEcDS/Z0Fa58/km+5s18xRbAqjUU3fLEEY19jeyfxj4UcODjYn/Yn9Cq igY1o0+v9sZCFBJK2SJSQa7MvJsNpnba7sc1pByLRnhqw/O2oJd3rxbmmnFmFZkXts/anS s1En52AdI89xUyK0NDJfIJyf7yPoeLZQh3DiA4BWJaNeEt2fya8XlUDUSlM6INQzYeL7Tg 9jspc47PByNnZNbxK8r+Z5BM6VWQXREEd2pewqamAowpySueURmobhso2gbDh9IonikDAj ugJbF0mk0ts8r8QFJTDriSP9NDoQcrV1YDtNuuzKZ1pmtra91NObXHNNETgbow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692297274; a=rsa-sha256; cv=none; b=EltZJz8OgEvSllD2134n+FOA/sqoYg8YXgFY4NOx5YRZwjWI4HptrzbD3/C9+rH8BiF86R Epw+drnbf3uGwU+DbMj5Jlq3Ov49gYwz8Ia9kY6MqwcfJuLBadzb7epP9EplfEVZ9ymsP9 dM9jA18j7AJKgC8T8VceX+kIfjSR5B7s7OgzAyRayxSe4vdVihGdqphnulXik0Gk179cYl BXQizTJ5Q6jHoEN8YwkEAC6C0yq/ckTURUNns4FIB057+kHdqtvMel3bz9f1HTChNedh8n SVs+Tuqlz+ThzyKmXjtqLey9zWTJt7ViNBHTqMmWG4drAR0uEODBpthYCyiAGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRYZL5L2vzkx1; Thu, 17 Aug 2023 18:34:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HIYYnr046794; Thu, 17 Aug 2023 18:34:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HIYY5r046791; Thu, 17 Aug 2023 18:34:34 GMT (envelope-from git) Date: Thu, 17 Aug 2023 18:34:34 GMT Message-Id: <202308171834.37HIYY5r046791@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 0df8d006f641 - main - graphics/opendx: Fix build on 14 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0df8d006f641bc86f2883e28c8d96fbdcfc59bd9 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=0df8d006f641bc86f2883e28c8d96fbdcfc59bd9 commit 0df8d006f641bc86f2883e28c8d96fbdcfc59bd9 Author: Muhammad Moinur Rahman AuthorDate: 2023-08-17 18:32:30 +0000 Commit: Muhammad Moinur Rahman 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 + +.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 post-patch: