From nobody Tue Jan 31 00:57:30 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 4P5RV25m2Xz3bwFw; Tue, 31 Jan 2023 00:57:30 +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 4P5RV255p7z4YL4; Tue, 31 Jan 2023 00:57:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675126650; 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=7hwgunRX0CK7KJJlwssohOpKyZrjf8pbIA90Fm/3Ebs=; b=TflQtbEMq5ozX7rZ/UbMDcPYJXp3EPOQJzvtTIfQTC0u6pMyW37w74vWKVdlHmIuzLRL4h MVjaZvE7gSGj/Glji1SpBGUPZ7WFyGZDptaL6fh+4dGW6856tLBa7mUbMxbGeh9rGzKXvs 3oKXNlCDoKSvvDTgRT1IHDgmCnKcSz3DL7EWI6MP4KRbd4M6d+STlCZWKMAoQ6Fajs7qML +TprcO0gFsSe72uG1tOYWm7NrfxDw5Ythm9dDGA0TqR44wKfoK73pNR9d0UUubLsf0seOT carQUccbIGfEg6ULFm+PliP1y9vKQu3NXaVsBrIPwzWBXvO5twKOYnZ04Od9tQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675126650; 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=7hwgunRX0CK7KJJlwssohOpKyZrjf8pbIA90Fm/3Ebs=; b=f0o+Y23bUprUyvHrqcmU2VN9NmmLwFTH8Tr0I2+4Qo3o3WtK8rgbKycFrQpdtocdzIh7+E 1GzCyzq7lejFsbAO3pxq7/IkUsDMZ1wk0fKR1fP/uV+BW05uwNuM0fRa9Oymjzuss/EsuA 2CD/9QAgWPVOBJS1f1pKmYUXD8zCHKJkK+HgSS859GnFegdb48J2kZF2ox/MBe3L0FpjCs ZML/lN0+wq4BsW4uHiYMrfZeWJsGy6T9tHMa9UPC5U0KJRL35Z02ajhY9qMQVD9tn7FZ0z huhyYJkuEMDAei4GFi4AI7YvaN5et5sTMTi/fU3N8xJD1IT3QjtWRzHj6UszPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675126650; a=rsa-sha256; cv=none; b=rwBSfaiLInPdFp7z/jf6QzUKAS8qzoCHv0U22kXIM6VA2Po0H3WNlrWzj6nG7bt1oct34f uKRx8sHa9+H48M8BBig24155MoO6A/IbYh21kWMyyksab8GpUclhg6y0g2JlsWNB/xTkUt JpJpMxI9KIijq8BuXq/V64CalERnFA9/2aS4XZ3ifFbvr506SMOTjtS0XmfyJP2p0+CzBl QD/oRjNP32O+3TuI4MOqtc1LQZWB2ddhj4zfldbouDe1oLfwWOuIOhym+Apf5EkIy/og+y J1s+Zj9rX8yvtg9ZNYRqmQtzwgDkBPYDPPCJTSutUUEGv5Cr+q4rk8sfhkpiwQ== 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 4P5RV247KVzVQ5; Tue, 31 Jan 2023 00:57:30 +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 30V0vUs4087580; Tue, 31 Jan 2023 00:57:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30V0vUln087579; Tue, 31 Jan 2023 00:57:30 GMT (envelope-from git) Date: Tue, 31 Jan 2023 00:57:30 GMT Message-Id: <202301310057.30V0vUln087579@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: 33b9f9f8c931 - main - x11-wm/hyprland: drop GCC dependency via bundled libc++ 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 33b9f9f8c931bd07f5f963b606ff3ca4bf425124 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=33b9f9f8c931bd07f5f963b606ff3ca4bf425124 commit 33b9f9f8c931bd07f5f963b606ff3ca4bf425124 Author: Jan Beich AuthorDate: 2023-01-30 21:28:56 +0000 Commit: Jan Beich CommitDate: 2023-01-31 00:56:46 +0000 x11-wm/hyprland: drop GCC dependency via bundled libc++ libc++ 15 needs a workaround but libc++ < 14 is C++23-hopeless. --- x11-wm/hyprland/Makefile | 35 ++++++++++++++++++++++++++++++++--- x11-wm/hyprland/distinfo | 4 ++++ 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile index 83073cac7f2e..dbdda4dfebad 100644 --- a/x11-wm/hyprland/Makefile +++ b/x11-wm/hyprland/Makefile @@ -1,11 +1,12 @@ PORTNAME= hyprland DISTVERSIONPREFIX= v DISTVERSION= 0.21.0beta -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= c3adc9ec5602.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/1448 +PATCHFILES+= f90ff8303b4f.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/1457 MAINTAINER= jbeich@FreeBSD.org COMMENT= Dynamic tiling Wayland compositor that doesn't sacrifice on its looks #' @@ -23,7 +24,6 @@ LIB_DEPENDS= libwayland-server.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon USES= compiler:c++11-lib gl gnome meson pkgconfig xorg -USE_GCC= yes:build USE_GITHUB= yes USE_GL= egl opengl USE_GNOME= cairo @@ -31,7 +31,6 @@ USE_XORG= pixman GH_ACCOUNT= hyprwm GH_PROJECT= Hyprland GH_TUPLE= hyprwm:hyprland-protocols:301733a:hyprland_protocols/subprojects/hyprland-protocols -LDFLAGS+= -static-libstdc++ -static-libgcc # avoid libc++ conflict OPTIONS_DEFINE= X11 OPTIONS_DEFAULT=X11 @@ -58,4 +57,34 @@ post-install: @${RM} -r ${STAGEDIR}${PREFIX}/share/protocols .endif +# XXX Drop after FreeBSD 13.2 EOL around 2024-05-01 (don't forget distinfo) +.if !exists(/usr/include/c++/v1/__ranges/as_rvalue_view.h) || make(makesum) || make(fetch) +. if exists(/usr/include/c++/v1/__algorithm/ranges_all_of.h) && !make(makesum) && !make(fetch) +CXXFLAGS+= -fexperimental-library # std::ranges::all_of +. else +BUILD_DEPENDS+= ${CMAKE_BIN}:devel/cmake-core +USES+= llvm:min=14,build +CC= clang${LLVM_VERSION} +CXX= clang++${LLVM_VERSION} +CPP= clang-cpp${LLVM_VERSION} +CONFIGURE_ENV+= CC="${CC}" CXX="${CXX}" CPP="${CPP}" +CMAKE_BIN= ${LOCALBASE}/bin/cmake +CMAKE_ARGS+= -GNinja + +# XXX Move into separate port and standardize via USES +GH_TUPLE+= llvm:llvm-project:llvmorg-16.0.0-rc1: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*} \ + -DLIBCXX_INCLUDE_BENCHMARKS:BOOL=OFF \ + -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 +.endif + .include diff --git a/x11-wm/hyprland/distinfo b/x11-wm/hyprland/distinfo index 9914c517e0b3..4a64c3189146 100644 --- a/x11-wm/hyprland/distinfo +++ b/x11-wm/hyprland/distinfo @@ -3,5 +3,9 @@ SHA256 (hyprwm-Hyprland-v0.21.0beta_GH0.tar.gz) = 7fb3ba09011c991fcdfbba825cc69a SIZE (hyprwm-Hyprland-v0.21.0beta_GH0.tar.gz) = 714570 SHA256 (hyprwm-hyprland-protocols-301733a_GH0.tar.gz) = 3b3b4e948525f1d823313390b2551ea8969d0cbf82bd72e2a4a2ce2750552330 SIZE (hyprwm-hyprland-protocols-301733a_GH0.tar.gz) = 4852 +SHA256 (llvm-llvm-project-llvmorg-16.0.0-rc1_GH0.tar.gz) = e1b8d991921c8e9564359b17955878716dc68201ded4699c6b175b14fe3085aa +SIZE (llvm-llvm-project-llvmorg-16.0.0-rc1_GH0.tar.gz) = 180127224 SHA256 (c3adc9ec5602.patch) = 71e502ca9b18a7e3b29d19ff72493dc511b2b8937ca032db085a273fdd6a8d26 SIZE (c3adc9ec5602.patch) = 1759 +SHA256 (f90ff8303b4f.patch) = 6b0b3664b44d804bc0a4c686cb44ba0b3fb5612d3f075e3a030a1ed81e34a56a +SIZE (f90ff8303b4f.patch) = 8448