From 0fe041bd9fa87d23b44969a3bcd99b1165a0f06e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 20 Oct 2019 13:31:19 +0200 Subject: gnu: Remove more GCC < 7 workarounds. * gnu/packages/abiword.scm (abiword)[arguments]: Do not pass "-std=c++11" to the GCC command line. * gnu/packages/aidc.scm (zbar)[arguments]: Likewise. * gnu/packages/android.scm (android-libbase, android-libcutils, android-libziparchive, fastboot)[arguments]: Likewise. * gnu/packages/audio.scm (azr3, guitarix, suil)[arguments]: Likewise. * gnu/packages/bioinformatics.scm (bless)[arguments]: Likewise. * gnu/packages/bittorrent.scm (libtorrent-rasterbar)[arguments]: Likewise. * gnu/packages/code.scm (rtags)[arguments]: Likewise. * gnu/packages/coq.scm (coq-gappa)[arguments]: Likewise. * gnu/packages/emulators.scm (dolphin-emu)[arguments]: Likewise. * gnu/packages/engineering.scm (xyce-serial, xyce-parallel)[arguments]: Likewise. * gnu/packages/gnupg.scm (pinentry-qt)[arguments]: Likewise. * gnu/packages/gobby.scm (libnet6, obby)[arguments]: Likewise. * gnu/packages/graph.scm (python-faiss)[arguments]: Likewise. * gnu/packages/graphics.scm (povray)[arguments]: Likewise. * gnu/packages/image-processing.scm (opencv, itk-snap)[arguments]: Likewise. * gnu/packages/image.scm (freeimage)[arguments]: Likewise. * gnu/packages/kodi.scm (crossguid)[arguments]: Likewise. * gnu/packages/music.scm (amsynth, qmidiarp, qmidiroute, seq24)[arguments]: Likewise. * gnu/packages/pdf.scm (python-poppler-qt5)[arguments]: Likewise. * gnu/packages/sagemath.scm (lcalc)[arguments]: Likewise. * gnu/packages/video.scm (vlc, mlt, v4l-utils)[arguments]: Likewise. --- gnu/packages/pdf.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gnu/packages/pdf.scm') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 003b5a9548..dfb4883a73 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -200,10 +200,7 @@ (define-public python-poppler-qt5 (substitute* "setup.py" ;; This check always fails, so disable it. (("if not check_qtxml\\(\\)") - "if True") - ;; Enable C++11, which is needed because of Qt5. - (("\\*\\*ext_args" line) - (string-append "extra_compile_args=['-std=gnu++11'], " line))) + "if True")) ;; We need to pass an extra flag here. This cannot be in ;; configure-flags because it should not be passed for the ;; installation phase. -- cgit v1.2.3