diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-07-23 16:01:19 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-07-24 18:36:59 -0400 |
| commit | 0859696d06c40edbbf61951e5ff52845ef298687 (patch) | |
| tree | 9896d43d8b86b36ca88fc65bb9a1adf4ce794960 | |
| parent | c99de14e60ffb176be8a6ffe8bc3d8b3d3bb36e4 (diff) | |
| download | nixpkgs-0859696d06c40edbbf61951e5ff52845ef298687.tar nixpkgs-0859696d06c40edbbf61951e5ff52845ef298687.tar.gz nixpkgs-0859696d06c40edbbf61951e5ff52845ef298687.tar.bz2 nixpkgs-0859696d06c40edbbf61951e5ff52845ef298687.tar.lz nixpkgs-0859696d06c40edbbf61951e5ff52845ef298687.tar.xz nixpkgs-0859696d06c40edbbf61951e5ff52845ef298687.tar.zst nixpkgs-0859696d06c40edbbf61951e5ff52845ef298687.zip | |
sharutils: Remove crossAttrs
The patch is no longer needed, at least on aarch64-linux
| -rw-r--r-- | pkgs/tools/archivers/sharutils/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/archivers/sharutils/sharutils-4.11.1-cross-binary-mode-popen.patch | 63 |
2 files changed, 0 insertions, 67 deletions
diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index 02281468942..907ac58d15f 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -34,10 +34,6 @@ stdenv.mkDerivation rec { doCheck = true; - crossAttrs = { - patches = [ ./sharutils-4.11.1-cross-binary-mode-popen.patch ]; - }; - meta = with stdenv.lib; { description = "Tools for remote synchronization and `shell archives'"; longDescription = diff --git a/pkgs/tools/archivers/sharutils/sharutils-4.11.1-cross-binary-mode-popen.patch b/pkgs/tools/archivers/sharutils/sharutils-4.11.1-cross-binary-mode-popen.patch deleted file mode 100644 index f05eab251d4..00000000000 --- a/pkgs/tools/archivers/sharutils/sharutils-4.11.1-cross-binary-mode-popen.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -Naur sharutils-4.11.1.orig/configure sharutils-4.11.1/configure ---- sharutils-4.11.1.orig/configure 2011-06-20 11:07:40.000000000 -0400 -+++ sharutils-4.11.1/configure 2011-06-20 11:09:30.000000000 -0400 -@@ -26962,33 +26962,33 @@ - CATALOGS="$new_CATALOGS" - fi - --if test "$cross_compiling" = yes; then : -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error $? "cannot run test program while cross compiling --See \`config.log' for more details" "$LINENO" 5; } --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --int --main () --{ -- FILE * fp = popen ("date", "rb"); -- exit (fp == NULL); -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- -+#if test "$cross_compiling" = yes; then : -+# { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+#as_fn_error $? "cannot run test program while cross compiling -+#See \`config.log' for more details" "$LINENO" 5; } -+#else -+# cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+#/* end confdefs.h. */ -+# -+#int -+#main () -+#{ -+# FILE * fp = popen ("date", "rb"); -+# exit (fp == NULL); -+# ; -+# return 0; -+#} -+#_ACEOF -+#if ac_fn_c_try_run "$LINENO"; then : -+# - $as_echo "#define BINARY_MODE_POPEN 1" >>confdefs.h -- -- --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi -+# -+# -+#fi -+#rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+# conftest.$ac_objext conftest.beam conftest.$ac_ext -+#fi - - - |