aboutsummaryrefslogtreecommitdiffstats
path: root/main/fakeroot/fakeroot-skip-ipc-sanity-check.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/fakeroot/fakeroot-skip-ipc-sanity-check.patch')
-rw-r--r--main/fakeroot/fakeroot-skip-ipc-sanity-check.patch29
1 files changed, 21 insertions, 8 deletions
diff --git a/main/fakeroot/fakeroot-skip-ipc-sanity-check.patch b/main/fakeroot/fakeroot-skip-ipc-sanity-check.patch
index fc96c2922a0..9541973c049 100644
--- a/main/fakeroot/fakeroot-skip-ipc-sanity-check.patch
+++ b/main/fakeroot/fakeroot-skip-ipc-sanity-check.patch
@@ -1,7 +1,12 @@
-diff -urN fakeroot-1.25.3.orig/configure.ac fakeroot-1.25.3/configure.ac
---- fakeroot-1.25.3.orig/configure.ac 2020-12-15 02:33:22.866626448 -0700
-+++ fakeroot-1.25.3/configure.ac 2020-12-15 02:33:40.563359415 -0700
-@@ -25,42 +25,6 @@
+This patch was original added in aports commit
+439b449b68ebf3462a3f659804c41195e2d8d8ae. It
+seems to be needed since this sanity checks
+fails spuriously when cros compiling fakeroot.
+
+diff -upr fakeroot-1.27.orig/configure.ac fakeroot-1.27/configure.ac
+--- fakeroot-1.27.orig/configure.ac 2022-01-30 10:43:52.992260063 +0100
++++ fakeroot-1.27/configure.ac 2022-01-30 10:46:22.989526929 +0100
+@@ -25,50 +25,6 @@ AC_CACHE_CHECK([which IPC method to use]
[ac_cv_use_ipc],
[ac_cv_use_ipc=sysv])
@@ -9,7 +14,7 @@ diff -urN fakeroot-1.25.3.orig/configure.ac fakeroot-1.25.3/configure.ac
- AC_MSG_CHECKING([whether SysV IPC message queues are actually working on the host])
-
- AC_LANG_PUSH(C)
-- AC_TRY_RUN([
+- AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/ipc.h>
@@ -30,9 +35,17 @@ diff -urN fakeroot-1.25.3.orig/configure.ac fakeroot-1.25.3/configure.ac
- return 0;
- }
-
--}], [ac_cv_use_ipc=sysv], [ac_cv_use_ipc=tcp])
--
-- if test $ac_cv_use_ipc = "tcp"; then
+-}]])],[ac_cv_use_ipc=sysv],[ac_cv_use_ipc=tcp],[ac_cv_use_ipc=cross])
+-
+- if test $ac_cv_use_ipc = cross; then
+- if test "$host_os" = linux-gnu; then
+- ac_cv_use_ipc=sysv
+- AC_MSG_RESULT([cross, guessing yes])
+- else
+- (set -o posix; set)
+- AC_MSG_ERROR([cross compiling, unknown result for $host_os])
+- fi
+- elif test $ac_cv_use_ipc = "tcp"; then
- AC_MSG_RESULT([No, using TCP])
- else
- AC_MSG_RESULT([Yes])