On 4/14/2022 2:57 PM, Brian Callahan wrote:
> Hi Ryan --
>
> On 4/14/2022 1:58 PM, Ryan Boggs wrote:
>> Hi Brian,
>>
>> On Tue, Apr 12, 2022 at 6:42 PM Brian Callahan wrote:
>>>
>>> Hi ports --
>>>
>>> Here is a diff to update the LDC compiler.
>>> The big changelog is here:
>>> https://github.com/ldc-developers/ldc/releases/tag/v1.29.0
>>>
>>> All is good on my machine, looking for tests/oks.
>> This failed for me during the build of ldc-build-runtime complaining
>> about undefined symbols. Is there something else I need to set for
>> this to build successfully? Please let me know.
>>
>
> Can you send me a build log off-list? That way I can cross-reference
> what I have here.
>
> Thanks.
>
> ~Brian
>
New diff attached to fix a build error if you have the old LDC 1.28.0
installed on your system. Problem found the hard way by Ryan Boggs.
OK?
~BrianIndex: Makefile
===
RCS file: /cvs/ports/lang/ldc/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile11 Mar 2022 19:29:04 - 1.3
+++ Makefile18 Apr 2022 23:23:21 -
@@ -2,12 +2,11 @@
# Can use GDC to create said bootstrap compiler.
ONLY_FOR_ARCHS = amd64
-V =1.28.0
+V =1.29.0
COMMENT = LLVM D Compiler
DISTFILES =ldc-${V}-src.tar.gz:0 \
ldc-${V}-bootstrap.tar.gz:1
PKGNAME = ldc-${V}
-REVISION = 0
CATEGORIES = lang
HOMEPAGE = https://wiki.dlang.org/LDC
@@ -18,7 +17,7 @@ MAINTAINER = Brian Callahan https://github.com/ldc-developers/ldc/releases/download/v${V}/
MASTER_SITES1 =
https://github.com/ibara/ldc/releases/download/bootstrap-${V}/
@@ -30,8 +29,6 @@ MODULES = devel/cmake
BUILD_DEPENDS =devel/llvm
-RUN_DEPENDS = devel/llvm
-
# COMPILE_D_MODULES_SEPARATELY=ON lets ldc compile with sane memory limits.
CONFIGURE_ARGS = -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
-DCOMPILE_D_MODULES_SEPARATELY=ON \
@@ -52,17 +49,19 @@ WRKDIST = ${WRKDIR}/ldc-${V}-src
post-patch:
sed -i 's#/usr/local/include/d#${WRKDIR}/ldc-${V}-bootstrap/d#g' \
${WRKDIR}/ldc-${V}-bootstrap/${MACHINE_ARCH}/ldc2.conf
- sed -i
's#"/usr/local/lib",#"/usr/local/lib","${WRKDIR}/ldc-${V}-bootstrap/${MACHINE_ARCH}",#g'
\
+ sed -i
's#"/usr/local/lib",#"${WRKDIR}/ldc-${V}-bootstrap/${MACHINE_ARCH}","/usr/local/lib",#g'
\
${WRKDIR}/ldc-${V}-bootstrap/${MACHINE_ARCH}/ldc2.conf
# Same trick as with flang:
# Replace the shared LLVM.so library with the static libraries.
# Fixes runtime warnings about symbol size mismatches.
-# Revisit on occasion (maybe these warning go away someday?)
+# Revisit on occasion (maybe these warnings go away someday?)
post-configure:
sed -i \
- 's,-lLLVM-11,`${LOCALBASE}/bin/llvm-config --libs all --link-static
--ignore-libllvm` -lz,g' \
- ${WRKBUILD}/build.ninja
+ 's,-lLLVM-13,`${LOCALBASE}/bin/llvm-config --libs all --link-static
--ignore-libllvm` -lz,g' \
+ ${WRKBUILD}/build.ninja
+ sed -i 's#-lz -L/usr/local/lib -Wl,--export-dynamic#-lz
-Wl,--export-dynamic#g' \
+ ${WRKBUILD}/build.ninja
# Move the default ldc2.conf to its proper packaging location.
post-install:
Index: distinfo
===
RCS file: /cvs/ports/lang/ldc/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo21 Nov 2021 13:51:47 - 1.1.1.1
+++ distinfo18 Apr 2022 23:23:21 -
@@ -1,4 +1,4 @@
-SHA256 (ldc-1.28.0-bootstrap.tar.gz) =
poUGzPKLeyBbrEH4Gqak/5OLWK5IQnePezNSt0MHxKA=
-SHA256 (ldc-1.28.0-src.tar.gz) = F/7ou1Nby4zaCkWUdSZVXEbARfMCpzScyHEbJU5Uzwk=
-SIZE (ldc-1.28.0-bootstrap.tar.gz) = 41093692
-SIZE (ldc-1.28.0-src.tar.gz) = 7923347
+SHA256 (ldc-1.29.0-bootstrap.tar.gz) =
s+y1ZElfjx5h+gdCoLgQPK5A6/3qSWAPAZ78mMEw5Vc=
+SHA256 (ldc-1.29.0-src.tar.gz) = 0MBm65ZUZ2JdnF51wAxYNFG5/6NjYB+eNydcqKiuoUA=
+SIZE (ldc-1.29.0-bootstrap.tar.gz) = 44543868
+SIZE (ldc-1.29.0-src.tar.gz) = 8080420
Index: patches/patch-driver_linker-gcc_cpp
===
RCS file: /cvs/ports/lang/ldc/patches/patch-driver_linker-gcc_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-driver_linker-gcc_cpp
--- patches/patch-driver_linker-gcc_cpp 11 Mar 2022 19:29:04 - 1.2
+++ patches/patch-driver_linker-gcc_cpp 18 Apr 2022 23:23:21 -
@@ -19,12 +19,13 @@ Index: driver/linker-gcc.cpp
args.push_back("-lc++");
break;
default:
-@@ -663,11 +663,13 @@ void ArgsBuilder::addDefaultPlatformLibs() {
+@@ -661,11 +661,14 @@ void ArgsBuilder::addDefaultPlatformLibs() {
args.push_back("-lrt");
args.push_back("-ldl");
// fallthrough
+ case llvm::Triple::OpenBSD:
+args.push_back("-lc++abi");
++args.push_back("-lexecinfo"); // for druntime backtrace
+ // fallthrough
