radhermit 14/12/02 16:17:08 Modified: x264-cflags.patch Added: x264-0.0.20130912-cflags.patch Log: Update cflags patch for live ebuild (bug #482994). (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 4F064CA3)
Revision Changes Path 1.3 media-libs/x264/files/x264-cflags.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/files/x264-cflags.patch?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/files/x264-cflags.patch?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/files/x264-cflags.patch?r1=1.2&r2=1.3 Index: x264-cflags.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/x264/files/x264-cflags.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- x264-cflags.patch 13 Sep 2013 13:05:04 -0000 1.2 +++ x264-cflags.patch 2 Dec 2014 16:17:08 -0000 1.3 @@ -1,8 +1,8 @@ diff --git a/configure b/configure -index 07796b1..afdda94 100755 +index 0a4cb94..8f7ef75 100755 --- a/configure +++ b/configure -@@ -556,11 +556,6 @@ case $host_cpu in +@@ -591,11 +591,6 @@ case $host_cpu in if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then CFLAGS="$CFLAGS -march=i686" fi @@ -11,13 +11,13 @@ - fi - CFLAGS="-m32 $CFLAGS" - LDFLAGS="-m32 $LDFLAGS" - else + elif [ $compiler = ICC ]; then # icc on linux has various degrees of mod16 stack support if [ $SYS = LINUX ]; then -@@ -591,13 +586,8 @@ case $host_cpu in - x86_64) +@@ -627,13 +622,8 @@ case $host_cpu in ARCH="X86_64" AS="yasm" + ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/" - [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS" if [ "$SYS" = MACOSX ]; then ASFLAGS="$ASFLAGS -f macho64 -m amd64 -DPIC -DPREFIX" @@ -28,7 +28,7 @@ elif [ "$SYS" = WINDOWS -o "$SYS" = CYGWIN ]; then ASFLAGS="$ASFLAGS -f win32 -m amd64" # only the GNU toolchain is inconsistent in prefixing function names with _ -@@ -605,7 +595,11 @@ case $host_cpu in +@@ -641,7 +631,11 @@ case $host_cpu in [ $compiler = GNU ] && LDFLAGS="$LDFLAGS -Wl,--nxcompat -Wl,--dynamicbase" [ $compiler = GNU ] && RCFLAGS="--target=pe-x86-64 $RCFLAGS" else @@ -41,7 +41,7 @@ fi ;; powerpc|powerpc64) -@@ -971,10 +965,6 @@ if [ "$pic" = "yes" ] ; then +@@ -1006,10 +1000,6 @@ if [ "$pic" = "yes" ] ; then [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text" fi @@ -50,5 +50,6 @@ -fi - if [ "$strip" = "yes" ]; then - CFLAGS="$CFLAGS -s" LDFLAGS="$LDFLAGS -s" + fi + 1.1 media-libs/x264/files/x264-0.0.20130912-cflags.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/files/x264-0.0.20130912-cflags.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/files/x264-0.0.20130912-cflags.patch?rev=1.1&content-type=text/plain Index: x264-0.0.20130912-cflags.patch =================================================================== diff --git a/configure b/configure index 07796b1..afdda94 100755 --- a/configure +++ b/configure @@ -556,11 +556,6 @@ case $host_cpu in if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then CFLAGS="$CFLAGS -march=i686" fi - if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then - CFLAGS="$CFLAGS -mfpmath=sse -msse" - fi - CFLAGS="-m32 $CFLAGS" - LDFLAGS="-m32 $LDFLAGS" else # icc on linux has various degrees of mod16 stack support if [ $SYS = LINUX ]; then @@ -591,13 +586,8 @@ case $host_cpu in x86_64) ARCH="X86_64" AS="yasm" - [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS" if [ "$SYS" = MACOSX ]; then ASFLAGS="$ASFLAGS -f macho64 -m amd64 -DPIC -DPREFIX" - if cc_check '' "-arch x86_64"; then - CFLAGS="$CFLAGS -arch x86_64" - LDFLAGS="$LDFLAGS -arch x86_64" - fi elif [ "$SYS" = WINDOWS -o "$SYS" = CYGWIN ]; then ASFLAGS="$ASFLAGS -f win32 -m amd64" # only the GNU toolchain is inconsistent in prefixing function names with _ @@ -605,7 +595,11 @@ case $host_cpu in [ $compiler = GNU ] && LDFLAGS="$LDFLAGS -Wl,--nxcompat -Wl,--dynamicbase" [ $compiler = GNU ] && RCFLAGS="--target=pe-x86-64 $RCFLAGS" else - ASFLAGS="$ASFLAGS -f elf -m amd64" + if cpp_check "" "" "__ILP32__" ; then + ASFLAGS="$ASFLAGS -f elf -m x32" + else + ASFLAGS="$ASFLAGS -f elf -m amd64" + fi fi ;; powerpc|powerpc64) @@ -971,10 +965,6 @@ if [ "$pic" = "yes" ] ; then [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text" fi -if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then - CFLAGS="$CFLAGS -fomit-frame-pointer" -fi - if [ "$strip" = "yes" ]; then CFLAGS="$CFLAGS -s" LDFLAGS="$LDFLAGS -s"
