Fix building with -flto; do not force optimisation compiler flags

3 files changed, 38 insertions, 8 deletions

diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index 24219b24396..624c8a49cb7 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2015/01/20 09:37:53 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2015/01/21 18:15:17 adam Exp $
 
 SNAPSHOT_DATE=	20141218
 
@@ -48,9 +48,8 @@ BUILD_DEPENDS+=		yasm>=0.4.0:../../devel/yasm
 CONFIGURE_ARGS+=	--disable-asm
 .endif
 
-USE_TOOLS+=		gmake bash
+USE_TOOLS+=		bash gmake
 USE_LIBTOOL=		yes
-
 HAS_CONFIGURE=		yes
 CONFIG_SHELL=		${BASH}
 CONFIGURE_ARGS+=	--enable-pic	# uses libtool's -prefer-pic
@@ -70,7 +69,6 @@ CONFIGURE_ARGS+=	--host=${MACHINE_GNU_PLATFORM:Q}
 BUILD_TARGET=		default
 INSTALL_TARGET=		install-lib-static install-cli
 INSTALLATION_DIRS=	bin
-BUILDLINK_TRANSFORM+=	rm:-O4	# XXX does this mean anything to any compiler?
 REPLACE_SH=		strip_fopt.sh version.sh
 
 .include "../../mk/dlopen.buildlink3.mk"
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo
index 884ddb36eea..59df97ce416 100644
--- a/multimedia/x264-devel/distinfo
+++ b/multimedia/x264-devel/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.35 2015/01/20 09:37:53 wiz Exp $
+$NetBSD: distinfo,v 1.36 2015/01/21 18:15:17 adam Exp $
 
 SHA1 (x264-snapshot-20141218-2245.tar.bz2) = 24a3b20e2c49a112e40df9f64885cbd81250298a
 RMD160 (x264-snapshot-20141218-2245.tar.bz2) = dda0759d0f8f2284618009cd6a8f296c034637ae
 Size (x264-snapshot-20141218-2245.tar.bz2) = 652228 bytes
-SHA1 (patch-aa) = 816592309007dbd1d7be002613503733dff133d2
+SHA1 (patch-aa) = cfb5c8f90548aa2ee2cdfadc34010033f2288258
 SHA1 (patch-ab) = e0cbdf86c506c3c3efa515099b544b918f25d254
 SHA1 (patch-ac) = e81a4c74cca30a0d3191817ada915fc956362509
 SHA1 (patch-ba) = a8f12131e23953704361fb499b568f8f233c6be6
diff --git a/multimedia/x264-devel/patches/patch-aa b/multimedia/x264-devel/patches/patch-aa
index c55169bfb4d..e576e472001 100644
--- a/multimedia/x264-devel/patches/patch-aa
+++ b/multimedia/x264-devel/patches/patch-aa
@@ -1,6 +1,11 @@
-$NetBSD: patch-aa,v 1.19 2014/10/24 10:20:44 adam Exp $
+$NetBSD: patch-aa,v 1.20 2015/01/21 18:15:17 adam Exp $
 
---- configure.orig	2014-10-23 20:45:04.000000000 +0000
+Add support for DragonFly.
+Use 'amd64' as a synonym for 'x86_64'.
+Avoid endian test failure for -flto.
+Do not force compiler optimisations.
+
+--- configure.orig	2014-11-28 21:45:04.000000000 +0000
 +++ configure
 @@ -516,6 +516,10 @@ case $host_os in
          SYS="FREEBSD"
@@ -39,6 +44,15 @@ $NetBSD: patch-aa,v 1.19 2014/10/24 10:20:44 adam Exp $
                  CFLAGS="$CFLAGS -maltivec -mabi=altivec"
                  define HAVE_ALTIVEC_H
              fi
+@@ -817,7 +822,7 @@ ASFLAGS="$ASFLAGS -DSTACK_ALIGNMENT=$sta
+ # skip endianness check for Intel Compiler and MSVS, as all supported platforms are little. each have flags that will cause the check to fail as well
+ if [ $compiler = GNU ]; then
+     echo "int i[2] = {0x42494745,0}; double f[2] = {0x1.0656e6469616ep+102,0};" > conftest.c
+-    $CC $CFLAGS conftest.c -c -o conftest.o 2>/dev/null || die "endian test failed"
++    $CC $CPPFLAGS conftest.c -c -o conftest.o 2>/dev/null || die "endian test failed"
+     if (${cross_prefix}strings -a conftest.o | grep -q BIGE) && (${cross_prefix}strings -a conftest.o | grep -q FPendian) ; then
+         define WORDS_BIGENDIAN
+     elif !(${cross_prefix}strings -a conftest.o | grep -q EGIB && ${cross_prefix}strings -a conftest.o | grep -q naidnePF) ; then
 @@ -830,7 +835,7 @@ fi
  # pthread-win32 is lgpl, prevent its use if --disable-gpl is specified and targeting windows
  [ "$SYS" = "WINDOWS" -a "$gpl" = "no" -a "$thread" = "auto" ] && thread="win32"
@@ -62,3 +76,21 @@ $NetBSD: patch-aa,v 1.19 2014/10/24 10:20:44 adam Exp $
      [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
  fi
  
+@@ -1061,8 +1067,6 @@ fi
+ 
+ if [ "$debug" = "yes" ]; then
+     CFLAGS="-O1 -g $CFLAGS"
+-else
+-    CFLAGS="-O3 -ffast-math $CFLAGS"
+ fi
+ 
+ if cc_check '' -fno-tree-vectorize ; then
+@@ -1154,7 +1158,7 @@ else # gcc/icc
+     DEPMM="$DEPMM -g0"
+     AR="$AR rc "
+     LD="$CC -o "
+-    LIBX264=libx264.a
++    LIBX264=libx264.la
+     [ -n "$RC" ] && RCFLAGS="$RCFLAGS -I. -o "
+ fi
+ [ $compiler != GNU ] && CFLAGS="$(cc_cflags $CFLAGS)"