[packages/vcpkg] - added arch patch (fix build on x86, add x86-linux triplet), completed EA - don't hide cmake+ninja

[qboosh]

commit ab9ced5e81b3e9105e8b93abd4ec5e9857991292
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu May 7 18:45:12 2020 +0200

    - added arch patch (fix build on x86, add x86-linux triplet), completed EA
    - don't hide cmake+ninja invocation behind bootstrap script (the rest of its functionality is useless for us)
    - use standard cmake/ninja options
    - disable telematry by default
    - release 3

 vcpkg-arch.patch | 19 +++++++++++++++++++
 vcpkg.spec       | 44 +++++++++++++++++++++++++++++++++++---------
 2 files changed, 54 insertions(+), 9 deletions(-)
---
diff --git a/vcpkg.spec b/vcpkg.spec
index 60251da..a93678c 100644
--- a/vcpkg.spec
+++ b/vcpkg.spec
@@ -1,19 +1,23 @@
 #
 # Conditional build:
 %bcond_without	tests		# build with tests
+%bcond_with	telemetry	# sending metrics to MS
 
 Summary:	C++ Library Manager for Windows, Linux, and MacOS
+Summary(pl.UTF-8):	Zarządca bibliotek C++ dla Windows, Linuksa i MacOS-a
 Name:		vcpkg
 Version:	2020.04
-Release:	2
+Release:	3
 License:	MIT
 Group:		Development/Tools
 Source0:	https://github.com/microsoft/vcpkg/archive/%{version}/%{name}-%{version}.tar.gz
 # Source0-md5:	13e30379de51a284a66c311ac45b64a6
+Patch0:		%{name}-arch.patch
 URL:		https://docs.microsoft.com/en-us/cpp/vcpkg
-BuildRequires:	cmake
+BuildRequires:	cmake >= 3.14
+BuildRequires:	libstdc++-devel >= 6:7
 BuildRequires:	ninja
-ExcludeArch:	%{ix86}
+ExclusiveArch:	%{ix86} %{x8664} x32 %{arm} aarch64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		vcpkgrootdir	%{_datadir}/%{name}
@@ -22,30 +26,52 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Vcpkg helps you manage C and C++ libraries on Windows, Linux and
 MacOS.
 
+%description -l pl.UTF-8
+Vcpkg pomaga zarządzać bibliotekami C i C++ w systemach Windows, Linux
+i MacOS.
+
 %package root
-Summary:	ports, scripts and triplets
+Summary:	Ports, scripts and triplets for vcpkg
+Summary(pl.UTF-8):	Porty, skrypty i trójki dla vcpkg
 Group:		Development/Tools
+%if "%{_rpmversion}" >= "4.6"
 BuildArch:	noarch
+%endif
 
 %description root
 This package contains vcpkg-root:
 - ports, scripts and triplets
 
+%description root -l pl.UTF-8
+Ten pakiet zawiera vcpkg-root:
+- porty, skrypty i trójki
+
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-CXX="%{__cxx}" \
-sh -x ./bootstrap-vcpkg.sh -useSystemBinaries
+install -d toolsrc/build
+cd toolsrc/build
+%cmake .. \
+	-G Ninja \
+	-DBUILD_TESTING=OFF \
+	-DVCPKG_DEVELOPMENT_WARNINGS=OFF \
+	%{!?with_telemetry:-DVCPKG_DISABLE_METRICS=ON}
+
+%ninja_build
+
+cd ../..
 
 %if %{with tests}
-./vcpkg search zlib
+toolsrc/build/vcpkg search zlib
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{vcpkgrootdir}}
-install -p vcpkg $RPM_BUILD_ROOT%{_bindir}
+
+install -p toolsrc/build/vcpkg $RPM_BUILD_ROOT%{_bindir}
 cp -a ports scripts triplets .vcpkg-root $RPM_BUILD_ROOT%{vcpkgrootdir}
 ln -s --relative $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{vcpkgrootdir}
 
@@ -65,4 +91,4 @@ rm -rf $RPM_BUILD_ROOT
 %{vcpkgrootdir}/ports
 %{vcpkgrootdir}/scripts
 %{vcpkgrootdir}/triplets
-%{vcpkgrootdir}/vcpkg
+%attr(755,root,root) %{vcpkgrootdir}/vcpkg
diff --git a/vcpkg-arch.patch b/vcpkg-arch.patch
new file mode 100644
index 0000000..8eb95f4
--- /dev/null
+++ b/vcpkg-arch.patch
@@ -0,0 +1,19 @@
+--- vcpkg-2020.04/toolsrc/src/vcpkg/base/system.cpp.orig	2020-04-21 01:39:46.000000000 +0200
++++ vcpkg-2020.04/toolsrc/src/vcpkg/base/system.cpp	2020-05-07 08:49:19.462202639 +0200
+@@ -45,7 +45,7 @@
+ #else // ^^^ defined(_WIN32) / !defined(_WIN32) vvv
+ #if defined(__x86_64__) || defined(_M_X64)
+         return CPUArchitecture::X64;
+-#elif defined(__x86__) || defined(_M_X86)
++#elif defined(__x86__) || defined(__i386__) || defined(_M_X86)
+         return CPUArchitecture::X86;
+ #elif defined(__arm__) || defined(_M_ARM)
+         return CPUArchitecture::ARM;
+--- vcpkg-2020.04/triplets/community/x86-linux.cmake.orig	1970-01-01 01:00:00.000000000 +0100
++++ vcpkg-2020.04/triplets/community/x86-linux.cmake	2020-05-07 10:35:29.321027487 +0200
+@@ -0,0 +1,5 @@
++set(VCPKG_TARGET_ARCHITECTURE x86)
++set(VCPKG_CRT_LINKAGE dynamic)
++set(VCPKG_LIBRARY_LINKAGE static)
++
++set(VCPKG_CMAKE_SYSTEM_NAME Linux)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vcpkg.git/commitdiff/ab9ced5e81b3e9105e8b93abd4ec5e9857991292