Re: Bug#669059: webkit-1.8.0-2: FTBFS on hurd-*
On Mon, 2012-04-23 at 10:00 +0200, Pino Toscano wrote:
> Alle lunedì 23 aprile 2012, Svante Signell ha scritto:
> > -#elif OS(UNIX)
> > +#elif OS(HURD)
> > CString getCurrentExecutablePath()
> > + return CString();
> > +#elif OS(UNIX)
>
> This won't ever compile (missing curly brackets).
Sorry for that, updated patch attached! This one will compile. I think
the Debian-Maintainer would have found out too, since the first part of
the patch is common to the build problems for kfreebsd, so it has to be
merged.
> Svante, instead of flooding the bug reports with reviews about
> unfinished patches, can you please just do all the discussion on d-hurd@
> and only when the patch is okay send it to the bug report?
Yes, I will do that in the future. This updated patch will be the last
one until a functional (non-dummy) one is accepted by the reviewers on
d-h@. I just wanted to get a quick fix into the bug report as a
follow-up to Guillems mail. The fix was too quick, sorry for that.
Normally I check by building the patched packages, but in this case
compiling takes days...
--- a/Source/ThirdParty/ANGLE/src/compiler/osinclude.h 2012-02-19 18:47:57.000000000 +0100
+++ b/Source/ThirdParty/ANGLE/src/compiler/osinclude.h 2012-04-15 09:20:30.000000000 +0200
@@ -16,7 +16,7 @@
#define ANGLE_OS_WIN
#elif defined(__APPLE__) || defined(__linux__) || \
defined(__FreeBSD__) || defined(__OpenBSD__) || \
- defined(__sun) || defined(ANDROID)
+ defined(__sun) || defined(ANDROID) || defined(__GNU__)
#define ANGLE_OS_POSIX
#else
#error Unsupported platform.
--- a/Source/JavaScriptCore/wtf/gobject/GlibUtilities.cpp 2012-02-19 18:45:45.000000000 +0100
+++ b/Source/JavaScriptCore/wtf/gobject/GlibUtilities.cpp 2012-04-23 10:24:41.000000000 +0200
@@ -37,9 +37,13 @@
return CString();
return CString(readLinkBuffer, result);
}
-#elif OS(UNIX)
+#elif OS(HURD)
CString getCurrentExecutablePath()
{
+ return CString();
+}
+#elif OS(UNIX)
+{
static char readLinkBuffer[PATH_MAX];
ssize_t result = readlink("/proc/curproc/file", readLinkBuffer, PATH_MAX);
if (result == -1)
Reply to: