mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
vc, bump version (#9162)
This commit is contained in:
@@ -1,31 +0,0 @@
|
||||
From a09f6b5d033bb9cc52634833460409d4d815047b Mon Sep 17 00:00:00 2001
|
||||
From: begasus <begasus@gmail.com>
|
||||
Date: Sat, 6 Nov 2021 13:37:21 +0000
|
||||
Subject: Support GCC standard libraries which do not define __GLIBC_PREREQ
|
||||
https://github.com/VcDevel/Vc/pull/282
|
||||
|
||||
|
||||
diff --git a/Vc/global.h b/Vc/global.h
|
||||
index 6f85b3c..fd9cdeb 100644
|
||||
--- a/Vc/global.h
|
||||
+++ b/Vc/global.h
|
||||
@@ -132,7 +132,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#endif
|
||||
|
||||
#ifdef Vc_GCC
|
||||
-# if Vc_GCC >= 0x70000 && defined __i386__ && (!defined __GLIBC_PREREQ || !__GLIBC_PREREQ(2,26))
|
||||
+# if Vc_GCC >= 0x70000 && defined __i386__
|
||||
+ // GCC 7 changed alignof(max_align_t) to 16. glibc 2.26 followed with malloc in 2.26.
|
||||
+ // 1. If GCC >= 7 and libc is not glibc max_align_t and malloc mismatch
|
||||
+ // 2. If GCC >= 7 and libc is glibc < 2.26 max_align_t and malloc mismatch
|
||||
+# ifdef __GLIBC_PREREQ
|
||||
+# if __GLIBC_PREREQ(2,26)
|
||||
+# define Vc_HAVE_STD_MAX_ALIGN_T 1
|
||||
+# endif
|
||||
+# endif
|
||||
// GCC 7 changed alignof(max_align_t) to 16. glibc 2.26 followed with malloc in 2.26.
|
||||
// 1. If GCC >= 7 and libc is not glibc max_align_t and malloc mismatch
|
||||
// 2. If GCC >= 7 and libc is glibc < 2.26 max_align_t and malloc mismatch
|
||||
--
|
||||
2.30.2
|
||||
|
||||
39
dev-libs/vc/patches/vc-1.4.3.patchset
Normal file
39
dev-libs/vc/patches/vc-1.4.3.patchset
Normal file
@@ -0,0 +1,39 @@
|
||||
From cdebd52a535b2b2a6bcb9cc06f7bc460f5ff739a Mon Sep 17 00:00:00 2001
|
||||
From: Begasus <begasus@gmail.com>
|
||||
Date: Tue, 8 Aug 2023 10:42:02 +0000
|
||||
Subject: Set install paths
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index d629ebb..1cb4557 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -189,8 +189,8 @@ target_include_directories(Vc
|
||||
|
||||
option(Vc_ENABLE_INSTALL "Whether to install the library." ON)
|
||||
if (Vc_ENABLE_INSTALL)
|
||||
- install(TARGETS Vc EXPORT VcTargets DESTINATION lib${LIB_SUFFIX})
|
||||
- install(DIRECTORY Vc/ DESTINATION include/Vc FILES_MATCHING REGEX "/*.(h|tcc|def)$")
|
||||
+ install(TARGETS Vc EXPORT VcTargets DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
+ install(DIRECTORY Vc/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Vc FILES_MATCHING REGEX "/*.(h|tcc|def)$")
|
||||
install(FILES
|
||||
Vc/Allocator
|
||||
Vc/IO
|
||||
@@ -206,12 +206,12 @@ if (Vc_ENABLE_INSTALL)
|
||||
Vc/span
|
||||
Vc/type_traits
|
||||
Vc/vector
|
||||
- DESTINATION include/Vc)
|
||||
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Vc)
|
||||
|
||||
# Generate and install CMake package and modules
|
||||
include(CMakePackageConfigHelpers)
|
||||
set(PACKAGE_INSTALL_DESTINATION
|
||||
- lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}
|
||||
+ ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
|
||||
)
|
||||
install(EXPORT ${PROJECT_NAME}Targets
|
||||
NAMESPACE ${PROJECT_NAME}::
|
||||
--
|
||||
2.37.3
|
||||
|
||||
@@ -1,67 +0,0 @@
|
||||
SUMMARY="SIMD Vector Class Library for C++"
|
||||
DESCRIPTION="A library to ease explicit vectorization of C++ code."
|
||||
HOMEPAGE="https://github.com/VcDevel/Vc"
|
||||
COPYRIGHT="2006-2016 Arseny Kapoulkine"
|
||||
LICENSE="GNU LGPL v3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/VcDevel/Vc/archive/$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="50d3f151e40b0718666935aa71d299d6370fafa67411f0a9e249fbce3e6e3952"
|
||||
SOURCE_FILENAME="vc-$portVersion.tar.gz"
|
||||
SOURCE_DIR="Vc-$portVersion"
|
||||
PATCHES="vc-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
vc$secondaryArchSuffix = $portVersion
|
||||
devel:libVc$secondaryArchSuffix = $portVersion
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:cmake
|
||||
# cmd:virtest
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:make
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_INSTALL_PREFIX:PATH=$prefix \
|
||||
-DTARGET_ARCHITECTURE=generic
|
||||
# -DBUILD_TESTING=ON
|
||||
|
||||
make -C build ${jobArgs}
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make -C build install
|
||||
|
||||
# move include dir to correct location
|
||||
mkdir -p $(dirname $includeDir)
|
||||
mv $prefix/include $includeDir
|
||||
|
||||
mv $prefix/lib $prefix/lib2
|
||||
mkdir -p $libDir
|
||||
mv $prefix/lib2/* $libDir/
|
||||
rmdir $prefix/lib2
|
||||
|
||||
# prepare develop/lib
|
||||
prepareInstalledDevelLib libVc
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
# cd build_haiku
|
||||
# make test
|
||||
true #virtest required
|
||||
}
|
||||
66
dev-libs/vc/vc-1.4.3.recipe
Normal file
66
dev-libs/vc/vc-1.4.3.recipe
Normal file
@@ -0,0 +1,66 @@
|
||||
SUMMARY="SIMD Vector Class Library for C++"
|
||||
DESCRIPTION="Vc: portable, zero-overhead C++ types for explicitly data-parallel programming."
|
||||
HOMEPAGE="https://github.com/VcDevel/Vc"
|
||||
COPYRIGHT="2009-2015 Matthias Kretz"
|
||||
LICENSE="BSD (3-clause)"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/VcDevel/Vc/archive/$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="988ea0053f3fbf17544ca776a2749c097b3139089408b0286fa4e9e8513e037f"
|
||||
SOURCE_FILENAME="vc-$portVersion.tar.gz"
|
||||
SOURCE_DIR="Vc-$portVersion"
|
||||
srcGitRev_2="95a85e23517e045845bdf324a93a57e13c34efe7"
|
||||
SOURCE_URI_2="https://github.com/mattkretz/virtest/archive/$srcGitRev_2.tar.gz"
|
||||
CHECKSUM_SHA256_2="79c51b7fe790fe30972f2ceab32f0d892e66e00f97974d5167ff31d4fe2e8e81"
|
||||
SOURCE_FILENAME_2="virtest-20200917.tar.gz"
|
||||
SOURCE_DIR_2="virtest-$srcGitRev_2"
|
||||
PATCHES="vc-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
vc$secondaryArchSuffix = $portVersion
|
||||
devel:libVc$secondaryArchSuffix = $portVersion
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:cmake
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:make
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
mkdir -p virtest
|
||||
cp -r $sourceDir2/vir $sourceDir/virtest
|
||||
|
||||
cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
|
||||
$cmakeDirArgs \
|
||||
-DTARGET_ARCHITECTURE=generic \
|
||||
-DBUILD_TESTING=ON
|
||||
make -C build $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make -C build install
|
||||
|
||||
# prepare develop/lib
|
||||
prepareInstalledDevelLib libVc
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
# only check a few tests
|
||||
cd build/tests
|
||||
utils_scalar
|
||||
gather_scalar
|
||||
load_scalar
|
||||
}
|
||||
Reference in New Issue
Block a user