Wed Nov 13 00:26:49 2019 UTC ()
cad/qcad: Add workaround for debug/release library confusion

Avoid name clash between release-mode and debug-mode libraries so that
"libqcaddxf.so" is not rejected by the plugin loader.

Patch from John D. Baker via pkgsrc-users.


(gdt)
diff -r1.78 -r1.79 pkgsrc/cad/qcad/Makefile
cvs diff -r1.78 -r1.79 pkgsrc/cad/qcad/Makefile (expand / switch to unified diff)

--- pkgsrc/cad/qcad/Makefile 2019/10/27 15:43:23 1.78
+++ pkgsrc/cad/qcad/Makefile 2019/11/13 00:26:49 1.79
@@ -1,42 +1,57 @@ @@ -1,42 +1,57 @@
1# $NetBSD: Makefile,v 1.78 2019/10/27 15:43:23 nia Exp $ 1# $NetBSD: Makefile,v 1.79 2019/11/13 00:26:49 gdt Exp $
2# 2#
3 3
4DISTNAME= qcad-3.23.0.0 4DISTNAME= qcad-3.23.0.0
5PKGREVISION= 3 5PKGREVISION= 4
6CATEGORIES= cad 6CATEGORIES= cad
7MASTER_SITES= ${MASTER_SITE_GITHUB:=qcad/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=qcad/}
8EXTRACT_USING= bsdtar 8EXTRACT_USING= bsdtar
9GITHUB_TAG= v${PKGVERSION_NOREV} 9GITHUB_TAG= v${PKGVERSION_NOREV}
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.qcad.org/ 12HOMEPAGE= http://www.qcad.org/
13COMMENT= 2D CAD system 13COMMENT= 2D CAD system
14LICENSE= gnu-gpl-v3 14LICENSE= gnu-gpl-v3
15 15
16DEPENDS+= bash-[0-9]*:../../shells/bash 16DEPENDS+= bash-[0-9]*:../../shells/bash
17 17
18USE_TOOLS+= chmod find make pax 18USE_TOOLS+= chmod find make pax
19USE_LANGUAGES= c c++ 19USE_LANGUAGES= c c++
20USE_LIBTOOL= yes 20USE_LIBTOOL= yes
21 21
22SUBST_CLASSES+= paths 22SUBST_CLASSES+= paths
23SUBST_STAGE.paths= pre-configure 23SUBST_STAGE.paths= pre-configure
24SUBST_MESSAGE.paths= Attending to hard-coded paths. 24SUBST_MESSAGE.paths= Attending to hard-coded paths.
25SUBST_FILES.paths+= shared.pri src/core/RS.cpp src/core/RSettings.cpp 25SUBST_FILES.paths+= shared.pri src/core/RS.cpp src/core/RSettings.cpp
26SUBST_FILES.paths+= scripts/Help/ShowReadme/ShowReadme.js 26SUBST_FILES.paths+= scripts/Help/ShowReadme/ShowReadme.js
27SUBST_FILES.paths+= scripts/Widgets/LibraryBrowser/LibraryBrowser.js 27SUBST_FILES.paths+= scripts/Widgets/LibraryBrowser/LibraryBrowser.js
28SUBST_VARS.paths= PREFIX 28SUBST_VARS.paths= PREFIX
29 29
 30# Don't build intermediate libraries with the same name in debug mode
 31# as in release mode. (Resolves regular libraries ending up in debug
 32# mode, which breaks plugin loading.)
 33# Reported on QCad Community Edition forum:
 34# https://qcad.org/rsforum/viewtopic.php?f=76&t=6708
 35#
 36SUBST_CLASSES+= dbgmode
 37SUBST_STAGE.dbgmode= post-configure
 38SUBST_MESSAGE.dbgmode= Debug mode: lib*.so -> lib*_debug.so
 39SUBST_FILES.dbgmode= src/3rdparty/dxflib/Makefile.Debug
 40SUBST_FILES.dbgmode+= src/core/Makefile.Debug
 41SUBST_FILES.dbgmode+= src/entity/Makefile.Debug
 42SUBST_FILES.dbgmode+= src/operations/Makefile.Debug
 43SUBST_SED.dbgmode= -e 's,\(lib[dq]..*\)\(\.so\),\1_debug\2,g'
 44
30.include "../../mk/bsd.prefs.mk" 45.include "../../mk/bsd.prefs.mk"
31PLIST_VARS+= glx egl 46PLIST_VARS+= glx egl
32.if ${OPSYS} != "Darwin" 47.if ${OPSYS} != "Darwin"
33PLIST.glx= yes 48PLIST.glx= yes
34. include "../../graphics/MesaLib/buildlink3.mk" 49. include "../../graphics/MesaLib/buildlink3.mk"
35. if ${MESALIB_SUPPORTS_EGL} == "yes" 50. if ${MESALIB_SUPPORTS_EGL} == "yes"
36PLIST.egl= yes 51PLIST.egl= yes
37. endif 52. endif
38.endif 53.endif
39 54
40AUTO_MKDIRS= yes 55AUTO_MKDIRS= yes
41 56
42# 57#