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

sharutils: making them crossbuild, thanks to a patch.

Browse Source 
Patch taken from:
http://repository.timesys.com/buildsources/s/sharutils/sharutils-4.11.1/sharutils-4.11.1-cross-binary-mode-popen.patch
after a google search for the guilty part of 'configure'.
This commit is contained in:
Lluís Batlle i Rossell 2012-10-27 14:46:36 +02:00
parent 86fa903f6c
commit 16dbe75e57
2 changed files with 67 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -0,0 +1,63 @@
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