pkgsrc-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: cmake not MAKE_JOBS_SAFE?



On Mon, Sep 14, 2015 at 06:53:27AM -0400, Greg Troxel wrote:
> The basic issue seems to be that cmake has the notion that on netbsd it
> shoudl use /usr/pkg/lib/libncurses.  I see this in a comment, and it
> seems to be doing it, but I didn't find where it actually happened.
> Perhaps if it used autotools to build we wouldn't have this problem :-)

It's a bit more difficult. Try the attached patch please. Anyone with
NetBSD 5 to give it a try?

Joerg
Index: devel/cmake/Makefile
==================================================================
--- devel/cmake/Makefile
+++ devel/cmake/Makefile
@@ -56,13 +56,15 @@
 SUBST_SED.flags=	-e 's,-O.,,'
 
 pre-configure:
 	${RM} -f ${WRKSRC}/Modules/*.orig ${WRKSRC}/Modules/Platform/*.orig
 	${LN} -f ${WRKSRC}/Modules/Platform/OpenBSD.cmake ${WRKSRC}/Modules/Platform/MirBSD.cmake
+
+INCOMPAT_CURSES=	NetBSD-[0-5].*
 
 BUILDLINK_API_DEPENDS.libarchive+=	libarchive>=3.0.0
 .include "../../archivers/libarchive/buildlink3.mk"
 .include "../../devel/libexecinfo/buildlink3.mk"
-.include "../../mk/curses.buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: devel/cmake/distinfo
==================================================================
--- devel/cmake/distinfo
+++ devel/cmake/distinfo
@@ -1,10 +1,11 @@
 $NetBSD: distinfo,v 1.77 2015/09/12 16:46:11 wiz Exp $
 
 SHA1 (cmake-3.3.1.tar.gz) = 799aff559e9f330fefc60e6509f1d025fc3d9c8c
 RMD160 (cmake-3.3.1.tar.gz) = 39f63aef3c9ba9711f736fd8e51972429ceca527
 Size (cmake-3.3.1.tar.gz) = 6577869 bytes
+SHA1 (patch-CMakeLists.txt) = ae722c41e0d9a1396fe80f1000266a33e406e2f6
 SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c
 SHA1 (patch-Modules_Platform_SCO__SV.cmake) = 3ed230b3a06ea693812db8f57bc73aebec12b99f
 SHA1 (patch-Modules_Platform_SunOS.cmake) = 7a53ae3c902dd69ee22ef9fe0ae2a022d5284f16
 SHA1 (patch-Source_CursesDialog_cmCursesLongMessageForm.cxx) = 9b31c475571bb9a32cae8e165fa50ee6b7efd00b
 SHA1 (patch-Source_CursesDialog_cmCursesMainForm.cxx) = 2dff7b23d95cf54fb47dc8e8c61382ad7f9b2864

ADDED    devel/cmake/patches/patch-CMakeLists.txt
Index: devel/cmake/patches/patch-CMakeLists.txt
==================================================================
--- devel/cmake/patches/patch-CMakeLists.txt
+++ devel/cmake/patches/patch-CMakeLists.txt
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- CMakeLists.txt.orig	2015-09-14 13:22:28.000000000 +0000
++++ CMakeLists.txt
+@@ -423,7 +423,6 @@ macro (CMAKE_BUILD_UTILITIES)
+   if (UNIX)
+     # there is a bug in the Syllable libraries which makes linking ccmake fail, Alex
+     if(NOT CMAKE_SYSTEM_NAME MATCHES syllable)
+-      set(CURSES_NEED_NCURSES TRUE)
+       find_package(Curses QUIET)
+       if (CURSES_LIBRARY)
+         option(BUILD_CursesDialog "Build the CMake Curses Dialog ccmake" ON)



Home | Main Index | Thread Index | Old Index