pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/cad/qcad cad/qcad: Add workaround for debug/release li...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/deb912c3dc75
branches:  trunk
changeset: 417528:deb912c3dc75
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Wed Nov 13 00:26:49 2019 +0000

description:
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.

diffstat:

 cad/qcad/Makefile |  19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diffs (36 lines):

diff -r 0d06c9f8005a -r deb912c3dc75 cad/qcad/Makefile
--- a/cad/qcad/Makefile Tue Nov 12 20:28:14 2019 +0000
+++ b/cad/qcad/Makefile Wed Nov 13 00:26:49 2019 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.78 2019/10/27 15:43:23 nia Exp $
+# $NetBSD: Makefile,v 1.79 2019/11/13 00:26:49 gdt Exp $
 #
 
 DISTNAME=              qcad-3.23.0.0
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            cad
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=qcad/}
 EXTRACT_USING=         bsdtar
@@ -27,6 +27,21 @@
 SUBST_FILES.paths+=    scripts/Widgets/LibraryBrowser/LibraryBrowser.js
 SUBST_VARS.paths=      PREFIX
 
+# Don't build intermediate libraries with the same name in debug mode
+# as in release mode. (Resolves regular libraries ending up in debug
+# mode, which breaks plugin loading.)
+# Reported on QCad Community Edition forum:
+#   https://qcad.org/rsforum/viewtopic.php?f=76&t=6708
+#
+SUBST_CLASSES+=         dbgmode
+SUBST_STAGE.dbgmode=    post-configure
+SUBST_MESSAGE.dbgmode=  Debug mode: lib*.so -> lib*_debug.so
+SUBST_FILES.dbgmode=    src/3rdparty/dxflib/Makefile.Debug
+SUBST_FILES.dbgmode+=   src/core/Makefile.Debug
+SUBST_FILES.dbgmode+=   src/entity/Makefile.Debug
+SUBST_FILES.dbgmode+=   src/operations/Makefile.Debug
+SUBST_SED.dbgmode=      -e 's,\(lib[dq]..*\)\(\.so\),\1_debug\2,g'
+
 .include "../../mk/bsd.prefs.mk"
 PLIST_VARS+=   glx egl
 .if ${OPSYS} != "Darwin"



Home | Main Index | Thread Index | Old Index