diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-10-20 13:31:19 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-10-20 14:00:12 +0200 |
| commit | 0fe041bd9fa87d23b44969a3bcd99b1165a0f06e (patch) | |
| tree | 62af9cc395aa4ca5c3e42515afd13b8c97172b5d /gnu/packages/video.scm | |
| parent | 92e0fce80adafcadb57f0c72c3791fdbbde6a377 (diff) | |
| download | guix-0fe041bd9fa87d23b44969a3bcd99b1165a0f06e.tar.gz | |
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.
Diffstat (limited to 'gnu/packages/video.scm')
| -rw-r--r-- | gnu/packages/video.scm | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 93edb301f8..0624d1abb4 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1180,8 +1180,7 @@ videoformats depend on the configuration flags of ffmpeg.") ("xcb-util-keysyms" ,xcb-util-keysyms))) (arguments `(#:configure-flags - `("CXXFLAGS=-std=gnu++11" - "BUILDCC=gcc" + `("BUILDCC=gcc" ,(string-append "LDFLAGS=-Wl,-rpath -Wl," (assoc-ref %build-inputs "ffmpeg") "/lib")) ;needed for the tests @@ -2219,7 +2218,7 @@ from sites like Twitch.tv and pipes them into a video player of choice.") (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests - #:make-flags '("CC=gcc" "CXX=g++ -std=gnu++11") + #:make-flags '("CC=gcc" "CXX=g++") #:configure-flags (list "--enable-gpl3" "--enable-gpl") @@ -2278,8 +2277,7 @@ tools, XML authoring components, and an extensible plug-in based API.") '(#:configure-flags (list (string-append "--with-udevdir=" (assoc-ref %outputs "out") - "/lib/udev") - "CXXFLAGS=-std=gnu++11"))) + "/lib/udev")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config))) |