pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
llvm: switch to one distfile as recommened upstream
Module Name: pkgsrc-wip
Committed By: Adam Ciarciński <aciarcinski%teonite.com@localhost>
Pushed By: adam
Date: Thu Jul 17 19:53:18 2025 +0200
Changeset: 1f701ceffc8429f61d994f9cb829b4c07e4f4bf4
Modified Files:
clang-tools-extra/Makefile
clang-tools-extra/distinfo
clang/Makefile
clang/Makefile.common
clang/distinfo
compiler-rt/Makefile
compiler-rt/distinfo
flang/Makefile
flang/distinfo
libcxx/Makefile
libcxx/distinfo
libcxxabi/Makefile
libcxxabi/distinfo
libunwind/Makefile
libunwind/PLIST
libunwind/distinfo
lld/Makefile
lld/distinfo
lldb/Makefile
lldb/distinfo
llvm/Makefile
llvm/distinfo
llvm/version.mk
mlir/Makefile
mlir/distinfo
openmp/Makefile
openmp/distinfo
polly/Makefile
polly/distinfo
wasi-compiler-rt/Makefile
wasi-libcxx/Makefile
wasi-libcxx/distinfo
Log Message:
llvm: switch to one distfile as recommened upstream
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1f701ceffc8429f61d994f9cb829b4c07e4f4bf4
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
clang-tools-extra/Makefile | 9 ++-------
clang-tools-extra/distinfo | 15 +++------------
clang/Makefile | 4 +++-
clang/Makefile.common | 2 --
clang/distinfo | 14 ++++----------
compiler-rt/Makefile | 4 ++--
compiler-rt/distinfo | 12 +++---------
flang/Makefile | 3 +--
flang/distinfo | 12 +++---------
libcxx/Makefile | 31 +++++--------------------------
libcxx/distinfo | 18 +++---------------
libcxxabi/Makefile | 21 ++++++---------------
libcxxabi/distinfo | 15 +++------------
libunwind/Makefile | 16 +---------------
libunwind/PLIST | 1 -
libunwind/distinfo | 15 +++------------
lld/Makefile | 3 +--
lld/distinfo | 12 +++---------
lldb/Makefile | 3 +--
lldb/distinfo | 12 +++---------
llvm/Makefile | 3 +--
llvm/distinfo | 12 +++---------
llvm/version.mk | 22 +++++++---------------
mlir/Makefile | 3 +--
mlir/distinfo | 12 +++---------
openmp/Makefile | 3 +--
openmp/distinfo | 12 +++---------
polly/Makefile | 3 +--
polly/distinfo | 12 +++---------
wasi-compiler-rt/Makefile | 3 +--
wasi-libcxx/Makefile | 18 +++++-------------
wasi-libcxx/distinfo | 15 +++------------
32 files changed, 82 insertions(+), 258 deletions(-)
diffs:
diff --git a/clang-tools-extra/Makefile b/clang-tools-extra/Makefile
index ded4fec8ca..bd37f3f59c 100644
--- a/clang-tools-extra/Makefile
+++ b/clang-tools-extra/Makefile
@@ -6,17 +6,12 @@ CMAKE_GENERATORS_INCOMPATIBLE= ninja
.include "../../wip/clang/Makefile.common"
-PKGNAME= ${DISTNAME:S/clang/clang-tools-extra/:S/.src//}
+PKGNAME= clang-tools-extra-${LLVM_VERSION}
COMMENT= Extra Clang tools
DEPENDS+= clang>=${LLVM_VERSION}:../../wip/clang
-CLANG_TOOLS_EXTRA= clang-tools-extra-${LLVM_VERSION}.src
-EXTRA_DIST+= ${CLANG_TOOLS_EXTRA}${EXTRACT_SUFX}
-SITES.${CLANG_TOOLS_EXTRA}${EXTRACT_SUFX}= \
- ${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
-
BUILD_TARGET= clang-change-namespace clang-apply-replacements clang-doc
BUILD_TARGET+= clang-include-fixer clang-move clang-query clang-reorder-fields
BUILD_TARGET+= clang-tidy clangd modularize pp-trace tool-template
@@ -30,6 +25,6 @@ BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-Bsymbolic-functions
.PHONY: inject-clang-tools
post-extract: inject-clang-tools
inject-clang-tools:
- ${MV} ${WRKDIR}/${DISTNAME:S/clang/clang-tools-extra/} ${WRKSRC}/tools/extra
+ ${LN} -s ${WRKSRC} ${WRKSRC}/../clang/tools/extra
.include "../../mk/bsd.pkg.mk"
diff --git a/clang-tools-extra/distinfo b/clang-tools-extra/distinfo
index 3744cc2f6b..db8f0e7fb0 100644
--- a/clang-tools-extra/distinfo
+++ b/clang-tools-extra/distinfo
@@ -1,14 +1,5 @@
$NetBSD: distinfo,v 1.17 2023/01/12 19:32:53 adam Exp $
-BLAKE2s (clang-20.1.8.src.tar.xz) = 5398812e238ab40c6c5346f666cb336b244822fbc31bb5b726cd37dd8dcd8162
-SHA512 (clang-20.1.8.src.tar.xz) = 5f74c79e15a6c569eb30fcc200763d6187b7780d4a033b9d31adfbdccd7228ab96fcd1ebe1dafe9f9acc424eb2edeab5858e5fa6bdb2f3396b660bea898fd792
-Size (clang-20.1.8.src.tar.xz) = 23754472 bytes
-BLAKE2s (clang-tools-extra-20.1.8.src.tar.xz) = 83c3aec9c9e865ca39b5fa6e5ad610785641e59a83fabaa01a06718e5a55e4dd
-SHA512 (clang-tools-extra-20.1.8.src.tar.xz) = 088d6b7dffe2bad27000f6fc554bace674dab94275df6281af03e1b9bc11648ec5fd95a9dee5a111e855cca86e167ababbe649f02ab0a6477ee641d205f42804
-Size (clang-tools-extra-20.1.8.src.tar.xz) = 3397100 bytes
-BLAKE2s (cmake-20.1.8.src.tar.xz) = 39070395d68854d6d9781a700093a638e304bbf68888ba1e6bfb07e2deb01b57
-SHA512 (cmake-20.1.8.src.tar.xz) = 0ff6018c0753f208e990e45403c4ae5764a0ac83a8d80d8db7d3c7dbface14a7c8339893d8f757ff2d7b3662253ba356cf157ae7072a0be170a9dc028f4d7a74
-Size (cmake-20.1.8.src.tar.xz) = 8652 bytes
-BLAKE2s (runtimes-20.1.8.src.tar.xz) = 858d82c606feac6a09a6186eaa44676adc1145006735a58b3fe6576504da9e4f
-SHA512 (runtimes-20.1.8.src.tar.xz) = 6b6e4cbec4488632a2489b1073cc0a3b359e2239a16d791a8c111d45d3e41bf30211c8362cbcc2e5c174f95d2b521721adafb3ba0d8631dce032566b6eb96d3b
-Size (runtimes-20.1.8.src.tar.xz) = 8340 bytes
+BLAKE2s (llvm-project-20.1.8.src.tar.xz) = c1587d5118d1d27f773127d6b72528b9d6f0eb78156b2679ebd4132369572e45
+SHA512 (llvm-project-20.1.8.src.tar.xz) = f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
+Size (llvm-project-20.1.8.src.tar.xz) = 147242952 bytes
diff --git a/clang/Makefile b/clang/Makefile
index 31b5c0c730..647b911ebf 100644
--- a/clang/Makefile
+++ b/clang/Makefile
@@ -2,7 +2,9 @@
.include "Makefile.common"
-PKGNAME= ${DISTNAME:S/.src//}
+PKGNAME= clang-${LLVM_VERSION}
+
+COMMENT= C language family frontend for LLVM
USE_TOOLS+= perl:run
diff --git a/clang/Makefile.common b/clang/Makefile.common
index 5e57cefe3c..2f669bd340 100644
--- a/clang/Makefile.common
+++ b/clang/Makefile.common
@@ -4,12 +4,10 @@
.include "../../wip/llvm/version.mk"
-DISTNAME= clang-${LLVM_VERSION}.src
CATEGORIES= lang devel
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://clang.llvm.org/
-COMMENT= C language family frontend for LLVM
LICENSE= apache-2.0
USE_CXX_FEATURES= c++14
diff --git a/clang/distinfo b/clang/distinfo
index fe2a5dfcdc..8560a644ad 100644
--- a/clang/distinfo
+++ b/clang/distinfo
@@ -1,12 +1,6 @@
-$NetBSD: distinfo,v 1.80 2023/01/12 19:32:53 adam Exp $
+$NetBSD$
-BLAKE2s (clang-20.1.8.src.tar.xz) = 5398812e238ab40c6c5346f666cb336b244822fbc31bb5b726cd37dd8dcd8162
-SHA512 (clang-20.1.8.src.tar.xz) = 5f74c79e15a6c569eb30fcc200763d6187b7780d4a033b9d31adfbdccd7228ab96fcd1ebe1dafe9f9acc424eb2edeab5858e5fa6bdb2f3396b660bea898fd792
-Size (clang-20.1.8.src.tar.xz) = 23754472 bytes
-BLAKE2s (cmake-20.1.8.src.tar.xz) = 39070395d68854d6d9781a700093a638e304bbf68888ba1e6bfb07e2deb01b57
-SHA512 (cmake-20.1.8.src.tar.xz) = 0ff6018c0753f208e990e45403c4ae5764a0ac83a8d80d8db7d3c7dbface14a7c8339893d8f757ff2d7b3662253ba356cf157ae7072a0be170a9dc028f4d7a74
-Size (cmake-20.1.8.src.tar.xz) = 8652 bytes
-BLAKE2s (runtimes-20.1.8.src.tar.xz) = 858d82c606feac6a09a6186eaa44676adc1145006735a58b3fe6576504da9e4f
-SHA512 (runtimes-20.1.8.src.tar.xz) = 6b6e4cbec4488632a2489b1073cc0a3b359e2239a16d791a8c111d45d3e41bf30211c8362cbcc2e5c174f95d2b521721adafb3ba0d8631dce032566b6eb96d3b
-Size (runtimes-20.1.8.src.tar.xz) = 8340 bytes
+BLAKE2s (llvm-project-20.1.8.src.tar.xz) = c1587d5118d1d27f773127d6b72528b9d6f0eb78156b2679ebd4132369572e45
+SHA512 (llvm-project-20.1.8.src.tar.xz) = f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
+Size (llvm-project-20.1.8.src.tar.xz) = 147242952 bytes
SHA1 (patch-lib_Driver_ToolChain.cpp) = 33a8e346a72893140fde42245e4b108f3a9b9e3e
diff --git a/compiler-rt/Makefile b/compiler-rt/Makefile
index 586f32f53b..e8aafa60df 100644
--- a/compiler-rt/Makefile
+++ b/compiler-rt/Makefile
@@ -2,8 +2,8 @@
.include "../../wip/llvm/version.mk"
-DISTNAME= compiler-rt-${LLVM_VERSION}.src
-PKGNAME= ${DISTNAME:S/.src//}
+PKGNAME= compiler-rt-${LLVM_VERSION}
+
CATEGORIES= lang devel
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
diff --git a/compiler-rt/distinfo b/compiler-rt/distinfo
index c6778d9019..cdfd1f3909 100644
--- a/compiler-rt/distinfo
+++ b/compiler-rt/distinfo
@@ -1,13 +1,7 @@
$NetBSD: distinfo,v 1.23 2023/03/03 09:53:14 wiz Exp $
-BLAKE2s (cmake-20.1.8.src.tar.xz) = 39070395d68854d6d9781a700093a638e304bbf68888ba1e6bfb07e2deb01b57
-SHA512 (cmake-20.1.8.src.tar.xz) = 0ff6018c0753f208e990e45403c4ae5764a0ac83a8d80d8db7d3c7dbface14a7c8339893d8f757ff2d7b3662253ba356cf157ae7072a0be170a9dc028f4d7a74
-Size (cmake-20.1.8.src.tar.xz) = 8652 bytes
-BLAKE2s (compiler-rt-20.1.8.src.tar.xz) = a6e974c44e17d48984cbb7d2b8d34d665e7c360a7bf95852e9aa0f0da56e03f1
-SHA512 (compiler-rt-20.1.8.src.tar.xz) = 905fe22cbcb777255245b8594fb6cbb496c9ad96c962e9c429335a9358c6520f2aa2964d2019a40dd5ac20b0df17569dd62f635078f92d34206700ee06123a1d
-Size (compiler-rt-20.1.8.src.tar.xz) = 2601876 bytes
-BLAKE2s (runtimes-20.1.8.src.tar.xz) = 858d82c606feac6a09a6186eaa44676adc1145006735a58b3fe6576504da9e4f
-SHA512 (runtimes-20.1.8.src.tar.xz) = 6b6e4cbec4488632a2489b1073cc0a3b359e2239a16d791a8c111d45d3e41bf30211c8362cbcc2e5c174f95d2b521721adafb3ba0d8631dce032566b6eb96d3b
-Size (runtimes-20.1.8.src.tar.xz) = 8340 bytes
+BLAKE2s (llvm-project-20.1.8.src.tar.xz) = c1587d5118d1d27f773127d6b72528b9d6f0eb78156b2679ebd4132369572e45
+SHA512 (llvm-project-20.1.8.src.tar.xz) = f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
+Size (llvm-project-20.1.8.src.tar.xz) = 147242952 bytes
SHA1 (patch-CMakeLists.txt) = f8b0a0ad43481ec0c2923ec19c3c4f2ce81a4c82
SHA1 (patch-cmake_config-ix.cmake) = e3d2fef7542eda42a0c716b31c0d9b0a729d92e0
diff --git a/flang/Makefile b/flang/Makefile
index 280656f3ec..602b2881e4 100644
--- a/flang/Makefile
+++ b/flang/Makefile
@@ -2,8 +2,7 @@
.include "../../wip/llvm/version.mk"
-DISTNAME= flang-${LLVM_VERSION}.src
-PKGNAME= ${DISTNAME:S/.src//}
+PKGNAME= flang-${LLVM_VERSION}
CATEGORIES= lang devel
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
diff --git a/flang/distinfo b/flang/distinfo
index 7f3c948ed7..f7d1d36e0c 100644
--- a/flang/distinfo
+++ b/flang/distinfo
@@ -1,11 +1,5 @@
$NetBSD: distinfo,v 1.35 2015/09/11 01:21:57 tnn Exp $
-BLAKE2s (cmake-20.1.8.src.tar.xz) = 39070395d68854d6d9781a700093a638e304bbf68888ba1e6bfb07e2deb01b57
-SHA512 (cmake-20.1.8.src.tar.xz) = 0ff6018c0753f208e990e45403c4ae5764a0ac83a8d80d8db7d3c7dbface14a7c8339893d8f757ff2d7b3662253ba356cf157ae7072a0be170a9dc028f4d7a74
-Size (cmake-20.1.8.src.tar.xz) = 8652 bytes
-BLAKE2s (flang-20.1.8.src.tar.xz) = e2b8abab91896c52daaa1ad7e9248cb2e70b4783d073556f94967aa2542f56a6
-SHA512 (flang-20.1.8.src.tar.xz) = 98a8922a30225b8bc85de644d3e239e34e4237bd04789060a5b1bff2c3200857694de50cdd016fdf5ce6e98cf1cb11c9b5ae4fba7eaa443b11df88cd42d56c20
-Size (flang-20.1.8.src.tar.xz) = 3622812 bytes
-BLAKE2s (runtimes-20.1.8.src.tar.xz) = 858d82c606feac6a09a6186eaa44676adc1145006735a58b3fe6576504da9e4f
-SHA512 (runtimes-20.1.8.src.tar.xz) = 6b6e4cbec4488632a2489b1073cc0a3b359e2239a16d791a8c111d45d3e41bf30211c8362cbcc2e5c174f95d2b521721adafb3ba0d8631dce032566b6eb96d3b
-Size (runtimes-20.1.8.src.tar.xz) = 8340 bytes
+BLAKE2s (llvm-project-20.1.8.src.tar.xz) = c1587d5118d1d27f773127d6b72528b9d6f0eb78156b2679ebd4132369572e45
+SHA512 (llvm-project-20.1.8.src.tar.xz) = f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
+Size (llvm-project-20.1.8.src.tar.xz) = 147242952 bytes
diff --git a/libcxx/Makefile b/libcxx/Makefile
index 4fe623e3d4..900632c332 100644
--- a/libcxx/Makefile
+++ b/libcxx/Makefile
@@ -2,8 +2,10 @@
.include "../../wip/llvm/version.mk"
-DISTNAME= libcxx-${LLVM_VERSION}.src
-PKGNAME= ${DISTNAME:S/.src//}
+EXTRACT_ELEMENTS+= ${DISTNAME}/libc
+EXTRACT_ELEMENTS+= ${DISTNAME}/libcxxabi
+
+PKGNAME= libcxx-${LLVM_VERSION}
CATEGORIES= lang devel
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -11,25 +13,6 @@ HOMEPAGE= https://libcxx.llvm.org/
COMMENT= C++ Standard Library
LICENSE= apache-2.0
-# libc isn't officially packaged
-# It is needed for src/include/from_chars_floating_point.h
-# git clone -b llvmorg-${LLVM_VERSION} --depth=1 git%github.com@localhost:llvm/llvm-project.git
-# cd llvm-project
-# mv libc libc-${LLVM_VERSION}.src
-# bsdtar -cf - libc-${LLVM_VERSION}.src | xz -9c > /dist/distfiles/libc-${LLVM_VERSION}.src.tar.xz
-LIBC= libc-${LLVM_VERSION}.src
-EXTRA_DIST+= ${LIBC}${EXTRACT_SUFX}
-
-# libcxx requires libcxxabi's cxxabi.h to build, but libcxxabi requires
-# libcxx's includes to build, so we have this unholy extra distfiles thing
-# in both of them to get them to build against each other without causing
-# circular dependencies. This must be kept in sync with libcxxabi/Makefile.
-LIBCXXABI= libcxxabi-${LLVM_VERSION}.src
-EXTRA_DIST+= ${LIBCXXABI}${EXTRACT_SUFX}
-
-SITES.${LIBCXXABI}${EXTRACT_SUFX}= \
- ${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
-
USE_CXX_FEATURES= c++20
USE_LANGUAGES= c c++
SSP_SUPPORTED= no
@@ -37,7 +20,7 @@ GCC_REQD+= 14 # must be in sync with libcxxabi
CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
CMAKE_CONFIGURE_ARGS+= -DLIBCXX_CXX_ABI=system-libcxxabi
-CMAKE_CONFIGURE_ARGS+= -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${WRKDIR}/${LIBCXXABI}/include
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${WRKSRC}/../libcxxabi/include
CMAKE_CONFIGURE_ARGS+= -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
CMAKE_CONFIGURE_ARGS+= -DLIBCXX_INCLUDE_BENCHMARKS=OFF
@@ -53,10 +36,6 @@ CXXFLAGS.SunOS+= -D_LIBCPP_NO_ABI_TAG=1
CXXFLAGS+= -std=c++17 -D_LIBCPP_STD_VER=17
.endif
-post-extract:
- ${LN} -f -s ${WRKDIR}/${LIBC} ${WRKDIR}/libc
- ${LN} -f -s ${WRKDIR}/${LIBCXXABI} ${WRKDIR}/libcxxabi
-
.include "../../devel/cmake/build.mk"
.include "../../lang/python/tool.mk"
.include "../../wip/libcxxabi/buildlink3.mk"
diff --git a/libcxx/distinfo b/libcxx/distinfo
index 3ca1e7da73..8acd2dd4f4 100644
--- a/libcxx/distinfo
+++ b/libcxx/distinfo
@@ -1,20 +1,8 @@
$NetBSD: distinfo,v 1.25 2023/01/12 19:32:54 adam Exp $
-BLAKE2s (cmake-20.1.8.src.tar.xz) = 39070395d68854d6d9781a700093a638e304bbf68888ba1e6bfb07e2deb01b57
-SHA512 (cmake-20.1.8.src.tar.xz) = 0ff6018c0753f208e990e45403c4ae5764a0ac83a8d80d8db7d3c7dbface14a7c8339893d8f757ff2d7b3662253ba356cf157ae7072a0be170a9dc028f4d7a74
-Size (cmake-20.1.8.src.tar.xz) = 8652 bytes
-BLAKE2s (libc-20.1.8.src.tar.xz) = fd11ed3e19de768b7562569cae1753ec4cec7ace84b09572f42054f37b7610f4
-SHA512 (libc-20.1.8.src.tar.xz) = c9c16479f6108240b81acb8778e57f59fc3eb019c371cc2546aaa59e0f1cc9337d735f5361b40b74d6f4aca460183954fa0bbc5138a3616fc805deda93bff1f3
-Size (libc-20.1.8.src.tar.xz) = 4600776 bytes
-BLAKE2s (libcxx-20.1.8.src.tar.xz) = 4be07d74ddef5f84a7a14130b9089358f9e831d868100bfa79d7e3540f3bcbbc
-SHA512 (libcxx-20.1.8.src.tar.xz) = a5e36d99a44755c26d2056b60578f5fd5e4d3712bc971a065655879e0487011cfef9e3c4f13a748df8766cc72078e53cbed8e4ec811ac0460089e41366657ee3
-Size (libcxx-20.1.8.src.tar.xz) = 4455756 bytes
-BLAKE2s (libcxxabi-20.1.8.src.tar.xz) = e134570ab599d5787076c8f5c100228b27d8a7f929dfb591a8722d017913058c
-SHA512 (libcxxabi-20.1.8.src.tar.xz) = 900d8248ede4342bcd5d9974b6ccf7f2be3adb43cf644ce43aa453d2924a8cfa587adae6e9c6233372f3e8ce7c038f2675911b35272646cc38a65886c3f3418f
-Size (libcxxabi-20.1.8.src.tar.xz) = 585796 bytes
-BLAKE2s (runtimes-20.1.8.src.tar.xz) = 858d82c606feac6a09a6186eaa44676adc1145006735a58b3fe6576504da9e4f
-SHA512 (runtimes-20.1.8.src.tar.xz) = 6b6e4cbec4488632a2489b1073cc0a3b359e2239a16d791a8c111d45d3e41bf30211c8362cbcc2e5c174f95d2b521721adafb3ba0d8631dce032566b6eb96d3b
-Size (runtimes-20.1.8.src.tar.xz) = 8340 bytes
+BLAKE2s (llvm-project-20.1.8.src.tar.xz) = c1587d5118d1d27f773127d6b72528b9d6f0eb78156b2679ebd4132369572e45
+SHA512 (llvm-project-20.1.8.src.tar.xz) = f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
+Size (llvm-project-20.1.8.src.tar.xz) = 147242952 bytes
SHA1 (patch-src_CMakeLists.txt) = 4554c675b778d8d631f2fc664364f0d3ffc3ed5e
SHA1 (patch-src_charconv.cpp) = 658a0727c6e2ddc051fbd22a536033bae19a22ba
SHA1 (patch-src_filesystem_file__descriptor.h) = 44a64cb3eac4e94abb54170c355639642b8246c2
diff --git a/libcxxabi/Makefile b/libcxxabi/Makefile
index 1fe2a6a6d9..62cf911391 100644
--- a/libcxxabi/Makefile
+++ b/libcxxabi/Makefile
@@ -2,8 +2,11 @@
.include "../../wip/llvm/version.mk"
-DISTNAME= libcxxabi-${LLVM_VERSION}.src
-PKGNAME= ${DISTNAME:S/.src//}
+EXTRACT_ELEMENTS+= ${DISTNAME}/libc
+EXTRACT_ELEMENTS+= ${DISTNAME}/libcxx
+
+PKGNAME= libcxxabi-${LLVM_VERSION}
+
CATEGORIES= lang devel
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -11,16 +14,6 @@ HOMEPAGE= https://libcxxabi.llvm.org/
COMMENT= C++ Standard Library
LICENSE= apache-2.0
-# libcxx requires libcxxabi's cxxabi.h to build, but libcxxabi requires
-# libcxx's includes to build, so we have this unholy extra distfiles thing
-# in both of them to get them to build against each other without causing
-# circular dependencies. This must be kept in sync with libcxxabi/Makefile.
-LIBCXX= libcxx-${LLVM_VERSION}.src
-EXTRA_DIST+= ${LIBCXX}${EXTRACT_SUFX}
-
-SITES.${LIBCXX}${EXTRACT_SUFX}= \
- ${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
-
USE_CXX_FEATURES= c++17
USE_LANGUAGES= c c++
SSP_SUPPORTED= no
@@ -28,7 +21,6 @@ GCC_REQD+= 14 # must be in sync with libcxx
CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
# "LIBCXXABI_USE_LLVM_UNWINDER is set to ON, but libunwind is not specified in LLVM_ENABLE_RUNTIMES."
-#CMAKE_CONFIGURE_ARGS+= -DLLVM_ENABLE_RUNTIMES=libunwind
CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_USE_LLVM_UNWINDER=OFF
# avoid conflict with stddef.h
@@ -43,9 +35,8 @@ CXXFLAGS+= -std=c++17 -D_LIBCPP_STD_VER=17
# IMPORTANT: copy __assertion_handler and __config_site from partial build of libcxx.
pre-configure:
- ${LN} -f -s ${WRKDIR}/${LIBCXX} ${WRKDIR}/libcxx
${CP} ${FILESDIR}/__assertion_handler ${FILESDIR}/__config_site \
- ${WRKDIR}/${LIBCXX}/include/
+ ${WRKSRC}/../libcxx/include/
.include "../../devel/cmake/build.mk"
.include "../../wip/libunwind/buildlink3.mk"
diff --git a/libcxxabi/distinfo b/libcxxabi/distinfo
index 48a60721f8..6df58cc2e1 100644
--- a/libcxxabi/distinfo
+++ b/libcxxabi/distinfo
@@ -1,16 +1,7 @@
$NetBSD: distinfo,v 1.21 2023/01/12 19:32:54 adam Exp $
-BLAKE2s (cmake-20.1.8.src.tar.xz) = 39070395d68854d6d9781a700093a638e304bbf68888ba1e6bfb07e2deb01b57
-SHA512 (cmake-20.1.8.src.tar.xz) = 0ff6018c0753f208e990e45403c4ae5764a0ac83a8d80d8db7d3c7dbface14a7c8339893d8f757ff2d7b3662253ba356cf157ae7072a0be170a9dc028f4d7a74
-Size (cmake-20.1.8.src.tar.xz) = 8652 bytes
-BLAKE2s (libcxx-20.1.8.src.tar.xz) = 4be07d74ddef5f84a7a14130b9089358f9e831d868100bfa79d7e3540f3bcbbc
-SHA512 (libcxx-20.1.8.src.tar.xz) = a5e36d99a44755c26d2056b60578f5fd5e4d3712bc971a065655879e0487011cfef9e3c4f13a748df8766cc72078e53cbed8e4ec811ac0460089e41366657ee3
-Size (libcxx-20.1.8.src.tar.xz) = 4455756 bytes
-BLAKE2s (libcxxabi-20.1.8.src.tar.xz) = e134570ab599d5787076c8f5c100228b27d8a7f929dfb591a8722d017913058c
-SHA512 (libcxxabi-20.1.8.src.tar.xz) = 900d8248ede4342bcd5d9974b6ccf7f2be3adb43cf644ce43aa453d2924a8cfa587adae6e9c6233372f3e8ce7c038f2675911b35272646cc38a65886c3f3418f
-Size (libcxxabi-20.1.8.src.tar.xz) = 585796 bytes
-BLAKE2s (runtimes-20.1.8.src.tar.xz) = 858d82c606feac6a09a6186eaa44676adc1145006735a58b3fe6576504da9e4f
-SHA512 (runtimes-20.1.8.src.tar.xz) = 6b6e4cbec4488632a2489b1073cc0a3b359e2239a16d791a8c111d45d3e41bf30211c8362cbcc2e5c174f95d2b521721adafb3ba0d8631dce032566b6eb96d3b
-Size (runtimes-20.1.8.src.tar.xz) = 8340 bytes
+BLAKE2s (llvm-project-20.1.8.src.tar.xz) = c1587d5118d1d27f773127d6b72528b9d6f0eb78156b2679ebd4132369572e45
+SHA512 (llvm-project-20.1.8.src.tar.xz) = f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
+Size (llvm-project-20.1.8.src.tar.xz) = 147242952 bytes
SHA1 (patch-src_CMakeLists.txt) = fcfadc20db2c0c9095b8ae9b25a5988384209115
SHA1 (patch-src_demangle_Utility.h) = 7a4850869f9f4ce858d2cceeb999934c28292a95
diff --git a/libunwind/Makefile b/libunwind/Makefile
index c4279e5d9d..f009e6b487 100644
--- a/libunwind/Makefile
+++ b/libunwind/Makefile
@@ -2,8 +2,7 @@
.include "../../wip/llvm/version.mk"
-DISTNAME= libunwind-${LLVM_VERSION}.src
-PKGNAME= ${DISTNAME:S/.src//}
+PKGNAME= libunwind-${LLVM_VERSION}
CATEGORIES= lang devel
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -11,13 +10,6 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
COMMENT= LLVM libunwind
LICENSE= apache-2.0
-# libunwind requires libcxx source code to build
-LIBCXX= libcxx-${LLVM_VERSION}.src
-EXTRA_DIST+= ${LIBCXX}${EXTRACT_SUFX}
-
-SITES.${LIBCXX}${EXTRACT_SUFX}= \
- ${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
-
USE_CXX_FEATURES= c++17
USE_LANGUAGES= c c++
USE_TOOLS+= pax
@@ -36,12 +28,6 @@ CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
INSTALLATION_DIRS= include
-post-extract:
- ${LN} -f -s ${WRKDIR}/${LIBCXX} ${WRKDIR}/libcxx
-
-post-install:
- cd ${WRKSRC}/include && ${PAX} -rw . ${DESTDIR}${PREFIX}/include
-
.include "../../devel/cmake/build.mk"
BUILDLINK_DEPMETHOD.llvm= build
.include "../../wip/llvm/buildlink3.mk"
diff --git a/libunwind/PLIST b/libunwind/PLIST
index 606408eb9e..1978069b05 100644
--- a/libunwind/PLIST
+++ b/libunwind/PLIST
@@ -1,5 +1,4 @@
@comment $NetBSD: PLIST,v 1.3 2022/08/12 08:39:56 pin Exp $
-include/CMakeLists.txt
include/__libunwind_config.h
include/libunwind.h
include/libunwind.modulemap
diff --git a/libunwind/distinfo b/libunwind/distinfo
index 863feea188..aa042a6e84 100644
--- a/libunwind/distinfo
+++ b/libunwind/distinfo
@@ -1,15 +1,6 @@
$NetBSD: distinfo,v 1.32 2023/01/12 22:47:25 wiz Exp $
-BLAKE2s (cmake-20.1.8.src.tar.xz) = 39070395d68854d6d9781a700093a638e304bbf68888ba1e6bfb07e2deb01b57
-SHA512 (cmake-20.1.8.src.tar.xz) = 0ff6018c0753f208e990e45403c4ae5764a0ac83a8d80d8db7d3c7dbface14a7c8339893d8f757ff2d7b3662253ba356cf157ae7072a0be170a9dc028f4d7a74
-Size (cmake-20.1.8.src.tar.xz) = 8652 bytes
-BLAKE2s (libcxx-20.1.8.src.tar.xz) = 4be07d74ddef5f84a7a14130b9089358f9e831d868100bfa79d7e3540f3bcbbc
-SHA512 (libcxx-20.1.8.src.tar.xz) = a5e36d99a44755c26d2056b60578f5fd5e4d3712bc971a065655879e0487011cfef9e3c4f13a748df8766cc72078e53cbed8e4ec811ac0460089e41366657ee3
-Size (libcxx-20.1.8.src.tar.xz) = 4455756 bytes
-BLAKE2s (libunwind-20.1.8.src.tar.xz) = 75a1b3977136c96da2a227b5c3ddd030e4594aeaf16ab43b367e33cf1ddf4761
-SHA512 (libunwind-20.1.8.src.tar.xz) = edeac406abbf9fa98a794b9ca1a7524d10b0a43f919b4aac3c339344171d3bafe748c71bc06e709728b396779de7cabe36c2e594290dc7c1b19d29b0564efddb
-Size (libunwind-20.1.8.src.tar.xz) = 120780 bytes
-BLAKE2s (runtimes-20.1.8.src.tar.xz) = 858d82c606feac6a09a6186eaa44676adc1145006735a58b3fe6576504da9e4f
-SHA512 (runtimes-20.1.8.src.tar.xz) = 6b6e4cbec4488632a2489b1073cc0a3b359e2239a16d791a8c111d45d3e41bf30211c8362cbcc2e5c174f95d2b521721adafb3ba0d8631dce032566b6eb96d3b
-Size (runtimes-20.1.8.src.tar.xz) = 8340 bytes
+BLAKE2s (llvm-project-20.1.8.src.tar.xz) = c1587d5118d1d27f773127d6b72528b9d6f0eb78156b2679ebd4132369572e45
+SHA512 (llvm-project-20.1.8.src.tar.xz) = f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
+Size (llvm-project-20.1.8.src.tar.xz) = 147242952 bytes
SHA1 (patch-src_CMakeLists.txt) = a9a226497831d5ed54e2b61956f143943d9aa3f4
diff --git a/lld/Makefile b/lld/Makefile
index d3d717ad9e..bc97f31daf 100644
--- a/lld/Makefile
+++ b/lld/Makefile
@@ -2,8 +2,7 @@
.include "../../wip/llvm/version.mk"
-DISTNAME= lld-${LLVM_VERSION}.src
-PKGNAME= ${DISTNAME:S/.src//}
+PKGNAME= lld-${LLVM_VERSION}
CATEGORIES= devel
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
diff --git a/lld/distinfo b/lld/distinfo
index 912f739db8..4fa00401eb 100644
--- a/lld/distinfo
+++ b/lld/distinfo
@@ -1,13 +1,7 @@
$NetBSD: distinfo,v 1.21 2023/01/12 19:32:53 adam Exp $
-BLAKE2s (cmake-20.1.8.src.tar.xz) = 39070395d68854d6d9781a700093a638e304bbf68888ba1e6bfb07e2deb01b57
-SHA512 (cmake-20.1.8.src.tar.xz) = 0ff6018c0753f208e990e45403c4ae5764a0ac83a8d80d8db7d3c7dbface14a7c8339893d8f757ff2d7b3662253ba356cf157ae7072a0be170a9dc028f4d7a74
-Size (cmake-20.1.8.src.tar.xz) = 8652 bytes
-BLAKE2s (lld-20.1.8.src.tar.xz) = bbfb711cef99026bc3999bf08dd1c283ba20453c04dd0a6519c08a40efbd028d
-SHA512 (lld-20.1.8.src.tar.xz) = 305547d4eb16bf8b1c93a61463385a2467a71d3df5e1121265b806bd7563ea4549767c266a206eb55928b12b0dc13a5c67d264898231e50ebef49f1b3275d9f6
-Size (lld-20.1.8.src.tar.xz) = 1720228 bytes
-BLAKE2s (runtimes-20.1.8.src.tar.xz) = 858d82c606feac6a09a6186eaa44676adc1145006735a58b3fe6576504da9e4f
-SHA512 (runtimes-20.1.8.src.tar.xz) = 6b6e4cbec4488632a2489b1073cc0a3b359e2239a16d791a8c111d45d3e41bf30211c8362cbcc2e5c174f95d2b521721adafb3ba0d8631dce032566b6eb96d3b
-Size (runtimes-20.1.8.src.tar.xz) = 8340 bytes
+BLAKE2s (llvm-project-20.1.8.src.tar.xz) = c1587d5118d1d27f773127d6b72528b9d6f0eb78156b2679ebd4132369572e45
+SHA512 (llvm-project-20.1.8.src.tar.xz) = f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
+Size (llvm-project-20.1.8.src.tar.xz) = 147242952 bytes
SHA1 (patch-ELF_Config.h) = 484d0818bd4a92f2faafa1337d3f2f08cab4c0fc
SHA1 (patch-ELF_Options.td) = c81907d6e5e099ed2c26de972c6744b7197de3d3
diff --git a/lldb/Makefile b/lldb/Makefile
index 2c904f9ebc..a3d152df16 100644
--- a/lldb/Makefile
+++ b/lldb/Makefile
@@ -2,8 +2,7 @@
.include "../../wip/llvm/version.mk"
-DISTNAME= lldb-${LLVM_VERSION}.src
-PKGNAME= ${DISTNAME:S/.src//}
+PKGNAME= lldb-${LLVM_VERSION}
CATEGORIES= devel lang
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
diff --git a/lldb/distinfo b/lldb/distinfo
index 35394a2339..3d25ffd809 100644
--- a/lldb/distinfo
+++ b/lldb/distinfo
@@ -1,13 +1,7 @@
$NetBSD: distinfo,v 1.35 2023/01/12 19:32:53 adam Exp $
-BLAKE2s (cmake-20.1.8.src.tar.xz) = 39070395d68854d6d9781a700093a638e304bbf68888ba1e6bfb07e2deb01b57
-SHA512 (cmake-20.1.8.src.tar.xz) = 0ff6018c0753f208e990e45403c4ae5764a0ac83a8d80d8db7d3c7dbface14a7c8339893d8f757ff2d7b3662253ba356cf157ae7072a0be170a9dc028f4d7a74
-Size (cmake-20.1.8.src.tar.xz) = 8652 bytes
-BLAKE2s (lldb-20.1.8.src.tar.xz) = 9061da36d8c3f1425dc7c55b0040a89b05ca0228484548ca4df177f305b82c5c
-SHA512 (lldb-20.1.8.src.tar.xz) = d36d407894001a0176e2644473ac2d963f17d729c0add9d728114bb190bfd3805b1af4ba585059bf891006f56ad688388149872b4393754c92925542493e1529
-Size (lldb-20.1.8.src.tar.xz) = 10854872 bytes
-BLAKE2s (runtimes-20.1.8.src.tar.xz) = 858d82c606feac6a09a6186eaa44676adc1145006735a58b3fe6576504da9e4f
-SHA512 (runtimes-20.1.8.src.tar.xz) = 6b6e4cbec4488632a2489b1073cc0a3b359e2239a16d791a8c111d45d3e41bf30211c8362cbcc2e5c174f95d2b521721adafb3ba0d8631dce032566b6eb96d3b
-Size (runtimes-20.1.8.src.tar.xz) = 8340 bytes
+BLAKE2s (llvm-project-20.1.8.src.tar.xz) = c1587d5118d1d27f773127d6b72528b9d6f0eb78156b2679ebd4132369572e45
+SHA512 (llvm-project-20.1.8.src.tar.xz) = f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
+Size (llvm-project-20.1.8.src.tar.xz) = 147242952 bytes
SHA1 (patch-cmake_modules_LLDBStandalone.cmake) = 773d420c3fd2c9b4af6af9d42c5778e96a1ae52b
SHA1 (patch-source_API_CMakeLists.txt) = 32840580507b3a7d05e76485da5830e92a76bb06
diff --git a/llvm/Makefile b/llvm/Makefile
index 36ffe777c8..38b73fcd2c 100644
--- a/llvm/Makefile
+++ b/llvm/Makefile
@@ -25,8 +25,7 @@
.include "version.mk"
-DISTNAME= llvm-${LLVM_VERSION}.src
-PKGNAME= ${DISTNAME:S/.src//}
+PKGNAME= llvm-${LLVM_VERSION}
CATEGORIES= lang devel
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
diff --git a/llvm/distinfo b/llvm/distinfo
index f24c90fda0..0210880a19 100644
--- a/llvm/distinfo
+++ b/llvm/distinfo
@@ -1,14 +1,8 @@
$NetBSD: distinfo,v 1.41 2023/03/05 17:26:09 he Exp $
-BLAKE2s (cmake-20.1.8.src.tar.xz) = 39070395d68854d6d9781a700093a638e304bbf68888ba1e6bfb07e2deb01b57
-SHA512 (cmake-20.1.8.src.tar.xz) = 0ff6018c0753f208e990e45403c4ae5764a0ac83a8d80d8db7d3c7dbface14a7c8339893d8f757ff2d7b3662253ba356cf157ae7072a0be170a9dc028f4d7a74
-Size (cmake-20.1.8.src.tar.xz) = 8652 bytes
-BLAKE2s (llvm-20.1.8.src.tar.xz) = 040b14dea1435ccf5b4ce08e4d2310c880f421ff5e7e0bcd686fa32e53708979
-SHA512 (llvm-20.1.8.src.tar.xz) = 4781d494fcb9a3d21cc9b76718e15f2d357573bfec53d9779c9ad6e871103beccf4023afc8f60ef1d463acde58c083e083cdc5a74001a3da361d8dbf160b01b7
-Size (llvm-20.1.8.src.tar.xz) = 72698776 bytes
-BLAKE2s (runtimes-20.1.8.src.tar.xz) = 858d82c606feac6a09a6186eaa44676adc1145006735a58b3fe6576504da9e4f
-SHA512 (runtimes-20.1.8.src.tar.xz) = 6b6e4cbec4488632a2489b1073cc0a3b359e2239a16d791a8c111d45d3e41bf30211c8362cbcc2e5c174f95d2b521721adafb3ba0d8631dce032566b6eb96d3b
-Size (runtimes-20.1.8.src.tar.xz) = 8340 bytes
+BLAKE2s (llvm-project-20.1.8.src.tar.xz) = c1587d5118d1d27f773127d6b72528b9d6f0eb78156b2679ebd4132369572e45
+SHA512 (llvm-project-20.1.8.src.tar.xz) = f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
+Size (llvm-project-20.1.8.src.tar.xz) = 147242952 bytes
SHA1 (patch-CMakeLists.txt) = c53cef61bdaeaf5216b78330992357a632a2b0b2
SHA1 (patch-cmake_config-ix.cmake) = f5cd0c949d35020d1051f95417e7944aa71a3d54
SHA1 (patch-cmake_modules_AddLLVM.cmake) = 4e6668e0c3e13423ce3e19304f4ad60f66d41562
diff --git a/llvm/version.mk b/llvm/version.mk
index 12a3c3acaf..8f444949d3 100644
--- a/llvm/version.mk
+++ b/llvm/version.mk
@@ -15,25 +15,17 @@
# used by parallel/openmp
LLVM_VERSION= 20.1.8
+
+DISTNAME= llvm-project-${LLVM_VERSION}.src
MASTER_SITES= ${MASTER_SITE_GITHUB:=llvm/}
GITHUB_PROJECT= llvm-project
GITHUB_RELEASE= llvmorg-${PKGVERSION_NOREV}
EXTRACT_SUFX= .tar.xz
-LLVM_MAJOR_VERSION= ${LLVM_VERSION:tu:C/\\.[[:digit:]\.]*//}
+WRKSRC= ${WRKDIR}/${DISTNAME}/${PKGBASE:S/wasi-//}
-# As of v15.0.0 llvm requires cmake source code to build
-CMAKE_DIST= cmake-${LLVM_VERSION}.src
-RUNTIMES_DIST= runtimes-${LLVM_VERSION}.src
-EXTRA_DIST+= ${CMAKE_DIST}${EXTRACT_SUFX} ${RUNTIMES_DIST}${EXTRACT_SUFX}
-SITES.${CMAKE_DIST}${EXTRACT_SUFX}= \
- ${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
-SITES.${RUNTIMES_DIST}${EXTRACT_SUFX}= \
- ${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
-DISTFILES= ${DEFAULT_DISTFILES} ${EXTRA_DIST}
+LLVM_MAJOR_VERSION= ${LLVM_VERSION:tu:C/\\.[[:digit:]\.]*//}
-.PHONY: llvm-cmake-modules
-post-extract: llvm-cmake-modules
-llvm-cmake-modules:
- ${LN} -f -s ${WRKDIR}/${CMAKE_DIST} ${WRKDIR}/cmake
- ${LN} -f -s ${WRKDIR}/${RUNTIMES_DIST} ${WRKDIR}/runtimes
+EXTRACT_ELEMENTS= ${DISTNAME}/${PKGBASE:S/wasi-//}
+EXTRACT_ELEMENTS+= ${DISTNAME}/cmake
+EXTRACT_ELEMENTS+= ${DISTNAME}/runtimes
diff --git a/mlir/Makefile b/mlir/Makefile
index 32e51436a6..db04e012a4 100644
--- a/mlir/Makefile
+++ b/mlir/Makefile
@@ -2,8 +2,7 @@
.include "../../wip/llvm/version.mk"
-DISTNAME= mlir-${LLVM_VERSION}.src
-PKGNAME= ${DISTNAME:S/.src//}
+PKGNAME= mlir-${LLVM_VERSION}
CATEGORIES= lang devel
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
diff --git a/mlir/distinfo b/mlir/distinfo
index cf9593f5fc..c715ffa200 100644
--- a/mlir/distinfo
+++ b/mlir/distinfo
@@ -1,13 +1,7 @@
$NetBSD: distinfo,v 1.35 2015/09/11 01:21:57 tnn Exp $
-BLAKE2s (cmake-20.1.8.src.tar.xz) = 39070395d68854d6d9781a700093a638e304bbf68888ba1e6bfb07e2deb01b57
-SHA512 (cmake-20.1.8.src.tar.xz) = 0ff6018c0753f208e990e45403c4ae5764a0ac83a8d80d8db7d3c7dbface14a7c8339893d8f757ff2d7b3662253ba356cf157ae7072a0be170a9dc028f4d7a74
-Size (cmake-20.1.8.src.tar.xz) = 8652 bytes
-BLAKE2s (mlir-20.1.8.src.tar.xz) = bf6421d3d665f1998c15808782acb785e5d96b42ac5c215b1b077ec43d33f1fc
-SHA512 (mlir-20.1.8.src.tar.xz) = f0f2be179d7e3d9697eca1be710c5be91d84f5e3b7d4a8e6ab9c686898cf3dc454d9c0ba3a5d9da3fa57de341b68c9d162f56659d0b66ed478fe5f4503e02311
-Size (mlir-20.1.8.src.tar.xz) = 6824924 bytes
-BLAKE2s (runtimes-20.1.8.src.tar.xz) = 858d82c606feac6a09a6186eaa44676adc1145006735a58b3fe6576504da9e4f
-SHA512 (runtimes-20.1.8.src.tar.xz) = 6b6e4cbec4488632a2489b1073cc0a3b359e2239a16d791a8c111d45d3e41bf30211c8362cbcc2e5c174f95d2b521721adafb3ba0d8631dce032566b6eb96d3b
-Size (runtimes-20.1.8.src.tar.xz) = 8340 bytes
+BLAKE2s (llvm-project-20.1.8.src.tar.xz) = c1587d5118d1d27f773127d6b72528b9d6f0eb78156b2679ebd4132369572e45
+SHA512 (llvm-project-20.1.8.src.tar.xz) = f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
+Size (llvm-project-20.1.8.src.tar.xz) = 147242952 bytes
SHA1 (patch-cmake_modules_MLIRConfig.cmake.in) = 0fb129cb22bdb7bca328d5526904482b6081a209
SHA1 (patch-tools_mlir-tblgen_CMakeLists.txt) = 7b78acbf8a85443f2cc3f13786bbbda25b0b8d74
diff --git a/openmp/Makefile b/openmp/Makefile
index 85343cb776..f45e93b201 100644
--- a/openmp/Makefile
+++ b/openmp/Makefile
@@ -2,8 +2,7 @@
.include "../../wip/llvm/version.mk"
-DISTNAME= openmp-${LLVM_VERSION}.src
-PKGNAME= ${DISTNAME:S/.src//}
+PKGNAME= openmp-${LLVM_VERSION}
CATEGORIES= parallel
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
diff --git a/openmp/distinfo b/openmp/distinfo
index 9ffddc75ae..f6cad30211 100644
--- a/openmp/distinfo
+++ b/openmp/distinfo
@@ -1,11 +1,5 @@
$NetBSD: distinfo,v 1.17 2023/01/12 19:32:54 adam Exp $
-BLAKE2s (cmake-20.1.8.src.tar.xz) = 39070395d68854d6d9781a700093a638e304bbf68888ba1e6bfb07e2deb01b57
-SHA512 (cmake-20.1.8.src.tar.xz) = 0ff6018c0753f208e990e45403c4ae5764a0ac83a8d80d8db7d3c7dbface14a7c8339893d8f757ff2d7b3662253ba356cf157ae7072a0be170a9dc028f4d7a74
-Size (cmake-20.1.8.src.tar.xz) = 8652 bytes
-BLAKE2s (openmp-20.1.8.src.tar.xz) = ed48fbe17f01e502e283a82a55d35e4b29cf44094d30bebbed85ec361bf61f8c
-SHA512 (openmp-20.1.8.src.tar.xz) = 79ed5737996c9f0806c610e5afaf104df136f8752169715bea913fe93e8d21700170559df421312c8202465d37cd7a7bdd4f9dc88022ac69e96f83dbaeb2f3ba
-Size (openmp-20.1.8.src.tar.xz) = 1093976 bytes
-BLAKE2s (runtimes-20.1.8.src.tar.xz) = 858d82c606feac6a09a6186eaa44676adc1145006735a58b3fe6576504da9e4f
-SHA512 (runtimes-20.1.8.src.tar.xz) = 6b6e4cbec4488632a2489b1073cc0a3b359e2239a16d791a8c111d45d3e41bf30211c8362cbcc2e5c174f95d2b521721adafb3ba0d8631dce032566b6eb96d3b
-Size (runtimes-20.1.8.src.tar.xz) = 8340 bytes
+BLAKE2s (llvm-project-20.1.8.src.tar.xz) = c1587d5118d1d27f773127d6b72528b9d6f0eb78156b2679ebd4132369572e45
+SHA512 (llvm-project-20.1.8.src.tar.xz) = f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
+Size (llvm-project-20.1.8.src.tar.xz) = 147242952 bytes
diff --git a/polly/Makefile b/polly/Makefile
index b5bd2f6a4f..af44359c1c 100644
--- a/polly/Makefile
+++ b/polly/Makefile
@@ -2,8 +2,7 @@
.include "../../wip/llvm/version.mk"
-DISTNAME= polly-${LLVM_VERSION}.src
-PKGNAME= ${DISTNAME:S/.src//}
+PKGNAME= polly-${LLVM_VERSION}
CATEGORIES= devel
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
diff --git a/polly/distinfo b/polly/distinfo
index 15d5135d40..2920c2a36b 100644
--- a/polly/distinfo
+++ b/polly/distinfo
@@ -1,11 +1,5 @@
$NetBSD: distinfo,v 1.29 2023/01/12 19:32:53 adam Exp $
-BLAKE2s (cmake-20.1.8.src.tar.xz) = 39070395d68854d6d9781a700093a638e304bbf68888ba1e6bfb07e2deb01b57
-SHA512 (cmake-20.1.8.src.tar.xz) = 0ff6018c0753f208e990e45403c4ae5764a0ac83a8d80d8db7d3c7dbface14a7c8339893d8f757ff2d7b3662253ba356cf157ae7072a0be170a9dc028f4d7a74
-Size (cmake-20.1.8.src.tar.xz) = 8652 bytes
-BLAKE2s (polly-20.1.8.src.tar.xz) = ba81d5ca6de1452cd453c3e223fd931de6cc82f789d105d5e097c0ea165336ef
-SHA512 (polly-20.1.8.src.tar.xz) = e871f047fb875583006435fa6d4f196d998e743802ce1c070cf092770aa513f08a8cfa880269d08ee9ccc1c8c595fd75beaf7ab5dc59a5bdc45c37e91c9db8ff
-Size (polly-20.1.8.src.tar.xz) = 9168640 bytes
-BLAKE2s (runtimes-20.1.8.src.tar.xz) = 858d82c606feac6a09a6186eaa44676adc1145006735a58b3fe6576504da9e4f
-SHA512 (runtimes-20.1.8.src.tar.xz) = 6b6e4cbec4488632a2489b1073cc0a3b359e2239a16d791a8c111d45d3e41bf30211c8362cbcc2e5c174f95d2b521721adafb3ba0d8631dce032566b6eb96d3b
-Size (runtimes-20.1.8.src.tar.xz) = 8340 bytes
+BLAKE2s (llvm-project-20.1.8.src.tar.xz) = c1587d5118d1d27f773127d6b72528b9d6f0eb78156b2679ebd4132369572e45
+SHA512 (llvm-project-20.1.8.src.tar.xz) = f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
+Size (llvm-project-20.1.8.src.tar.xz) = 147242952 bytes
diff --git a/wasi-compiler-rt/Makefile b/wasi-compiler-rt/Makefile
index bf25837a20..b8c9be1994 100644
--- a/wasi-compiler-rt/Makefile
+++ b/wasi-compiler-rt/Makefile
@@ -2,8 +2,7 @@
.include "../../wip/llvm/version.mk"
-DISTNAME= compiler-rt-${LLVM_VERSION}.src
-PKGNAME= ${DISTNAME:S/.src//:S/compiler-rt-/wasi-compiler-rt-/}
+PKGNAME= wasi-compiler-rt-${LLVM_VERSION}
CATEGORIES= lang devel
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
diff --git a/wasi-libcxx/Makefile b/wasi-libcxx/Makefile
index 56eae5abf8..ca2357a183 100644
--- a/wasi-libcxx/Makefile
+++ b/wasi-libcxx/Makefile
@@ -2,8 +2,11 @@
.include "../../wip/llvm/version.mk"
-DISTNAME= libcxxabi-${LLVM_VERSION}.src
-PKGNAME= ${DISTNAME:S/.src//:S/libcxxabi-/wasi-libcxx-/}
+EXTRACT_ELEMENTS+= ${DISTNAME}/libc
+EXTRACT_ELEMENTS+= ${DISTNAME}/libcxx
+EXTRACT_ELEMENTS+= ${DISTNAME}/libcxxabi
+
+PKGNAME= wasi-libcxx-${LLVM_VERSION}
CATEGORIES= lang devel
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -13,15 +16,6 @@ LICENSE= apache-2.0
WRKSRC= ${WRKDIR}
-# libcxx requires libcxxabi's cxxabi.h to build, but libcxxabi requires
-# libcxx's includes to build, so we have this unholy extra distfiles thing
-# in both of them to get them to build against each other without causing
-# circular dependencies. This must be kept in sync with libcxxabi/Makefile.
-LIBCXX= libcxx-${LLVM_VERSION}.src
-EXTRA_DIST+= ${LIBCXX}${EXTRACT_SUFX}
-SITES.${LIBCXX}${EXTRACT_SUFX}= \
- ${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
-
TOOL_DEPENDS+= lld-[0-9]*:../../wip/lld
# Workaround for header conflicts
@@ -149,8 +143,6 @@ CPPFLAGS.NetBSD+= -D__DEFINED_max_align_t=1
post-extract:
${MKDIR} ${WRKDIR}/build_libcxx
${MKDIR} ${WRKDIR}/build_libcxxabi
- ${LN} -f -s ${WRKDIR}/${DISTNAME} ${WRKDIR}/libcxxabi
- ${LN} -f -s ${WRKDIR}/${LIBCXX} ${WRKDIR}/libcxx
do-configure:
cd ${WRKSRC} && cd build_libcxx && \
diff --git a/wasi-libcxx/distinfo b/wasi-libcxx/distinfo
index a5253a61b3..bb75b2f6f8 100644
--- a/wasi-libcxx/distinfo
+++ b/wasi-libcxx/distinfo
@@ -1,17 +1,8 @@
$NetBSD: distinfo,v 1.8 2023/01/12 19:32:54 adam Exp $
-BLAKE2s (cmake-19.1.7.src.tar.xz) = 420fe22b00305abc7924fd6cb58bc1ba1c17c6e79a6b51ffb406163db7f1805c
-SHA512 (cmake-19.1.7.src.tar.xz) = 3ff56e1a61dbace35d8c168ad5c94c5a09d92eb683494bfe1deabcb3640cf79b7422d44903d049d2298d54c2874f9a60c4f13f6795a3949e7eaefd5d42e62621
-Size (cmake-19.1.7.src.tar.xz) = 9300 bytes
-BLAKE2s (libcxx-19.1.7.src.tar.xz) = 2b55587e75dc39ca13d12b5edd3bbb30a143a51ba34cd1fe4ae83365636f93f0
-SHA512 (libcxx-19.1.7.src.tar.xz) = 0b12b5e41ca6efda2f61a421084525de6c2726998907f641fc5d095579f858150cba0202f66a7c1f6010982610878c828bc80736c9e10ad2857fa7a3bc1dcc3c
-Size (libcxx-19.1.7.src.tar.xz) = 4718816 bytes
-BLAKE2s (libcxxabi-19.1.7.src.tar.xz) = d3e7a4d15ab26d9dca872b9f5b920f157e333b6535654203f030cc6ed4e2a19b
-SHA512 (libcxxabi-19.1.7.src.tar.xz) = 14b96835625f56fff34b2cebf7ed4dc9edb979ed4af3e0b685ea3f407ffd414e649182f8fba609a277d824cf1d092b8a26c99663c17ff4247367f0804df5bf95
-Size (libcxxabi-19.1.7.src.tar.xz) = 583696 bytes
-BLAKE2s (runtimes-19.1.7.src.tar.xz) = 196d02c1a9acc62eb19e300df6e2213312b3522a518322dd7eab47559e0884e0
-SHA512 (runtimes-19.1.7.src.tar.xz) = 6b87dafe809b49560c72b9872f4e2795de70c66000af2272ad46fc044e5c88a3415aaa444f80d37946da14127cd4645b2a7420e3e184641215f415b709d801d8
-Size (runtimes-19.1.7.src.tar.xz) = 7224 bytes
+BLAKE2s (llvm-project-20.1.8.src.tar.xz) = c1587d5118d1d27f773127d6b72528b9d6f0eb78156b2679ebd4132369572e45
+SHA512 (llvm-project-20.1.8.src.tar.xz) = f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
+Size (llvm-project-20.1.8.src.tar.xz) = 147242952 bytes
SHA1 (patch-libcxx_include_CMakeLists.txt) = 1b525baf1c510d50f170feae8111377c97204f65
SHA1 (patch-libcxx_src_CMakeLists.txt) = 08b4666830c7eb85a47c9b0d5f523e613b2f20d4
SHA1 (patch-libcxxabi_src_CMakeLists.txt) = 2bd130551c3e7a3b66732358662fbd28f67a4695
Home |
Main Index |
Thread Index |
Old Index