[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, master, updated. debian/16.0.912.77_r118311-1-9-g826649a

[Giuseppe Iuculano]

The following commit has been merged in the master branch:
commit 826649a04208601fa9a99072033b348bca5d4c40
Author: Giuseppe Iuculano <iuculano at debian.org>
Date:   Sun Feb 19 20:11:13 2012 +0100

    Fix FTBFS on armel and added armhf
    
    Thanks: Konstantinos Margaritis
    Thanks: Riku Voipio
    Closes: #632119

diff --git a/debian/control b/debian/control
index ea87c7c..4f3ee44 100644
--- a/debian/control
+++ b/debian/control
@@ -63,7 +63,7 @@ Build-Depends: cdbs,
 	libxt-dev,
 	libxtst-dev,
 	libpam0g-dev,
-	binutils-gold,
+	binutils-gold [!armel !armhf],
 	libflac-dev,
 	libwebp-dev,
 	autotools-dev,
@@ -74,7 +74,9 @@ Build-Depends: cdbs,
 	libavutil-dev (>= 4:0.7.1),
 	scons,
 	libelf-dev,
-	python-simplejson
+	python-simplejson,
+	libegl1-mesa-dev,
+	libgles2-mesa-dev
 Standards-Version: 3.9.2
 
 Package: chromium-browser
@@ -129,7 +131,7 @@ Description: page inspector for the chromium-browser - transitional dummy packag
  This package contains 'inspector', transitional dummy package.
 
 Package: chromium
-Architecture: i386 amd64 armel
+Architecture: i386 amd64 armel armhf
 Depends: ${shlibs:Depends}, ${misc:Depends},
 	libnss3-1d (>= 3.12.3),
 	libvpx0 (>= 0.9.6),
@@ -150,7 +152,7 @@ Description: Google's open source chromium web browser
  This package contains the Chromium browser.
 
 Package: chromium-dbg
-Architecture: i386 amd64 armel
+Architecture: i386 amd64 armel armhf
 Section: debug
 Priority: extra
 Depends: ${shlibs:Depends}, ${misc:Depends}, chromium (= ${binary:Version})
diff --git a/debian/patches/arm-no-float-abi.patch b/debian/patches/arm-no-float-abi.patch
new file mode 100644
index 0000000..8e28888
--- /dev/null
+++ b/debian/patches/arm-no-float-abi.patch
@@ -0,0 +1,10 @@
+--- a/src/build/common.gypi
++++ b/src/build/common.gypi
+@@ -1819,7 +1819,6 @@
+                     'cflags': [
+                       '-march=armv7-a',
+                       '-mtune=cortex-a8',
+-                      '-mfloat-abi=softfp',
+                     ],
+                     'conditions': [
+                       ['arm_neon==1', {
diff --git a/debian/patches/series b/debian/patches/series
index 9414b80..735f132 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,3 +20,4 @@ system_v8.patch
 #protobuf.patch
 nss-workaround.patch
 libav0.8.patch
+arm-no-float-abi.patch
diff --git a/debian/rules b/debian/rules
index cd99cc0..26a4908 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,17 +73,32 @@ GYP_DEFINES += werror=$(NULL)
 endif
 
 DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 ifeq (arm,$(DEB_HOST_ARCH_CPU))
-AVOID_GCC_44 := 0
 GYP_DEFINES += \
-	arm_thumb=0 \
 	target_arch=arm \
 	disable_nacl=1 \
 	linux_use_tcmalloc=0 \
+	enable_webrtc=0 \
+	use_cups=1 \
+	$(NULL)
+ifeq (armel,$(DEB_HOST_ARCH))
+AVOID_GCC_44 := 0
+GYP_DEFINES += \
+	arm_thumb=0 \
 	armv7=0 \
 	arm_neon=0 \
 	$(NULL)
+endif
+ifeq (armhf,$(DEB_HOST_ARCH))
+GYP_DEFINES += \
+	arm_thumb=1 \
+	armv7=1 \
+	arm_neon=0 \
+	$(NULL)
+endif
+
 WANT_LZMA_DEBS := 0
 WANT_TESTS     := 0
 else

-- 
Git repository for pkg-chromium