summaryrefslogtreecommitdiff
path: root/generate_gypi.sh
diff options
context:
space:
mode:
authormcgrathr@chromium.org <mcgrathr@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>2012-01-11 20:14:59 +0000
committermcgrathr@chromium.org <mcgrathr@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>2012-01-11 20:14:59 +0000
commitf03997481c72e948cfe3b06b3c9caf894b145d09 (patch)
treee9e45c8744ef56a4b726c172ac8df371c7373563 /generate_gypi.sh
parentf55b9961fa491566f540b80c67e5b64bb2a78053 (diff)
downloadlibvpx-f03997481c72e948cfe3b06b3c9caf894b145d09.tar.gz
Compile libvpx code as PIC for all Linux targets
TEXTRELs (i.e. non-PIC code in a DSO or PIE such as chrome) are a bad bad thing on Linux. As of M16 we managed to get rid of all of them (except for libffmpegsumo.so, where it will take a bunch of work). In M17 this regressed, due to the libvpx code. This makes users of Linux distributions such as Fedora very unhappy. It's a simple configuration change to tell libvpx to build PIC on ia32. This gets rid of all TEXTRELs in the chrome build again. BUG= http://code.google.com/p/chromium/issues/detail?id=109318 TEST= none Review URL: http://codereview.chromium.org/9185015 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libvpx@117274 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Diffstat (limited to 'generate_gypi.sh')
-rwxr-xr-xgenerate_gypi.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/generate_gypi.sh b/generate_gypi.sh
index 12bb206..42fe7ed 100755
--- a/generate_gypi.sh
+++ b/generate_gypi.sh
@@ -1,6 +1,6 @@
#!/bin/bash -e
#
-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -16,9 +16,9 @@
# for all platforms.
LIBVPX_SRC_DIR="source/libvpx"
-COMMON_CONFIG="CONFIG_REALTIME_ONLY=yes CONFIG_GCC=yes"
+COMMON_CONFIG="CONFIG_REALTIME_ONLY=yes CONFIG_GCC=yes CONFIG_PIC=yes"
X86_CONFIG="ARCH_X86=yes HAVE_MMX=yes HAVE_SSE2=yes HAVE_SSE3=yes HAVE_SSSE3=yes HAVE_SSE4_1=yes CONFIG_RUNTIME_CPU_DETECT=yes"
-X86_64_CONFIG="ARCH_X86_64=yes HAVE_MMX=yes HAVE_SSE2=yes HAVE_SSE3=yes HAVE_SSSE3=yes HAVE_SSE4_1=yes CONFIG_PIC=yes CONFIG_RUNTIME_CPU_DETECT=yes"
+X86_64_CONFIG="ARCH_X86_64=yes HAVE_MMX=yes HAVE_SSE2=yes HAVE_SSE3=yes HAVE_SSSE3=yes HAVE_SSE4_1=yes CONFIG_RUNTIME_CPU_DETECT=yes"
ARM_CONFIG="ARCH_ARM=yes HAVE_ARMV5TE=yes HAVE_ARMV6=yes"
ARM_NEON_CONFIG="ARCH_ARM=yes HAVE_ARMV5TE=yes HAVE_ARMV6=yes HAVE_ARMV7=yes"