[Lunar-commits] <moonbase> chromium: fix the compile on x86_64.

Florin Braescu florin at lunar-linux.org
Thu Oct 27 20:40:23 CEST 2011


commit 56b84520b9c32300b361abdb018e4695ffd5c78f
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Thu Oct 27 20:40:23 2011 +0200

    chromium: fix the compile on x86_64.
---
 web/chromium/BUILD     |    2 ++
 web/chromium/DEPENDS   |   14 +++++++++++---
 web/chromium/nacl.gypi |    8 ++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/web/chromium/BUILD b/web/chromium/BUILD
index 0c0259b..8df9499 100644
--- a/web/chromium/BUILD
+++ b/web/chromium/BUILD
@@ -5,6 +5,8 @@
 
   sedit "s/'-Werror'/''/" build/common.gypi  &&
 
+  cp -f $SCRIPT_DIRECTORY/nacl.gypi chrome/  &&
+
   echo Fixing dumb CPU optimizations please wait in patience...
   find . -type f -exec sed -i \
   -e 's/-mcpu=/-march=/g' \
diff --git a/web/chromium/DEPENDS b/web/chromium/DEPENDS
index 1d052b7..49892f0 100644
--- a/web/chromium/DEPENDS
+++ b/web/chromium/DEPENDS
@@ -19,9 +19,18 @@ optional_depends "cups"   "-Duse_cups=1"          "-Duse_cups=0"          "To us
 optional_depends "ffmpeg" "-Duse_system_ffmpeg=1" "-Duse_system_ffmpeg=0" "To enable system ffmpeg"
 optional_depends "GConf"  "-Duse_gconf=1"         "-Duse_gconf=0"         "To use cups printing"
 optional_depends "speex"  ""                      ""                      "To use system speex"
-optional_depends "pulseaudio" "-Denable_webrtc=1" "-Denable_webrtc=0"     "To use Realtime Web Communication"
 
-optional_depends "libgnome-keyring"  "-Duse_gnome_keyring=1 -Dlinux_link_gnome_keyring=1" \
+optional_depends "pulseaudio"         \
+                 "-Denable_webrtc=1"  \
+                 "-Denable_webrtc=0"  \
+                 "To use Realtime Web Communication"
+
+optional_depends "heimdal"  \
+                 "-Duse_kerberos=1"  \
+                 "-Duse_kerberos=0"  \
+                 "To use heimdal (kerberos) support"
+
+optional_depends "libgnome-keyring"  "-Duse_gnome_keyring=1 -Dlinux_link_gnome_keyring=1"  \
                                      "-Duse_gnome_keyring=0 -Dlinux_link_gnome_keyring=0"  \
                                      "To use gnome keyring"
 
@@ -37,4 +46,3 @@ optional_depends "libgnome-keyring"  "-Duse_gnome_keyring=1 -Dlinux_link_gnome_k
 #not working in chromium 14.0
 #optional_depends "icu4c"  "-Duse_system_icu=1"    "-Duse_system_icu=0"    "To use system icu library"
 
-
diff --git a/web/chromium/nacl.gypi b/web/chromium/nacl.gypi
new file mode 100644
index 0000000..05638d6
--- /dev/null
+++ b/web/chromium/nacl.gypi
@@ -0,0 +1,8 @@
+{
+  'targets': [
+    {
+      'target_name': 'nacl',
+      'type': 'static_library',
+    },
+  ],
+}


More information about the Lunar-commits mailing list