mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-20 20:53:48 +00:00
387d083590
Without the change build agaist -fno-common toolchains like upstream
gcc-10 fails as:
$ nix build -L --impure --expr 'with import ./. {}; rox-filer.overrideAttrs (oa: { NIX_CFLAGS_COMPILE = (oa.NIX_CFLAGS_COMPILE or "") + "-fno-common"; })'
...
ld: session.o:/build/rox-filer-2.11/ROX-Filer/build/../src/session.h:13:
multiple definition of `session_auto_respawn';
main.o:/build/rox-filer-2.11/ROX-Filer/build/../src/session.h:13:
first defined here
While at it normalized local patch against top-level source tree
to ease application of upstream patches as is.
17 lines
453 B
Diff
17 lines
453 B
Diff
--- a/Rox-Filer/src/configure 2011-10-09 16:32:14.000000000 +0200
|
|
+++ b/Rox-Filer/src/configure 2016-03-20 09:26:31.640891863 +0100
|
|
@@ -2132,13 +2132,6 @@
|
|
|
|
|
|
ac_config_headers="$ac_config_headers config.h"
|
|
-
|
|
-
|
|
- if [ -f configure ]; then
|
|
- as_fn_error $? "Please run configure from the build directory (try ../AppRun --compile)" "$LINENO" 5
|
|
- exit 1
|
|
-fi
|
|
-
|
|
ac_ext=c
|
|
ac_cpp='$CPP $CPPFLAGS'
|
|
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|