Re: Bug#669059: webkit-1.8.0-2: FTBFS on hurd-*
On Mon, 2012-04-23 at 08:18 +0200, Svante Signell wrote:
> On Mon, 2012-04-23 at 07:54 +0200, Guillem Jover wrote:
> > On Wed, 2012-04-18 at 08:35:23 +0200, Svante Signell wrote:
> > > Attached is an updated patch. This patch together with the one in
> > > #664810 would enable a successful build of webkit-1.8.0 for GNU/Hurd.
...
> > As mentioned on the list this code will not work on the Hurd, a new
> > implementation needs to be done for OS(HURD) just before OS(UNIX),
> > because OS(UNIX) will match for the Hurd too. I gave a hint on how
> > this can be implemented on the list.
I'm working on that now. It will be sent to to the D-H ML for review
before submitted to this bug report.
> Yes, I know, a new OS(HURD) case has to be created. Trying to find out
> where to make that change, it would be a configure.ac somewhere. Then
> that case could use the code construct you pointed to.
Depending on timing for releasing an updated webkit (also solving the
kfree build problems, and #664810 for Hurd) the attached patch works
until a fully functional one is available after the review.
--- 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-19 22:06:41.000000000 +0200
@@ -37,8 +37,10 @@
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);
Reply to: