From owner-svn-ports-all@freebsd.org Sun Mar 22 05:23:34 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 497F92778B1; Sun, 22 Mar 2020 05:23:34 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48lQsL0qj5z4ZP6; Sun, 22 Mar 2020 05:23:34 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0EBC020774; Sun, 22 Mar 2020 05:23:33 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02M5NWs8012577; Sun, 22 Mar 2020 05:23:32 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02M5NWh7012576; Sun, 22 Mar 2020 05:23:32 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <202003220523.02M5NWh7012576@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sun, 22 Mar 2020 05:23:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r528896 - head/net-p2p/linuxdcpp/files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/net-p2p/linuxdcpp/files X-SVN-Commit-Revision: 528896 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Mar 2020 05:23:34 -0000 Author: tobik Date: Sun Mar 22 05:23:32 2020 New Revision: 528896 URL: https://svnweb.freebsd.org/changeset/ports/528896 Log: net-p2p/linuxdcpp: Disable bad compiler version check and unbreak with Clang 10 Checking for c++ >= 4.1...(cached) no Compiler version check failed. c++ 4.1 or later is needed Modified: head/net-p2p/linuxdcpp/files/patch-SConstruct Modified: head/net-p2p/linuxdcpp/files/patch-SConstruct ============================================================================== --- head/net-p2p/linuxdcpp/files/patch-SConstruct Sun Mar 22 05:20:26 2020 (r528895) +++ head/net-p2p/linuxdcpp/files/patch-SConstruct Sun Mar 22 05:23:32 2020 (r528896) @@ -1,6 +1,6 @@ --- SConstruct.orig 2011-04-17 17:57:09 UTC +++ SConstruct -@@ -20,7 +20,7 @@ BUILD_LOCALE_PATH = BUILD_PATH + 'locale +@@ -20,7 +20,7 @@ BUILD_LOCALE_PATH = BUILD_PATH + 'locale/' BUILD_FLAGS = { 'common' : ['-I#', '-D_GNU_SOURCE', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_REENTRANT'], 'debug' : ['-g', '-ggdb', '-Wall', '-D_DEBUG'], @@ -17,19 +17,19 @@ BoolVariable('profile', 'Compile the program with profiling information', 0), PathVariable('PREFIX', 'Compile the program with PREFIX as the root for installation', '/usr/local', PathVariable.PathIsDir), ('FAKE_ROOT', 'Make scons install the program under a fake root', '') -@@ -131,7 +132,10 @@ if os.environ.has_key('CC'): +@@ -131,14 +132,23 @@ if os.environ.has_key('CC'): env['CC'] = os.environ['CC'] if os.environ.has_key('CXXFLAGS'): - env['CPPFLAGS'] = env['CXXFLAGS'] = os.environ['CXXFLAGS'].split() + env['CXXFLAGS'] = os.environ['CXXFLAGS'].split() -+ + +if os.environ.has_key('CPPFLAGS'): + env['CPPFLAGS'] = os.environ['CPPFLAGS'].split() - ++ if os.environ.has_key('LDFLAGS'): env['LINKFLAGS'] = os.environ['LDFLAGS'].split() -@@ -139,6 +143,12 @@ if os.environ.has_key('LDFLAGS'): + if os.environ.has_key('CFLAGS'): env['CFLAGS'] = os.environ['CFLAGS'].split() @@ -42,7 +42,18 @@ env['CPPDEFINES'] = [] # Initialize as a list so Append doesn't concat strings env.SConsignFile('build/sconf/.sconsign') -@@ -256,21 +266,20 @@ if not 'install' in COMMAND_LINE_TARGETS +@@ -185,10 +195,6 @@ conf = env.Configure( + + if not 'install' in COMMAND_LINE_TARGETS: + +- if not conf.CheckCXXVersion(env['CXX'], 4, 1): +- print 'Compiler version check failed. g++ 4.1 or later is needed' +- Exit(1) +- + if not conf.CheckPKGConfig(): + print '\tpkg-config not found.' + Exit(1) +@@ -256,21 +262,20 @@ if not 'install' in COMMAND_LINE_TARGETS: if not conf.CheckHeader('iconv.h'): Exit(1)