pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/net/synergy synergy: don't run cmake twice



details:   https://anonhg.NetBSD.org/pkgsrc/rev/50f3dd69476d
branches:  trunk
changeset: 368838:50f3dd69476d
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Mon Sep 18 13:44:14 2017 +0000

description:
synergy: don't run cmake twice

diffstat:

 net/synergy/Makefile |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r 9cd1d253dea3 -r 50f3dd69476d net/synergy/Makefile
--- a/net/synergy/Makefile      Mon Sep 18 13:34:51 2017 +0000
+++ b/net/synergy/Makefile      Mon Sep 18 13:44:14 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2017/08/24 20:03:36 adam Exp $
+# $NetBSD: Makefile,v 1.45 2017/09/18 13:44:14 tnn Exp $
 
 DISTNAME=              synergy-1.8.8
 PKGREVISION=           1
@@ -15,7 +15,8 @@
 USE_TOOLS+=            unzip
 # Main configuration is CMake, but subdirectories are GNU configure.
 # We need to set GNU_CONFIGURE=yes for config.{guess,sub} overrides to kick in.
-# Fortunately for us, cmake seems to take precedence in infrastructure.
+# We override the do-configure target to prevent pkgsrc from running both
+# configuration mechanisms.
 USE_CMAKE=             yes
 GNU_CONFIGURE=         yes
 
@@ -43,6 +44,9 @@
        ${MKDIR} ${WRKSRC}/ext/gtest-1.6.0
        cd ${WRKSRC}/ext/gtest-1.6.0 && unzip -aqo ../gtest-1.6.0.zip
 
+.PHONY: do-configure
+do-configure: do-configure-cmake
+
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 share/examples/${PKGBASE}
 
 do-install:



Home | Main Index | Thread Index | Old Index