CVS commit: pkgsrc/editors/codelite

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Mon Feb  5 14:32:25 UTC 2024

Modified Files:
        pkgsrc/editors/codelite: Makefile distinfo
Added Files:
        pkgsrc/editors/codelite/patches: patch-Plugin_CompilerLocatorCLANG.cpp
            patch-Plugin_CompilerLocatorGCC.cpp

Log Message:
Codelite: Use gmake instead of just make
Codelite generates gmake Makefiles,
so use gmake from pkgsrc to make them
build correctly.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/editors/codelite/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/editors/codelite/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/editors/codelite/patches/patch-Plugin_CompilerLocatorCLANG.cpp \
    pkgsrc/editors/codelite/patches/patch-Plugin_CompilerLocatorGCC.cpp

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

Modified files:

Index: pkgsrc/editors/codelite/Makefile
diff -u pkgsrc/editors/codelite/Makefile:1.60 pkgsrc/editors/codelite/Makefile:1.61
--- pkgsrc/editors/codelite/Makefile:1.60       Tue Nov 14 14:01:42 2023
+++ pkgsrc/editors/codelite/Makefile    Mon Feb  5 14:32:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2023/11/14 14:01:42 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2024/02/05 14:32:25 nros Exp $
 
 DISTNAME=      codelite-17.0.0
 PKGREVISION=   3
@@ -14,7 +14,7 @@ LICENSE=      gnu-gpl-v2
 WRKSRC=                ${WRKDIR}/${DISTNAME:R}
 
 USE_LANGUAGES=         c c++
-USE_TOOLS+=            pkg-config bash
+USE_TOOLS+=            pkg-config bash gmake:run
 USE_CXX_FEATURES=      c++11
 
 CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_STANDARD=11

Index: pkgsrc/editors/codelite/distinfo
diff -u pkgsrc/editors/codelite/distinfo:1.15 pkgsrc/editors/codelite/distinfo:1.16
--- pkgsrc/editors/codelite/distinfo:1.15       Wed Jan  3 13:30:49 2024
+++ pkgsrc/editors/codelite/distinfo    Mon Feb  5 14:32:25 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2024/01/03 13:30:49 nros Exp $
+$NetBSD: distinfo,v 1.16 2024/02/05 14:32:25 nros Exp $
 
 BLAKE2s (codelite-17.0.0.tar.gz) = f87eff56ee8f9af203a6212cc19e9031f70a396982a9f6fe276dc879f960f4dc
 SHA512 (codelite-17.0.0.tar.gz) = e36b6dcc37cd036a301a78714e8d5f2a61714b58fe006398fe0e959be59992dd7cc7d2a59661d364e371c750ca15cc21d4085d207738a7e3ede09ec0de125cff
@@ -17,6 +17,8 @@ SHA1 (patch-LiteEditor_CMakeLists.txt) =
 SHA1 (patch-LiteEditor_clConfigurationSelectionCtrl.h) = 3432007081056ca29f71324f47d994e00a592d86
 SHA1 (patch-LiteEditor_editorsettingsdockingwidows.cpp) = 01e9e230ff5c4596dec590e3515fca63166738d9
 SHA1 (patch-LiteEditor_tabgroupmanager.h) = b537238557f99ad83eb39937ce16f65caab45783
+SHA1 (patch-Plugin_CompilerLocatorCLANG.cpp) = eb47a76bf7ed60d93766f3e3b9585c36a61bcd33
+SHA1 (patch-Plugin_CompilerLocatorGCC.cpp) = 92579de2c4dce08a96bdc222abb59aa914829d73
 SHA1 (patch-Plugin_DiffUI.h) = 66780d7ddc659df446f5f6361c8c69d966dfeb5d
 SHA1 (patch-Plugin_clEditorEditEventsHandler.cpp) = dc354802d62160a101983931526479e566680e89
 SHA1 (patch-Plugin_clFileSystemWorkspaceView.hpp) = 3d45e377e1721daf612742d6d3bc032aea1441bf

Added files:

Index: pkgsrc/editors/codelite/patches/patch-Plugin_CompilerLocatorCLANG.cpp
diff -u /dev/null pkgsrc/editors/codelite/patches/patch-Plugin_CompilerLocatorCLANG.cpp:1.1
--- /dev/null   Mon Feb  5 14:32:25 2024
+++ pkgsrc/editors/codelite/patches/patch-Plugin_CompilerLocatorCLANG.cpp       Mon Feb  5 14:32:25 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-Plugin_CompilerLocatorCLANG.cpp,v 1.1 2024/02/05 14:32:25 nros Exp $
+
+Codelite generates gmake Makefiles, so use pkgsrc gmake to make
+them build correctly
+
+--- Plugin/CompilerLocatorCLANG.cpp.orig       2023-01-11 21:18:07.000000000 +0000
++++ Plugin/CompilerLocatorCLANG.cpp
+@@ -220,7 +220,7 @@ void CompilerLocatorCLANG::AddTools(Comp
+         AddTool(compiler, "MAKE", "mingw32-make.exe", makeExtraArgs);
+     }
+ #else
+-    AddTool(compiler, "MAKE", "make", makeExtraArgs);
++    AddTool(compiler, "MAKE", "gmake", makeExtraArgs);
+ #endif
+ }
+ 
Index: pkgsrc/editors/codelite/patches/patch-Plugin_CompilerLocatorGCC.cpp
diff -u /dev/null pkgsrc/editors/codelite/patches/patch-Plugin_CompilerLocatorGCC.cpp:1.1
--- /dev/null   Mon Feb  5 14:32:25 2024
+++ pkgsrc/editors/codelite/patches/patch-Plugin_CompilerLocatorGCC.cpp Mon Feb  5 14:32:25 2024
@@ -0,0 +1,21 @@
+$NetBSD: patch-Plugin_CompilerLocatorGCC.cpp,v 1.1 2024/02/05 14:32:25 nros Exp $
+
+Codelite generates gmake Makefiles, so use pkgsrc gmake to make
+them build correctly
+
+--- Plugin/CompilerLocatorGCC.cpp.orig 2023-01-11 21:18:07.000000000 +0000
++++ Plugin/CompilerLocatorGCC.cpp
+@@ -161,12 +161,11 @@ void CompilerLocatorGCC::AddTools(Compil
+ #endif
+     toolFile.SetFullName("gcc");
+     AddTool(compiler, "CC", toolFile.GetFullPath(), suffix);
+-    toolFile.SetFullName("make");
+     wxString makeExtraArgs;
+     if(wxThread::GetCPUCount() > 1) {
+         makeExtraArgs << "-j" << wxThread::GetCPUCount();
+     }
+-    AddTool(compiler, "MAKE", toolFile.GetFullPath(), "", makeExtraArgs);
++    AddTool(compiler, "MAKE", "gmake", "", makeExtraArgs);
+ 
+     // ++++-----------------------------------------------------------------
+     // From this point on, we use /usr/bin only