pkgsrc-WIP-changes archive

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

(klayout) Fix "qt4-tools-4.8.7 not a runtime dependency", thanks ryoon@ for fix.



Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara <makoto%ki.nu@localhost>
Pushed By:	mef
Date:		Sat Mar 12 22:17:41 2016 +0900
Changeset:	32913c3eea02564f1fee64122dc5ab0a0a1a4065

Modified Files:
	klayout/Makefile
	klayout/TODO

Log Message:
(klayout) Fix  "qt4-tools-4.8.7 not a runtime dependency", thanks ryoon@ for fix.

--> libQtDesigner.so.4: qt4-tools-4.8.7 is not a runtime dependency
By adding the line, the above problem fixed
 .include "../../x11/qt4-tools/buildlink3.mk"
+BUILDLINK_DEPMETHOD.qt4-tools= full

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=32913c3eea02564f1fee64122dc5ab0a0a1a4065

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

diffstat:
 klayout/Makefile | 7 +++----
 klayout/TODO     | 5 -----
 2 files changed, 3 insertions(+), 9 deletions(-)

diffs:
diff --git a/klayout/Makefile b/klayout/Makefile
index 64c65a7..30d85cb 100644
--- a/klayout/Makefile
+++ b/klayout/Makefile
@@ -9,8 +9,6 @@ HOMEPAGE=	http://www.klayout.org/downloads/
 COMMENT=	Simple GDS and OASIS file viewer and Editor
 LICENSE=	gnu-gpl-v2
 
-BROKEN=		libQtDesigner.so.4: qt4-tools-4.8.7 is not a runtime dependency
-
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
 
@@ -24,7 +22,7 @@ SUBST_STAGE.rpath=	post-patch
 SUBST_VARS.rpath=	COMPILER_RPATH_FLAG PREFIX
 SUBST_SED.rpath=	'-e s|@@LDFLAGS@@|${LDFLAGS}|'
 
-AUTO_MKDIRS=	yes
+AUTO_MKDIRS=		yes
 INSTALL_BINDIR=		${DESTDIR}${PREFIX}/bin
 INSTALL_LIBDIR=		${DESTDIR}${PREFIX}/lib
 REL_DIR=		build.netbsd-32-gcc-release
@@ -47,7 +45,7 @@ do-install:
 	(cd ${WRKSRC}; \
 	pwd; \
 	${INSTALL_PROGRAM} ${REL_DIR}/main/klayout ${INSTALL_BINDIR}; \
-	${INSTALL_PROGRAM} ${REL_DIR}/main/libklayout.so ${INSTALL_LIBDIR} ;\
+	${INSTALL_LIB} ${REL_DIR}/main/libklayout.so ${INSTALL_LIBDIR} ;\
 	for bin in ${OTHER_BIN}; do \
 	  ${INSTALL_PROGRAM} ${REL_DIR}/main/$$bin ${INSTALL_BINDIR} ;\
 	done ;\
@@ -59,4 +57,5 @@ do-install:
 .include "../../x11/qt4-libs/buildlink3.mk"
 # libQtDesigner
 .include "../../x11/qt4-tools/buildlink3.mk"
+BUILDLINK_DEPMETHOD.qt4-tools=	full
 .include "../../mk/bsd.pkg.mk"
diff --git a/klayout/TODO b/klayout/TODO
index 035d035..c026a2b 100644
--- a/klayout/TODO
+++ b/klayout/TODO
@@ -2,8 +2,3 @@
 - Several hard coding for string gcc ar etc
 - ruby version handling is not properly setup
 - MAKE_JOBS= may not be in effect ?
-
-----------------------
-ERROR: /usr/pkg/qt4/lib/libQtDesigner.so.4: qt4-tools-4.8.7 is not a runtime dependency
-ERROR: /usr/pkg/qt4/lib/libQtDesigner.so.4: qt4-tools-4.8.7 is not a runtime dependency
-----------------------


Home | Main Index | Thread Index | Old Index