| 1 |
aballier 13/08/01 16:59:01 |
| 2 |
|
| 3 |
Added: x264-cflags.patch |
| 4 |
Log: |
| 5 |
Do not mess too much with CFLAGS. Should fix bug #413661 and bug #351219. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 160F534A) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-libs/x264/files/x264-cflags.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/files/x264-cflags.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/files/x264-cflags.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: x264-cflags.patch |
| 16 |
=================================================================== |
| 17 |
https://bugs.gentoo.org/420241 for x32 stuff |
| 18 |
initial x32 support -- no asm code, just pure C |
| 19 |
|
| 20 |
avoid messing too much with CFLAGS. |
| 21 |
https://bugs.gentoo.org/show_bug.cgi?id=351219 |
| 22 |
https://bugs.gentoo.org/show_bug.cgi?id=413661 |
| 23 |
|
| 24 |
|
| 25 |
Index: x264-9999/configure |
| 26 |
=================================================================== |
| 27 |
--- x264-9999.orig/configure |
| 28 |
+++ x264-9999/configure |
| 29 |
@@ -553,11 +553,6 @@ case $host_cpu in |
| 30 |
if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then |
| 31 |
CFLAGS="$CFLAGS -march=i686" |
| 32 |
fi |
| 33 |
- if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then |
| 34 |
- CFLAGS="$CFLAGS -mfpmath=sse -msse" |
| 35 |
- fi |
| 36 |
- CFLAGS="-m32 $CFLAGS" |
| 37 |
- LDFLAGS="-m32 $LDFLAGS" |
| 38 |
else |
| 39 |
# icc on linux has various degrees of mod16 stack support |
| 40 |
if [ $SYS = LINUX ]; then |
| 41 |
@@ -588,13 +583,8 @@ case $host_cpu in |
| 42 |
x86_64) |
| 43 |
ARCH="X86_64" |
| 44 |
AS="yasm" |
| 45 |
- [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS" |
| 46 |
if [ "$SYS" = MACOSX ]; then |
| 47 |
ASFLAGS="$ASFLAGS -f macho64 -m amd64 -DPIC -DPREFIX" |
| 48 |
- if cc_check '' "-arch x86_64"; then |
| 49 |
- CFLAGS="$CFLAGS -arch x86_64" |
| 50 |
- LDFLAGS="$LDFLAGS -arch x86_64" |
| 51 |
- fi |
| 52 |
elif [ "$SYS" = WINDOWS ]; then |
| 53 |
ASFLAGS="$ASFLAGS -f win32 -m amd64" |
| 54 |
# only the GNU toolchain is inconsistent in prefixing function names with _ |
| 55 |
@@ -602,7 +592,11 @@ case $host_cpu in |
| 56 |
[ $compiler = GNU ] && LDFLAGS="$LDFLAGS -Wl,--nxcompat -Wl,--dynamicbase" |
| 57 |
[ $compiler = GNU ] && RCFLAGS="--target=pe-x86-64 $RCFLAGS" |
| 58 |
else |
| 59 |
- ASFLAGS="$ASFLAGS -f elf -m amd64" |
| 60 |
+ if cpp_check "" "" "__ILP32__" ; then |
| 61 |
+ ASFLAGS="$ASFLAGS -f elf -m x32" |
| 62 |
+ else |
| 63 |
+ ASFLAGS="$ASFLAGS -f elf -m amd64" |
| 64 |
+ fi |
| 65 |
fi |
| 66 |
;; |
| 67 |
powerpc|powerpc64) |
| 68 |
@@ -964,10 +958,6 @@ if [ "$pic" = "yes" ] ; then |
| 69 |
[ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text" |
| 70 |
fi |
| 71 |
|
| 72 |
-if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then |
| 73 |
- CFLAGS="$CFLAGS -fomit-frame-pointer" |
| 74 |
-fi |
| 75 |
- |
| 76 |
if [ "$strip" = "yes" ]; then |
| 77 |
CFLAGS="$CFLAGS -s" |
| 78 |
LDFLAGS="$LDFLAGS -s" |
Archives