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/android.scm | |
| parent | 92e0fce80adafcadb57f0c72c3791fdbbde6a377 (diff) | |
| download | guix-0fe041bd9fa87d23b44969a3bcd99b1165a0f06e.tar 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/android.scm')
| -rw-r--r-- | gnu/packages/android.scm | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index b312c5b2af..993d18a3eb 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -217,7 +217,6 @@ in Main, System, Radio and Events sub-logs.") (build-system android-ndk-build-system) (arguments `(#:tests? #f ; Test failure: logging.UNIMPLEMENTED - #:make-flags '("CXXFLAGS=-std=gnu++11") #:phases (modify-phases %standard-phases (add-after 'unpack 'enter-source @@ -257,7 +256,7 @@ various Android core host applications.") "CC = gcc\n" "CFLAGS += -fPIC\n" - "CXXFLAGS += -std=gnu++11 -fPIC\n" + "CXXFLAGS += -fPIC\n" "CPPFLAGS += -Iinclude -I../include\n" "LDFLAGS += -shared -Wl,-soname,$(NAME).so.0\n" @@ -312,7 +311,7 @@ various Android core host applications.") (build-system android-ndk-build-system) (arguments `(#:make-flags '("CFLAGS=-Wno-error" - "CXXFLAGS=-fpermissive -Wno-error -std=gnu++11") + "CXXFLAGS=-fpermissive -Wno-error") #:phases (modify-phases %standard-phases (add-after 'unpack 'enter-source @@ -631,8 +630,7 @@ file system.") (source (android-platform-system-core version)) (build-system android-ndk-build-system) (arguments - `(#:make-flags (list "CXXFLAGS=-std=gnu++11") - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'enter-source (lambda _ |