[Pkg-gstreamer-commits] [SCM] libvpx Debian packaging branch, master, updated. debian/1.2.0-1-1-g96171bf

[Sebastian Dröge]

The following commit has been merged in the master branch:
commit 96171bfc0e3f5ccbbfe0d166d7517fa8b809a9dc
Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Mon May 27 13:13:02 2013 +0200

    Fix build on ARM by using the correct compiler and CFLAGS

diff --git a/debian/changelog b/debian/changelog
index 110d8a4..6d65802 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libvpx (1.2.0-2) unstable; urgency=low
+
+  * debian/rules,
+    debian/patches/fix-armhf-link.patch:
+    + Fix build on ARM by using the correct compiler and CFLAGS.
+
+ -- Sebastian Dröge <slomo at debian.org>  Mon, 27 May 2013 13:08:06 +0200
+
 libvpx (1.2.0-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/fix-armhf-link.patch b/debian/patches/fix-armhf-link.patch
index d170a0d..e171031 100644
--- a/debian/patches/fix-armhf-link.patch
+++ b/debian/patches/fix-armhf-link.patch
@@ -1,8 +1,16 @@
 diff --git a/build/make/configure.sh b/build/make/configure.sh
-index c99a01c..c951900 100755
+index c99a01c..34f9baf 100755
 --- a/build/make/configure.sh
 +++ b/build/make/configure.sh
-@@ -783,8 +783,8 @@ process_common_toolchain() {
+@@ -775,7 +775,6 @@ process_common_toolchain() {
+ 
+         case ${tgt_cc} in
+         gcc)
+-            CROSS=${CROSS:-arm-none-linux-gnueabi-}
+             link_with_cc=gcc
+             setup_gnu_toolchain
+             arch_int=${tgt_isa##armv}
+@@ -783,18 +782,14 @@ process_common_toolchain() {
              check_add_asflags --defsym ARCHITECTURE=${arch_int}
              tune_cflags="-mtune="
              if [ ${tgt_isa} == "armv7" ]; then
@@ -13,3 +21,13 @@ index c99a01c..c951900 100755
  
                  if enabled neon
                  then
+                     check_add_cflags -mfpu=neon #-ftree-vectorize
+                     check_add_asflags -mfpu=neon
+                 fi
+-
+-                if [ -z "${tune_cpu}" ]; then
+-                    tune_cpu=cortex-a8
+-                fi
+             else
+                 check_add_cflags -march=${tgt_isa}
+                 check_add_asflags -march=${tgt_isa}
diff --git a/debian/rules b/debian/rules
index ccf0c14..c42e3a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,6 +30,7 @@ ifeq ($(DEB_HOST_ARCH), armhf)
 # thus we use ARMv6 and -marm (since no thumb2 on ARMv6) to ensure compatability
 # with all ARMv7 cores we support.
 CFLAGS += -marm
+CXXFLAGS += -marm
 configure_flags += --target=armv6-linux-gcc --enable-small
 else
 ifeq ($(DEB_HOST_ARCH), amd64)
@@ -66,11 +67,14 @@ export CROSS
 endif
 
 CFLAGS += -Wall -g
+CXXFLAGS += -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 CFLAGS += -O0
+CXXFLAGS += -O0
 else
 CFLAGS += -O2
+CXXFLAGS += -O2
 endif
 
 builddir := $(CURDIR)/builddir
@@ -80,13 +84,13 @@ configure-stamp:
 	dh_testdir
 	mkdir -p $(builddir); \
 	cd $(builddir); \
-	CFLAGS="$(CFLAGS)" $(CURDIR)/configure \
+	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(CURDIR)/configure \
 		$(configure_flags)
 	touch $@
 ifeq ($(BUILD_NEON), Yes)
 	mkdir -p $(builddir)-neon; \
 	cd $(builddir)-neon; \
-	CFLAGS="$(CFLAGS)" $(CURDIR)/configure \
+	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"  $(CURDIR)/configure \
 		$(configure_flags_neon)
 	touch $@
 endif

-- 
libvpx Debian packaging