aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2024-02-12 21:46:12 +0000
committerJan Beich <jbeich@FreeBSD.org>2024-02-21 16:04:55 +0000
commit6e1a1c3acb50806389b6d8fccfd1fda0158a00fa (patch)
tree53be484b5b693652ad23d8cda7888ef4fcbfb0ef
parent6c9b5ed09d3cf6c87a5c967789479e405ee2c9ed (diff)
downloadports-6e1a1c3acb50806389b6d8fccfd1fda0158a00fa.tar.gz
ports-6e1a1c3acb50806389b6d8fccfd1fda0158a00fa.zip
devel/hyprlang: update to 0.3.1
Changes: https://github.com/hyprwm/hyprlang/releases/tag/v0.3.1 Reported by: GitHub (watch releases) (cherry picked from commit e4e07338f4f9bce1be4d852d83d6295c7b3f6ef7)
-rw-r--r--devel/hyprlang/Makefile33
-rw-r--r--devel/hyprlang/distinfo8
2 files changed, 31 insertions, 10 deletions
diff --git a/devel/hyprlang/Makefile b/devel/hyprlang/Makefile
index 9983449d4777..09597b94081c 100644
--- a/devel/hyprlang/Makefile
+++ b/devel/hyprlang/Makefile
@@ -1,6 +1,6 @@
PORTNAME= hyprlang
DISTVERSIONPREFIX= v
-DISTVERSION= 0.3.0
+DISTVERSION= 0.3.1
CATEGORIES= devel
MAINTAINER= jbeich@FreeBSD.org
@@ -10,10 +10,6 @@ WWW= https://hyprland.org/hyprlang
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/LICENSE
-BROKEN_armv7= https://github.com/hyprwm/hyprlang/issues/8
-BROKEN_i386= https://github.com/hyprwm/hyprlang/issues/8
-BROKEN_powerpc= https://github.com/hyprwm/hyprlang/issues/8
-
USES= cmake:testing compiler:c++11-lib
USE_GITHUB= yes
USE_LDCONFIG= yes
@@ -25,9 +21,32 @@ PLIST_FILES= include/${PORTNAME}.hpp \
libdata/pkgconfig/${PORTNAME}.pc
# XXX Drop after FreeBSD 14.0 EOL around 2025-03-01
-.if exists(/usr/include/c++/v1/__format/format_functions.h) && \
- !exists(/usr/include/c++/v1/__format/write_escaped.h)
+.if exists(/usr/lib/libc++.so) && !exists(/usr/include/c++/v1/__format/write_escaped.h)
CXXFLAGS+= -fexperimental-library
.endif
+# XXX Drop after FreeBSD 13.2 EOL around 2024-05-01 (don't forget distinfo)
+.if ${CXX} == c++ && exists(/usr/lib/libc++.so)
+.if !exists(/usr/include/c++/v1/expected) || make(makesum) || make(fetch)
+USES+= llvm:min=16,build,export
+PATH:= ${LLVM_PREFIX}/bin:${PATH} # XXX _CMAKE_TOOLCHAIN_SUFFIX vs. devel/llvm*
+CONFIGURE_ENV+= CC="${CC}" CXX="${CXX}" CPP="${CPP}"
+CMAKE_BIN= ${LOCALBASE}/bin/cmake
+
+# XXX Move into separate port and standardize via USES
+GH_TUPLE+= llvm:llvm-project:llvmorg-16.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} \
+ -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 # exists(/usr/lib/libc++.so)
+
.include <bsd.port.mk>
diff --git a/devel/hyprlang/distinfo b/devel/hyprlang/distinfo
index 1794c16e5005..3256d51f1126 100644
--- a/devel/hyprlang/distinfo
+++ b/devel/hyprlang/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1707510626
-SHA256 (hyprwm-hyprlang-v0.3.0_GH0.tar.gz) = 6355ae011b1d9d77f95d435fd79582a547cf08db3c0189f2a4ed0a6a25d9b4a1
-SIZE (hyprwm-hyprlang-v0.3.0_GH0.tar.gz) = 61520
+TIMESTAMP = 1707774372
+SHA256 (hyprwm-hyprlang-v0.3.1_GH0.tar.gz) = 17c9b2674d396ac5f081c65b91b1ad391e99f7091dfda2afb025cd8fd220a73f
+SIZE (hyprwm-hyprlang-v0.3.1_GH0.tar.gz) = 62091
+SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271
+SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803