mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-06-12 09:21:17 +00:00
Add patch from 3.7 trunk to fix kfreebsd build failure
This commit is contained in:
parent
2cb4d54fa0
commit
a5b85f1308
5
debian/changelog
vendored
5
debian/changelog
vendored
@ -9,12 +9,17 @@ llvm-toolchain-snapshot (1:3.8~svn245286-2) UNRELEASED; urgency=medium
|
|||||||
(Closes: #796811, #796843)
|
(Closes: #796811, #796843)
|
||||||
* Remove an obsolete declaration about dragonegg
|
* Remove an obsolete declaration about dragonegg
|
||||||
(cherry-pick from 3.7 branch)
|
(cherry-pick from 3.7 branch)
|
||||||
|
* debian/patches/kfreebsd-build-fix.patch:
|
||||||
|
- fix kfreebsd-* build failures by workarounding
|
||||||
|
missing F_DUPFD_CLOEXEC (rebased patch from gnome-terminal
|
||||||
|
10_kfreebsd-f_dupfd_cloexec.patch)
|
||||||
|
|
||||||
[ James Price ]
|
[ James Price ]
|
||||||
* d/p/fix-cmake-config-prefix.diff: fix cmake path,
|
* d/p/fix-cmake-config-prefix.diff: fix cmake path,
|
||||||
needs a change after upstream revision r241080
|
needs a change after upstream revision r241080
|
||||||
(Addresses: #794905)
|
(Addresses: #794905)
|
||||||
|
|
||||||
|
|
||||||
-- Gianfranco Costamagna <locutusofborg@debian.org> Tue, 18 Aug 2015 18:37:46 +0200
|
-- Gianfranco Costamagna <locutusofborg@debian.org> Tue, 18 Aug 2015 18:37:46 +0200
|
||||||
|
|
||||||
llvm-toolchain-snapshot (1:3.8~svn245286-1) unstable; urgency=medium
|
llvm-toolchain-snapshot (1:3.8~svn245286-1) unstable; urgency=medium
|
||||||
|
41
debian/patches/kfreebsd-build-fix.patch
vendored
Normal file
41
debian/patches/kfreebsd-build-fix.patch
vendored
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
## Description: add some description
|
||||||
|
## Origin/Author: add some origin or author
|
||||||
|
## Bug: bug URL
|
||||||
|
Description: Avoid usage of F_DUPFD_CLOEXEC where not available (e.g. kfreebsd*)
|
||||||
|
The patch is mostly taken from 10_kfreebsd-f_dupfd_cloexec.patch (gnome-terminal)
|
||||||
|
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=711529
|
||||||
|
Description: Fix build on kfreebsd
|
||||||
|
|
||||||
|
kfreebsd doesn't have F_DUPFD_CLOEXEC, so use it conditionally.
|
||||||
|
As mentioned in the bug report, it will have support for it in
|
||||||
|
jessie, so we can drop it in jessie+1
|
||||||
|
Author: Emilio Pozuelo Monfort <pochu@debian.org>
|
||||||
|
Author: Petr Salinger <Petr.Salinger@seznam.cz>
|
||||||
|
|
||||||
|
Author: Gianfranco Costamagna <locutusofborg@debian.org>
|
||||||
|
--- llvm-toolchain-3.7-3.7~+rc3.orig/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
|
||||||
|
+++ llvm-toolchain-3.7-3.7~+rc3/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
|
||||||
|
@@ -462,11 +462,24 @@ ProcessPOSIX::DoLaunch (Module *module,
|
||||||
|
int terminal = m_monitor->GetTerminalFD();
|
||||||
|
if (terminal >= 0) {
|
||||||
|
// The reader thread will close the file descriptor when done, so we pass it a copy.
|
||||||
|
+#ifdef F_DUPFD_CLOEXEC
|
||||||
|
int stdio = fcntl(terminal, F_DUPFD_CLOEXEC, 0);
|
||||||
|
if (stdio == -1) {
|
||||||
|
error.SetErrorToErrno();
|
||||||
|
return error;
|
||||||
|
}
|
||||||
|
+#else
|
||||||
|
+ int stdio = fcntl(terminal, F_DUPFD, 0);
|
||||||
|
+ if (stdio == -1) {
|
||||||
|
+ error.SetErrorToErrno();
|
||||||
|
+ return error;
|
||||||
|
+ }
|
||||||
|
+ stdio = fcntl(terminal, F_SETFD, FD_CLOEXEC);
|
||||||
|
+ if (stdio == -1) {
|
||||||
|
+ error.SetErrorToErrno();
|
||||||
|
+ return error;
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
SetSTDIOFileDescriptor(stdio);
|
||||||
|
}
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@ -42,3 +42,4 @@ locale-issue-ld.diff
|
|||||||
CVE-2015-2305.patch
|
CVE-2015-2305.patch
|
||||||
bug783205.patch
|
bug783205.patch
|
||||||
fix-cmake-config-prefix.diff
|
fix-cmake-config-prefix.diff
|
||||||
|
kfreebsd-build-fix.patch
|
||||||
|
Loading…
Reference in New Issue
Block a user