diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2017-05-24 23:26:28 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2017-05-24 23:28:33 -0400 |
| commit | ec46f339c2e155ba04c9ba574f9d488535d5294d (patch) | |
| tree | 6b66daa0b42fce2f6e86daec24ce08a7afee210d /net-misc | |
| parent | dev-db/firebird: Remove old (diff) | |
| download | gentoo-ec46f339c2e155ba04c9ba574f9d488535d5294d.tar.gz gentoo-ec46f339c2e155ba04c9ba574f9d488535d5294d.tar.bz2 gentoo-ec46f339c2e155ba04c9ba574f9d488535d5294d.zip | |
net-misc/openssh: fix some cross-compiling configure tests
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/openssh/files/openssh-7.5_p1-cross-cache.patch | 39 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-7.5_p1-r1.ebuild | 1 |
2 files changed, 40 insertions, 0 deletions
diff --git a/net-misc/openssh/files/openssh-7.5_p1-cross-cache.patch b/net-misc/openssh/files/openssh-7.5_p1-cross-cache.patch new file mode 100644 index 000000000000..1c2b7b8a091a --- /dev/null +++ b/net-misc/openssh/files/openssh-7.5_p1-cross-cache.patch @@ -0,0 +1,39 @@ +From d588d6f83e9a3d48286929b4a705b43e74414241 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@chromium.org> +Date: Wed, 24 May 2017 23:18:41 -0400 +Subject: [PATCH] configure: actually set cache vars when cross-compiling + +The cross-compiling fallback message says it's assuming the test +passed, but it didn't actually set the cache var which causes +later tests to fail. +--- + configure.ac | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5cfea38c0a6c..895c5211ea93 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3162,7 +3162,8 @@ AC_RUN_IFELSE( + select_works_with_rlimit=yes], + [AC_MSG_RESULT([no]) + select_works_with_rlimit=no], +- [AC_MSG_WARN([cross compiling: assuming yes])] ++ [AC_MSG_WARN([cross compiling: assuming yes]) ++ select_works_with_rlimit=yes] + ) + + AC_MSG_CHECKING([if setrlimit(RLIMIT_NOFILE,{0,0}) works]) +@@ -3188,7 +3189,8 @@ AC_RUN_IFELSE( + rlimit_nofile_zero_works=yes], + [AC_MSG_RESULT([no]) + rlimit_nofile_zero_works=no], +- [AC_MSG_WARN([cross compiling: assuming yes])] ++ [AC_MSG_WARN([cross compiling: assuming yes]) ++ rlimit_nofile_zero_works=yes] + ) + + AC_MSG_CHECKING([if setrlimit RLIMIT_FSIZE works]) +-- +2.12.0 + diff --git a/net-misc/openssh/openssh-7.5_p1-r1.ebuild b/net-misc/openssh/openssh-7.5_p1-r1.ebuild index 9652d9263d6e..d4bbc148686f 100644 --- a/net-misc/openssh/openssh-7.5_p1-r1.ebuild +++ b/net-misc/openssh/openssh-7.5_p1-r1.ebuild @@ -131,6 +131,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-7.5_p1-GSSAPI-dns.patch #165444 integrated into gsskex epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch + epatch "${FILESDIR}"/${PN}-7.5_p1-cross-cache.patch use X509 || epatch "${WORKDIR}"/${SCTP_PATCH%.*} use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-x32-typo.patch use abi_mips_n32 && epatch "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch |