CVS commit: pkgsrc/devel/mold

["Frederic Cambus" <fcambus%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fcambus
Date:           Sat Sep 10 15:44:29 UTC 2022

Modified Files:
        pkgsrc/devel/mold: Makefile distinfo
Removed Files:
        pkgsrc/devel/mold/patches: patch-Makefile

Log Message:
mold: switch to using CMake to build the project.

The long term plan for mold is to drop the Makefile and only support
CMake in the future. As wiz@ pointed out, CMake is now called from the
Makefile anyway and is required, so it makes sense to switch now.

Python is now longer required as a build dependency, so clean those
bits also.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/mold/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/mold/distinfo
cvs rdiff -u -r1.13 -r0 pkgsrc/devel/mold/patches/patch-Makefile

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

Modified files:

Index: pkgsrc/devel/mold/Makefile
diff -u pkgsrc/devel/mold/Makefile:1.21 pkgsrc/devel/mold/Makefile:1.22
--- pkgsrc/devel/mold/Makefile:1.21     Sun Sep  4 14:37:15 2022
+++ pkgsrc/devel/mold/Makefile  Sat Sep 10 15:44:29 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2022/09/04 14:37:15 fcambus Exp $
+# $NetBSD: Makefile,v 1.22 2022/09/10 15:44:29 fcambus Exp $
 
 DISTNAME=      mold-1.4.2
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=rui314/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -10,9 +11,12 @@ HOMEPAGE=    https://github.com/rui314/mold
 COMMENT=       High performance drop-in replacement for existing Unix linkers
 LICENSE=       gnu-agpl-v3
 
-USE_TOOLS+=    gmake
 USE_LANGUAGES= c c++20
 
+USE_CMAKE=     yes
+
+CMAKE_ARGS+=   -DMOLD_USE_SYSTEM_MIMALLOC=ON -DMOLD_USE_SYSTEM_TBB=ON
+
 # Use <stdlib.h> on systems where <alloca.h> doesn't exist
 .if !exists(/usr/include/alloca.h)
 SUBST_CLASSES+=                alloca
@@ -21,12 +25,6 @@ SUBST_FILES.alloca=  elf/mold-wrapper.c
 SUBST_SED.alloca=      -e 's|<alloca.h>|<stdlib.h>|g'
 .endif
 
-MAKE_FLAGS+=   CFLAGS="${CFLAGS}"
-MAKE_FLAGS+=   CXXFLAGS="${CXXFLAGS}"
-MAKE_FLAGS+=   PREFIX="${PREFIX}"
-MAKE_FLAGS+=   MANDIR="${PREFIX}/${PKGMANDIR}"
-MAKE_FLAGS+=   SYSTEM_MIMALLOC=1 SYSTEM_TBB=1
-
 # This package uses a lot of C++20 features. GCC 10 is the oldest GCC that can
 # build it.
 GCC_REQD+=     10
@@ -35,17 +33,8 @@ GCC_REQD+=   10
 DL_AUTO_VARS=          yes
 PTHREAD_AUTO_VARS=     yes
 
-PYTHON_FOR_BUILD_ONLY= yes
-
-REPLACE_PYTHON+=       update-git-hash.py
-
-pre-configure:
-       # install phase uses python3 command
-       [ -h "${BUILDLINK_DIR}/bin/python3" ] || ${LN} -s ${PYTHONBIN} "${BUILDLINK_DIR}/bin/python3"
-
 .include "../../devel/mimalloc/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../lang/python/application.mk"
 .include "../../parallel/threadingbuildingblocks/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"

Index: pkgsrc/devel/mold/distinfo
diff -u pkgsrc/devel/mold/distinfo:1.19 pkgsrc/devel/mold/distinfo:1.20
--- pkgsrc/devel/mold/distinfo:1.19     Sun Sep  4 14:37:15 2022
+++ pkgsrc/devel/mold/distinfo  Sat Sep 10 15:44:29 2022
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.19 2022/09/04 14:37:15 fcambus Exp $
+$NetBSD: distinfo,v 1.20 2022/09/10 15:44:29 fcambus Exp $
 
 BLAKE2s (mold-1.4.2.tar.gz) = b3503211ccdad1117cfa5092a16687ac9690769df6d9c66095a2a69a02887dfb
 SHA512 (mold-1.4.2.tar.gz) = 17f543969e53737818b0be563aee39feac672f93e0fd712827523232b64eccb4629f3994c5a90de50b5f761886669e0946a8d463663725e774eb7d352de1ced1
 Size (mold-1.4.2.tar.gz) = 6287845 bytes
-SHA1 (patch-Makefile) = 30d38eb7a4ec68dae4bc6c6f1b2596a66df53898