CVS commit: pkgsrc/lang/libLLVM

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jan 24 23:37:28 UTC 2023

Modified Files:
        pkgsrc/lang/libLLVM: Makefile

Log Message:
libLLVM: finish converting to cmake/build.mk

pkglint cleanup while here


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/lang/libLLVM/Makefile

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

Modified files:

Index: pkgsrc/lang/libLLVM/Makefile
diff -u pkgsrc/lang/libLLVM/Makefile:1.44 pkgsrc/lang/libLLVM/Makefile:1.45
--- pkgsrc/lang/libLLVM/Makefile:1.44   Tue Jan 24 18:36:28 2023
+++ pkgsrc/lang/libLLVM/Makefile        Tue Jan 24 23:37:27 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2023/01/24 18:36:28 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2023/01/24 23:37:27 wiz Exp $
 
 DISTNAME=      llvm-13.0.1.src
 PKGNAME=       ${DISTNAME:S/llvm/libLLVM/:S/.src//}
@@ -85,7 +85,7 @@ REPLACE_PYTHON+=      utils/llvm-compilers-ch
 REPLACE_PYTHON+=       utils/llvm-lit/llvm-lit.in
 
 TEST_TARGET=           check
-TEST_ENV+=             LD_LIBRARY_PATH=${WRKDIR}/build/lib
+TEST_ENV+=             LD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/lib
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -107,7 +107,7 @@ PLIST.notdylib=     yes
 PLIST_SUBST+=  SOEXT=${SOEXT}
 PLIST_SUBST+=  LLVM_LIBNAME=${LLVM_LIBNAME}
 
-.if !empty(MACHINE_ARCH:Mpowerpc*)
+.if ${MACHINE_ARCH:Mpowerpc*}
 # Needed to avoid "relocation truncated to fit: R_PPC_REL24"
 CFLAGS+=       -mlongcall
 CXXFLAGS+=     -mlongcall
@@ -115,13 +115,13 @@ CXXFLAGS+=        -mlongcall
 .    if ${OPSYS_VERSION} >= 099917
 # The -mno-pltseq option is not available in gcc7, but is needed for
 # the above-mentioned relocation truncation issue in newer GCC
-CFLAGS+=        -mno-pltseq
-CXXFLAGS+=      -mno-pltseq
+CFLAGS+=       -mno-pltseq
+CXXFLAGS+=     -mno-pltseq
 .    endif # (just drop for older NetBSD)
 .  else # Not NetBSD
 # Let's just insist on newer gcc -- untested.
-CFLAGS+=        -mno-pltseq
-CXXFLAGS+=      -mno-pltseq
+CFLAGS+=       -mno-pltseq
+CXXFLAGS+=     -mno-pltseq
 .  endif
 .endif
 
@@ -134,9 +134,10 @@ post-extract:
        cp ../../mk/gnu-config/${f} ${WRKSRC}/cmake/${f}
 .endfor
 
+INSTALLATION_DIRS+=    lib/libLLVM
+
 post-install:
-       ${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/lib/libLLVM
-       ${INSTALL_LIB} ${WRKDIR}/build/lib/${LLVM_LIBNAME}      \
+       ${INSTALL_LIB} ${WRKSRC}/${CMAKE_BUILD_DIR}/lib/${LLVM_LIBNAME} \
                ${DESTDIR}${PREFIX}/lib/libLLVM/${LLVM_LIBNAME}
 .if ${OPSYS} == "Darwin"
        install_name_tool -id   \