Add several dependencies for QtWebEngine #178
Conversation
Signed-off-by: Dennis Bonke <[email protected]>
Dennisbonke
force-pushed
the
qtwebkit-deps
branch
2 times, most recently
from
c2dc89e
to
81fc2c6
Compare
Dennisbonke
force-pushed
the
qtwebkit-deps
branch
2 times, most recently
from
3264bd5
to
ac93e77
Compare
Dennisbonke
changed the title
Dennisbonke
changed the title
| /// Choose a default value for the -j (parallelism) flag. | ||
| int GuessParallelism() { | ||
| + int j = 0; | ||
| + char* jobs = getenv( "NINJAJOBS" ); | ||
| + if ( jobs != NULL ) j = atoi( jobs ); | ||
| + if ( j > 0 ) return j; |
There was a problem hiding this comment.
Why do we patch ninja instead of just using the -j flag? Patching ninja doesn't sound really appealing to me.
There was a problem hiding this comment.
If ninja is invoked by a different build system or a script (for example, qtwebengine, which builds with cmake but then builds chromium with ninja), an user can't pass the -j flag. With this patch, we can also use the NINJAJOBS environment variable. The patch was sourced from BLFS.
There was a problem hiding this comment.
When using the build subcommand of cmake, you can pass arguments to make/ninja like so: cmake build -- -jN
There was a problem hiding this comment.
Interesting, I didn't know that. In that case it's possible to drop the patch, tho I don't mind keeping it either.
| -#if HAVE_SCHED_GETAFFINITY && defined(CPU_COUNT) | ||
| +#if HAVE_SCHED_GETAFFINITY && defined(CPU_COUNT) && !defined(__managarm__) |
| -SYMBOL_VERSION(pci_filter_init_v38, pci_filter_init@LIBPCI_3.3); | ||
| +//SYMBOL_VERSION(pci_filter_init_v38, pci_filter_init@LIBPCI_3.3); |
There was a problem hiding this comment.
I got strange linker errors related to this, so I removed it. If requested, we could investigate it and fix those instead.
| +#ifdef __managarm__ | ||
| +static void outb(unsigned char value, unsigned short int port) {} | ||
| + | ||
| +static void outw(unsigned short int value, unsigned short int port) {} | ||
| + | ||
| +static void outl(unsigned int value, unsigned short int port) {} | ||
| + | ||
| +static unsigned char inb(unsigned short int port) { | ||
| + return 0; | ||
| +} | ||
| + | ||
| +static unsigned short int inw(unsigned short int port) { | ||
| + return 0; | ||
| +} | ||
| + | ||
| +static unsigned int inl(unsigned short int port) { | ||
| + return 0; | ||
| +} | ||
| +#endif |
There was a problem hiding this comment.
This does not look correct. We should not silently return wrong values (?).
There was a problem hiding this comment.
Indeed we shouldn't, but at the time of creating this patch the libc wrapper functions didn't exist yet and I was too lazy to patch them in properly. With the correct mlibc PR merged, we might be able to drop this part of the patch completely.
| -#ifdef PCI_OS_LINUX | ||
| +#if defined PCI_OS_LINUX && !defined __managarm__ |
There was a problem hiding this comment.
I honestly don't remember anymore, we might be able to just drop this part.
| @@ -0,0 +1,67 @@ | |||
| From 0c716d435abe65250100c2caea0e5126ac4e14bd Mon Sep 17 00:00:00 2001 | |||
There was a problem hiding this comment.
This file does not match our usual patch naming convention.
There was a problem hiding this comment.
The patch was taken as-is from gentoo, so I kept the name intact as well.
| @@ -0,0 +1,35 @@ | |||
| From 516fdcca6606502e2d562d20c01b225c8d066739 Mon Sep 17 00:00:00 2001 | |||
There was a problem hiding this comment.
This file does not match our usual patch naming convention.
There was a problem hiding this comment.
The patch was taken as-is from gentoo, so I kept the name intact as well.
There was a problem hiding this comment.
The issue is that xbstrap sorts patches by their file name, so if we're missing the 0001- prefix, they'll be applied in "random" orders.
Signed-off-by: Dennis Bonke <[email protected]>
Signed-off-by: Dennis Bonke <[email protected]>
Dennisbonke
force-pushed
the
qtwebkit-deps
branch
from
ac93e77
to
d005df7
Compare
This PR aims to add all the needed dependencies for
QtWebEngineto compile. WhileQtWebEnginedoesn't compile fully with this, it does allowChromiumto build pretty decently, which is the next target.The following ports have been added:
pciutils;qtwebsockets;qtwebchannel.Blocked on managarm/mlibc#416
Blocked on managarm/mlibc#418
Blocked on #211