public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sharutils: Remove crossAttrs

Browse Source 
The patch is no longer needed, at least on aarch64-linux
This commit is contained in:
John Ericson 2018-07-23 16:01:19 -04:00
parent c99de14e60
commit 0859696d06
2 changed files with 0 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/archivers/sharutils/default.nix
View File

@ -34,10 +34,6 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
crossAttrs = {
patches = [ ./sharutils-4.11.1-cross-binary-mode-popen.patch ];
};
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Tools for remote synchronization and `shell archives'"; description = "Tools for remote synchronization and `shell archives'";
longDescription = longDescription =

63
pkgs/tools/archivers/sharutils/sharutils-4.11.1-cross-binary-mode-popen.patch
View File

@ -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