From nobody Fri Feb 3 12:35:02 2023 X-Original-To: dev-commits-ports-all@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 4P7ZqV5DlKz2p4Gn; Fri, 3 Feb 2023 12:35:02 +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 4P7ZqV4nwRz3t2T; Fri, 3 Feb 2023 12:35:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675427702; 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=QgSBdKXMeNwAlCWCHTLA2goTYP3EMIADqy9MeGY2tLI=; b=HAcOJnai8hKf2K2i4/7ryF07nBo2wcF0nx6h8S8SMQpGYOZO028IjX7dg4DwiEYUS0oDrK JVBAMGpV6YAWwbBm88ZF30dYb6NHsao0oPeNAdHAArNYLt4C8BxjCzRC/eI2x6HftWY4h9 xIeUM1f2iBpBXglNw1OqxOxWqDH9XZdI2tV+L9olSZW0sHwBprWSJPmG7AuuFF7y1VPvHd JEaQMooi/8VIqu8NUPVvbm2JgbCPTUqiliOorNtNgD+BDEp+6Fk7lPM/F2qM50bpJKpnjC +6aG4dt0eRiqwgBYKj8x6G1vforDoCt+w+G3NNBUf3iGcyTxrnHPN9wlOvygWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675427702; 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=QgSBdKXMeNwAlCWCHTLA2goTYP3EMIADqy9MeGY2tLI=; b=EsN3cx8/3F5bTIrYDFGOqvuatT5YE9Wcv2mrEb7HP4D6vPorwzgTEb21MsZT2ZtPpFaE1T wxdJEXK2JiyCtylrmWMaR41tlOBIw3EbTBArdvJLQv6Q/09rVBkPjQre9mL5eVihqZfdv0 NNNLZ4LJzp3IUM7xBB569KLgGJ+Y7uTHogdMBxF89cNcRjGB1e9sIkfaxoP6E9rMjoQZLw iGz6QnBNF11F8gcWCwFavqUAMnXc0GqkDGSVbPY+1beohZsXLer5sxV/c9PPtPpbMJBbmS uoMkTI4vH/8uusm94VzpsA9iKUcGw5DnTVp77cdBV4Q21fABb8MLOnAN8+iAOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675427702; a=rsa-sha256; cv=none; b=uOU1uPlbFExDY+VG8TExssjmImeL5TLeIxrv1z+5Kzi7naCs98wtAHq1eSlr7pEcOxvHUL XI2ooXfWyskleuzNkd8fi7+JgYEeWrwU4bnhEGlGwHN0cdCzeBfIJc5SPFtJACbpXbsPjN DTj1stpBzgfhEMlKVphypkQGOK242e2f50knvHy6cQJW4HtW5ogalKBCZAn7fMCGeENPcg gPg/L8iGMph0bozny1sCQ/LtfwfHvTjFifbqYY87NqpFo2+XTlAL7RvAzzq2oUsCpZOY/8 lrX7sf4IUMIV8E0gM+QTa7+EKbWbVY4NX7OREH//oEkyPRC2nzwGOrZi7Xb7hw== 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 4P7ZqV3tJWzZKj; Fri, 3 Feb 2023 12:35:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 313CZ2Ln042426; Fri, 3 Feb 2023 12:35:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 313CZ28B042425; Fri, 3 Feb 2023 12:35:02 GMT (envelope-from git) Date: Fri, 3 Feb 2023 12:35:02 GMT Message-Id: <202302031235.313CZ28B042425@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: f2258673f15e - main - x11/hyprpaper: drop GCC dependency via bundled libc++ List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f2258673f15eab0c0202809ec6109e3311705f4b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=f2258673f15eab0c0202809ec6109e3311705f4b commit f2258673f15eab0c0202809ec6109e3311705f4b Author: Jan Beich AuthorDate: 2023-01-30 23:52:38 +0000 Commit: Jan Beich CommitDate: 2023-02-03 12:34:04 +0000 x11/hyprpaper: drop GCC dependency via bundled libc++ --- x11/hyprpaper/Makefile | 30 ++++++++++++++++++++++++++---- x11/hyprpaper/distinfo | 2 ++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/x11/hyprpaper/Makefile b/x11/hyprpaper/Makefile index 2933233c9c05..25eb373e5c73 100644 --- a/x11/hyprpaper/Makefile +++ b/x11/hyprpaper/Makefile @@ -1,5 +1,6 @@ PORTNAME= hyprpaper PORTVERSION= s20230115 +PORTREVISION= 1 CATEGORIES= x11 wayland MAINTAINER= jbeich@FreeBSD.org @@ -13,13 +14,11 @@ BUILD_DEPENDS= gmake:devel/gmake \ wayland-protocols>0:graphics/wayland-protocols LIB_DEPENDS= libwayland-client.so:graphics/wayland -USES= compiler:c++11-lib cmake gnome jpeg pkgconfig -USE_GCC= yes:build # C++23 +USES= compiler:c++11-lib cmake gnome jpeg localbase:ldflags pkgconfig USE_GNOME= cairo USE_GITHUB= yes GH_ACCOUNT= hyprwm GH_TAGNAME= f77a664 -LDFLAGS+= -static-libstdc++ -static-libgcc # avoid libc++ conflict PLIST_FILES= bin/${PORTNAME} post-patch: @@ -30,11 +29,13 @@ post-patch: -e 's/$${GIT_COMMIT_MESSAGE}//' \ -e 's/$${GIT_DIRTY}/portbld/' \ ${WRKSRC}/CMakeLists.txt +# https://clang.llvm.org/cxx_status.html#cxx23 + @${REINPLACE_CMD} -e 's/c++23/c++2b/' \ + ${WRKSRC}/CMakeLists.txt # Drop unused dependencies @${REINPLACE_CMD} 's/ wlroots//' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's/ pango pangocairo//' \ -e '/OpenGL/d; /GLESv2/d' \ - -e '/pthread/d; /CMAKE_THREAD_LIBS_INIT/d' \ -e '/ rt)/d' \ ${WRKSRC}/CMakeLists.txt @@ -45,4 +46,25 @@ do-install: ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} \ ${STAGEDIR}${PREFIX}/bin +# XXX Drop after FreeBSD 12.3 EOL around 2023-03-01 (don't forget distinfo) +.if !exists(/usr/include/c++/v1/concepts) || make(makesum) || make(fetch) +USES+= llvm:min=12,build +CC= clang${LLVM_VERSION} +CXX= clang++${LLVM_VERSION} +CPP= clang-cpp${LLVM_VERSION} + +# XXX Move into separate port and standardize via USES +GH_TUPLE+= llvm:llvm-project:llvmorg-13.0.1:libcxx +CXXFLAGS+= -nostdinc++ -isystem${WRKDIR}/libcxx_prefix/include/c++/v1 +# Don't link against new libc++ as it's not necessary +#LDFLAGS+= -nostdlib++ -L${WRKDIR}/libcxx_prefix/lib -l:libc++.a -lcxxrt + +pre-configure: bundled-libcxx +bundled-libcxx: + @${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS:M*Ninja*} \ + -DCMAKE_INSTALL_PREFIX:PATH=${WRKDIR}/libcxx_prefix \ + -B ${WRKDIR}/libcxx_build -S ${WRKSRC_libcxx}/libcxx + @${DO_MAKE_BUILD:NDESTDIR*} install -C ${WRKDIR}/libcxx_build +.endif + .include diff --git a/x11/hyprpaper/distinfo b/x11/hyprpaper/distinfo index 993ca8cd6a08..22a273ada71a 100644 --- a/x11/hyprpaper/distinfo +++ b/x11/hyprpaper/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1673799209 SHA256 (hyprwm-hyprpaper-s20230115-f77a664_GH0.tar.gz) = a0e3b22c800f3475ae13dffa4f779eefafcdda58271322edf7a4a5e291d3a8c6 SIZE (hyprwm-hyprpaper-s20230115-f77a664_GH0.tar.gz) = 23554 +SHA256 (llvm-llvm-project-llvmorg-13.0.1_GH0.tar.gz) = 09c50d558bd975c41157364421820228df66632802a4a6a7c9c17f86a7340802 +SIZE (llvm-llvm-project-llvmorg-13.0.1_GH0.tar.gz) = 147290251