diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-10-21 00:33:43 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-10-21 00:33:43 +0200 |
| commit | 023522d3a1e81fe9bc803183337fdc8c183a88c4 (patch) | |
| tree | ec374744812891a627f33fa457b0bcf083e2c142 /gnu/packages/kodi.scm | |
| parent | 07abc851ce8a580253061e065b31a4037d2f965d (diff) | |
| parent | 7373eb8304e0ebbfabe66deb59e78187013403dd (diff) | |
| download | guix-patches-023522d3a1e81fe9bc803183337fdc8c183a88c4.tar guix-patches-023522d3a1e81fe9bc803183337fdc8c183a88c4.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/kodi.scm')
| -rw-r--r-- | gnu/packages/kodi.scm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index d1a313187e..23afd138a3 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -104,14 +104,12 @@ (replace 'build (lambda _ (invoke "g++" "-c" "guid.cpp" "-o" "guid.o" - "-std=c++11" "-DGUID_LIBUUID") + "-DGUID_LIBUUID") (invoke "ar" "rvs" "libcrossguid.a" "guid.o"))) (replace 'check (lambda _ - (invoke "g++" "-c" "test.cpp" "-o" "test.o" - "-std=c++11") - (invoke "g++" "-c" "testmain.cpp" "-o" "testmain.o" - "-std=c++11") + (invoke "g++" "-c" "test.cpp" "-o" "test.o") + (invoke "g++" "-c" "testmain.cpp" "-o" "testmain.o") (invoke "g++" "test.o" "guid.o" "testmain.o" "-o" "test" "-luuid") (invoke (string-append (getcwd) "/test")))) @@ -282,6 +280,7 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.") (base32 "1m0295czxabdcqyqf5m94av9d88pzhnzjvyfs1q07xqq82h313p7")) (patches (search-patches "kodi-skip-test-449.patch" + "kodi-increase-test-timeout.patch" "kodi-set-libcurl-ssl-parameters.patch")) (snippet '(begin |