CVS commit: pkgsrc/audio/ardour

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sat Dec 21 23:27:04 UTC 2019

Modified Files:
        pkgsrc/audio/ardour: Makefile distinfo
Added Files:
        pkgsrc/audio/ardour/patches:
            patch-.waf-1.6.11-06ee4b7efbeab1252ed3b11499834d2a_waflib_Tools_c__config.py

Log Message:
Patch local WAF copy to run ${CXX} with -x c++ when detecting it.
Otherwise clang will bail out on - as it is considered a C source and
-std=c++11 as injected by the wrappers conflict.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/audio/ardour/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/audio/ardour/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/ardour/patches/patch-.waf-1.6.11-06ee4b7efbeab1252ed3b11499834d2a_waflib_Tools_c__config.py

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

Modified files:

Index: pkgsrc/audio/ardour/Makefile
diff -u pkgsrc/audio/ardour/Makefile:1.32 pkgsrc/audio/ardour/Makefile:1.33
--- pkgsrc/audio/ardour/Makefile:1.32   Thu Dec 12 16:19:48 2019
+++ pkgsrc/audio/ardour/Makefile        Sat Dec 21 23:27:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2019/12/12 16:19:48 nia Exp $
+# $NetBSD: Makefile,v 1.33 2019/12/21 23:27:03 joerg Exp $
 
 DISTNAME=      Ardour-5.12.0
 PKGNAME=       ${DISTNAME:tl}
@@ -73,6 +73,10 @@ PYTHON_FOR_BUILD_ONLY=               tool
 INSTALLATION_DIRS+=    share/appdata
 INSTALLATION_DIRS+=    share/applications
 
+pre-patch:
+       cd ${WRKSRC} && ${PYTHONBIN} waf --help > /dev/null
+       rm ${WRKSRC}/.waf-1.6.11-06ee4b7efbeab1252ed3b11499834d2a/waflib/Tools/c_config.pyc
+
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/build/gtk2_ardour/ardour5.appdata.xml \
            ${DESTDIR}${PREFIX}/share/appdata

Index: pkgsrc/audio/ardour/distinfo
diff -u pkgsrc/audio/ardour/distinfo:1.4 pkgsrc/audio/ardour/distinfo:1.5
--- pkgsrc/audio/ardour/distinfo:1.4    Mon Dec  2 13:34:33 2019
+++ pkgsrc/audio/ardour/distinfo        Sat Dec 21 23:27:04 2019
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.4 2019/12/02 13:34:33 nia Exp $
+$NetBSD: distinfo,v 1.5 2019/12/21 23:27:04 joerg Exp $
 
 SHA1 (Ardour-5.12.0.tar.bz2) = 8bf06a17638e89531cab14af67cfd59d7185518f
 RMD160 (Ardour-5.12.0.tar.bz2) = 71c25f13445f4036ff7127d071d8c1e0851d5eb8
 SHA512 (Ardour-5.12.0.tar.bz2) = c4b4332bddb2406924119c181622801725f4a7dd7741c1a66ddbc2236542764b786337da2f0a751f3bbe6e0389b5da765eb19b14a6a90c8f8a7fd68231e5067d
 Size (Ardour-5.12.0.tar.bz2) = 8852834 bytes
+SHA1 (patch-.waf-1.6.11-06ee4b7efbeab1252ed3b11499834d2a_waflib_Tools_c__config.py) = 6b6c776485def8e57ab1ec7fb4b8207ac6d3094a
 SHA1 (patch-gtk2__ardour_ardour__ui.cc) = c8bbd019ecab91081520bdfa999f13f96c9dc39d
 SHA1 (patch-gtk2__ardour_wscript) = f78f4028e20d9d917fd1251618136c51ce3fa28a
 SHA1 (patch-libs_backends_jack_jack__audiobackend.cc) = 9fc4201948a6e88711d18d9218e1dacc1dd2700b

Added files:

Index: pkgsrc/audio/ardour/patches/patch-.waf-1.6.11-06ee4b7efbeab1252ed3b11499834d2a_waflib_Tools_c__config.py
diff -u /dev/null pkgsrc/audio/ardour/patches/patch-.waf-1.6.11-06ee4b7efbeab1252ed3b11499834d2a_waflib_Tools_c__config.py:1.1
--- /dev/null   Sat Dec 21 23:27:04 2019
+++ pkgsrc/audio/ardour/patches/patch-.waf-1.6.11-06ee4b7efbeab1252ed3b11499834d2a_waflib_Tools_c__config.py    Sat Dec 21 23:27:04 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-.waf-1.6.11-06ee4b7efbeab1252ed3b11499834d2a_waflib_Tools_c__config.py,v 1.1 2019/12/21 23:27:04 joerg Exp $
+
+When detecting the C++ compiler, force C++ mode for stdin as the wrappers
+add -std=c++11 and that breaks for C input.
+
+--- .waf-1.6.11-06ee4b7efbeab1252ed3b11499834d2a/waflib/Tools/c_config.py.orig 2019-12-21 19:28:02.658101225 +0000
++++ .waf-1.6.11-06ee4b7efbeab1252ed3b11499834d2a/waflib/Tools/c_config.py
+@@ -553,7 +553,7 @@ def cxx_load_tools(conf):
+               conf.env.DEST_OS=Utils.unversioned_sys_platform()
+       conf.load('cxx')
+ def get_cc_version(conf,cc,gcc=False,icc=False):
+-      cmd=cc+['-dM','-E','-']
++      cmd=cc+(['-x','c++']if cc[0].endswith('+')else[])+['-dM','-E','-']
+       env=conf.env.env or None
+       try:
+               p=Utils.subprocess.Popen(cmd,stdin=Utils.subprocess.PIPE,stdout=Utils.subprocess.PIPE,stderr=Utils.subprocess.PIPE,env=env)