chromium: fixed build issues (thanks to Mikhail Kolesnik)
This commit is contained in:
parent
accc72157e
commit
39c1e1f766
@ -1,3 +1,4 @@
|
|||||||
dab90271e918f48ed215648521d5a8a0 bison.patch
|
dab90271e918f48ed215648521d5a8a0 bison.patch
|
||||||
2ee0e7ca8ec685d4031625bc005f4f45 chromium-21.0.1180.92.tar.bz2
|
2ee0e7ca8ec685d4031625bc005f4f45 chromium-21.0.1180.92.tar.bz2
|
||||||
64968626706b07721983ac59fb3babbf chromium.sh
|
64968626706b07721983ac59fb3babbf chromium.sh
|
||||||
|
d1a2b0663cbf38ebc71cc75073a39b43 use-siginfo_t.patch
|
||||||
|
@ -6,9 +6,9 @@
|
|||||||
|
|
||||||
name=chromium
|
name=chromium
|
||||||
version=21.0.1180.92
|
version=21.0.1180.92
|
||||||
release=1
|
release=2
|
||||||
source=(http://gsdview.appspot.com/chromium-browser-official/$name-$version.tar.bz2 \
|
source=(http://gsdview.appspot.com/chromium-browser-official/$name-$version.tar.bz2 \
|
||||||
$name.sh bison.patch)
|
$name.sh bison.patch use-siginfo_t.patch)
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd $name-$version
|
cd $name-$version
|
||||||
@ -16,6 +16,9 @@ build() {
|
|||||||
# https://bugs.webkit.org/show_bug.cgi?id=92264
|
# https://bugs.webkit.org/show_bug.cgi?id=92264
|
||||||
patch -d ./third_party/WebKit -p1 -i $SRC/bison.patch
|
patch -d ./third_party/WebKit -p1 -i $SRC/bison.patch
|
||||||
|
|
||||||
|
# fix building issues
|
||||||
|
patch -p1 -i $SRC/use-siginfo_t.patch
|
||||||
|
|
||||||
find third_party/WebKit/Source ui/base/ime \
|
find third_party/WebKit/Source ui/base/ime \
|
||||||
-type f -exec sed -e 's|<glib/.*\.h>|<glib.h>|g' -i {} \;
|
-type f -exec sed -e 's|<glib/.*\.h>|<glib.h>|g' -i {} \;
|
||||||
|
|
||||||
|
35
chromium/use-siginfo_t.patch
Normal file
35
chromium/use-siginfo_t.patch
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
diff -upr chromium-20.0.1132.57.orig/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h chromium-20.0.1132.57/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
|
||||||
|
--- chromium-20.0.1132.57.orig/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-07-10 10:48:31.000000000 +0300
|
||||||
|
+++ chromium-20.0.1132.57/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-07-11 23:44:11.000000000 +0300
|
||||||
|
@@ -243,14 +243,13 @@ struct kernel_rusage {
|
||||||
|
long ru_nivcsw;
|
||||||
|
};
|
||||||
|
|
||||||
|
-struct siginfo;
|
||||||
|
#if defined(__i386__) || defined(__arm__) || defined(__PPC__)
|
||||||
|
|
||||||
|
/* include/asm-{arm,i386,mips,ppc}/signal.h */
|
||||||
|
struct kernel_old_sigaction {
|
||||||
|
union {
|
||||||
|
void (*sa_handler_)(int);
|
||||||
|
- void (*sa_sigaction_)(int, struct siginfo *, void *);
|
||||||
|
+ void (*sa_sigaction_)(int, siginfo_t *, void *);
|
||||||
|
};
|
||||||
|
unsigned long sa_mask;
|
||||||
|
unsigned long sa_flags;
|
||||||
|
@@ -287,13 +286,13 @@ struct kernel_sigaction {
|
||||||
|
unsigned long sa_flags;
|
||||||
|
union {
|
||||||
|
void (*sa_handler_)(int);
|
||||||
|
- void (*sa_sigaction_)(int, struct siginfo *, void *);
|
||||||
|
+ void (*sa_sigaction_)(int, siginfo_t *, void *);
|
||||||
|
};
|
||||||
|
struct kernel_sigset_t sa_mask;
|
||||||
|
#else
|
||||||
|
union {
|
||||||
|
void (*sa_handler_)(int);
|
||||||
|
- void (*sa_sigaction_)(int, struct siginfo *, void *);
|
||||||
|
+ void (*sa_sigaction_)(int, siginfo_t *, void *);
|
||||||
|
};
|
||||||
|
unsigned long sa_flags;
|
||||||
|
void (*sa_restorer)(void);
|
Loading…
Reference in New Issue
Block a user