pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

et: build without using vcpkg



Module Name:	pkgsrc-wip
Committed By:	Benny Siegert <bsiegert%gmail.com@localhost>
Pushed By:	bsiegert
Date:		Sat Feb 26 12:58:17 2022 +0100
Changeset:	f14c6daa67b8671cb057f452d5e12d932c17d62f

Modified Files:
	et/Makefile
	et/distinfo
Added Files:
	et/TODO
	et/patches/patch-CMakeLists.txt

Log Message:
et: build without using vcpkg

There is a linker error related to use of std::filesystem
that I don't know how to fix.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f14c6daa67b8671cb057f452d5e12d932c17d62f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 et/Makefile                     | 16 ++++++++++++++++
 et/TODO                         |  9 +++++++++
 et/distinfo                     |  1 +
 et/patches/patch-CMakeLists.txt | 16 ++++++++++++++++
 4 files changed, 42 insertions(+)

diffs:
diff --git a/et/Makefile b/et/Makefile
index fa24f9e25f..9c7b80f707 100644
--- a/et/Makefile
+++ b/et/Makefile
@@ -18,6 +18,19 @@ USE_CMAKE=	yes
 USE_TOOLS+=	pkg-config
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	perl
+GCC_REQD+=	8  # uses std::filesystem
+LIBS+=		-lstdc++fs
+
+#.include "../../mk/bsd.prefs.mk"
+#PKGSRC_COMPILER=                clang
+#CLANGBASE=                      ${PREFIX}
+#.include "../../lang/llvm/buildlink3.mk"
+#BUILDLINK_DEPMETHOD.llvm=       build
+#.include "../../lang/clang/buildlink3.mk"
+#BUILDLINK_DEPMETHOD.clang=      build
+
+CMAKE_ARGS+=	-DDISABLE_VCPKG=ON
+
 
 PKGCONFIG_OVERRIDE+=	external_imported/Catch2/CMake/catch2.pc.in
 PKGCONFIG_OVERRIDE+=	external_imported/UniversalStacktrace/external/Catch2/CMake/catch2.pc.in
@@ -36,4 +49,7 @@ PKGCONFIG_OVERRIDE+=	external_imported/vcpkg/ports/v8/v8_libbase.pc.in
 PKGCONFIG_OVERRIDE+=	external_imported/vcpkg/ports/v8/v8_libplatform.pc.in
 PKGCONFIG_OVERRIDE+=	external_imported/vcpkg/ports/v8/v8_monolith.pc.in
 
+.include "../../devel/protobuf/buildlink3.mk"
+.include "../../security/libsodium/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/et/TODO b/et/TODO
new file mode 100644
index 0000000000..e0ffde9cb9
--- /dev/null
+++ b/et/TODO
@@ -0,0 +1,9 @@
+On NetBSD, there is a compiler error when linking the binary, related to use of
+std::filesystem:
+
+/usr/bin/ld: libet-lib.a(LogHandler.cpp.o): in function `et::LogHandler::stderrToFile(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)':
+/usr/pkg/gcc8/include/c++/bits/fs_path.h:185: undefined reference to `std::filesystem::__cxx11::path::_M_split_cmpts()'
+/usr/bin/ld: libet-lib.a(LogHandler.cpp.o): in function `et::LogHandler::stderrToFile(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)':
+/usr/obj/pkgsrc/wip/et/work/EternalTerminal-et-v6.1.11/src/base/LogHandler.cpp:51: undefined reference to `std::filesystem::permissions(std::filesystem::__cxx11::path const&, std::filesystem::perms, std::filesystem::perm_options)'
+collect2: error: ld returned 1 exit status
+
diff --git a/et/distinfo b/et/distinfo
index dccdce0715..9252b51212 100644
--- a/et/distinfo
+++ b/et/distinfo
@@ -3,3 +3,4 @@ $NetBSD$
 BLAKE2s (EternalTerminal/et-6.1.11.tar.gz) = 0e7079816a169b76e08c395c3f010df424a2f5abe95d99c0b08af53ae0b021e5
 SHA512 (EternalTerminal/et-6.1.11.tar.gz) = 71b1fe20096a46e6f0ce87ec18d5074f90f48193a1637becb9692b20e7d92fc3b091cf843cecca30a4591fc94396494ff8282343ec6068a2905afd8f4225b3e4
 Size (EternalTerminal/et-6.1.11.tar.gz) = 22081590 bytes
+SHA1 (patch-CMakeLists.txt) = 34356ce801a003d8d0962691a9e046d593bb6461
diff --git a/et/patches/patch-CMakeLists.txt b/et/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..ae6a1917d3
--- /dev/null
+++ b/et/patches/patch-CMakeLists.txt
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- CMakeLists.txt.orig	2022-02-18 19:34:07.809964843 +0000
++++ CMakeLists.txt
+@@ -281,11 +281,6 @@ macro(DECORATE_TARGET TARGET_NAME)
+   add_sanitizers(${TARGET_NAME})
+   set_target_properties(${TARGET_NAME} PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT
+                                                   "src/base/Headers.hpp")
+-  if(CMAKE_CROSSCOMPILING)
+-    # Doesn't work when cross-compiling
+-  else()
+-    cotire(${TARGET_NAME})
+-  endif()
+ endmacro()
+ 
+ include_directories(


Home | Main Index | Thread Index | Old Index