[pkgsrc/trunk]: pkgsrc/multimedia/x264-devel Fix build under Mac OS X Intel b...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cc8f24e902b9
branches:  trunk
changeset: 539974:cc8f24e902b9
user:      tron <tron%pkgsrc.org@localhost>
date:      Tue Mar 18 15:05:03 2008 +0000

description:
Fix build under Mac OS X Intel by stripping out the "-fno-common" that
"yasm" doesn't understand. Also improve the similar hack used under
NetBSD to strip out "-fpic".

diffstat:

 multimedia/x264-devel/Makefile            |   8 +++++++-
 multimedia/x264-devel/distinfo            |   5 ++---
 multimedia/x264-devel/files/strip_fopt.sh |  23 +++++++++++++++++++++++
 multimedia/x264-devel/patches/patch-ab    |   4 ++--
 multimedia/x264-devel/patches/patch-ac    |  22 ----------------------
 5 files changed, 34 insertions(+), 28 deletions(-)

diffs (109 lines):

diff -r b7b37a45ee98 -r cc8f24e902b9 multimedia/x264-devel/Makefile
--- a/multimedia/x264-devel/Makefile    Tue Mar 18 13:25:29 2008 +0000
+++ b/multimedia/x264-devel/Makefile    Tue Mar 18 15:05:03 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/03/11 13:20:29 tron Exp $
+# $NetBSD: Makefile,v 1.10 2008/03/18 15:05:03 tron Exp $
 #
 
 SNAPSHOT_DATE=         20071218
@@ -35,8 +35,14 @@
 
 HAS_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --prefix=${PREFIX:Q}
+MAKE_ENV+=             SH=${SH:Q}
 
 BUILD_TARGET=          default
 
+post-extract:
+       ${SED} -e 's,@SH@,${SH},' ${FILESDIR}/strip_fopt.sh \
+         >${WRKSRC}/strip_fopt.sh
+       ${CHMOD} +x ${WRKSRC}/strip_fopt.sh
+
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r b7b37a45ee98 -r cc8f24e902b9 multimedia/x264-devel/distinfo
--- a/multimedia/x264-devel/distinfo    Tue Mar 18 13:25:29 2008 +0000
+++ b/multimedia/x264-devel/distinfo    Tue Mar 18 15:05:03 2008 +0000
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.7 2008/03/11 13:20:29 tron Exp $
+$NetBSD: distinfo,v 1.8 2008/03/18 15:05:03 tron Exp $
 
 SHA1 (x264-snapshot-20071218-2245.tar.bz2) = b5bc182070e17a8470618bae776488514b67a96a
 RMD160 (x264-snapshot-20071218-2245.tar.bz2) = 753ab79398bf5bb92b41656ef48ab57dcc63f347
 Size (x264-snapshot-20071218-2245.tar.bz2) = 537622 bytes
 SHA1 (patch-aa) = cce1ef8b7a332e9f9a4c18a8a4246b9382dc4bca
-SHA1 (patch-ab) = e4ce859a2c395e81bb2c5de3a5943c600e3c86eb
-SHA1 (patch-ac) = 18a21816bddc28b9cd9139c3fdb179ebcbf03a4a
+SHA1 (patch-ab) = 60de00034a4cc19aba4a2669eaf91080a5b5b6ac
diff -r b7b37a45ee98 -r cc8f24e902b9 multimedia/x264-devel/files/strip_fopt.sh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/x264-devel/files/strip_fopt.sh Tue Mar 18 15:05:03 2008 +0000
@@ -0,0 +1,23 @@
+#!@SH@
+#
+# $NetBSD: strip_fopt.sh,v 1.1 2008/03/18 15:05:04 tron Exp $
+#
+# libtool assumes that the compiler can handle the -fPIC flag and the
+# -fno-common. This isn't always true, for example yasm can't handle it.
+command="$1"
+shift
+while [ $# -gt 0 ]; do
+       case "$1" in
+       -fPIC|-fno-common)
+               ;;
+       -DPIC)
+               command="$command -D__PIC__"
+               ;;
+       *)
+               command="$command $1"
+               ;;
+       esac
+       shift
+done
+echo $command
+exec $command
diff -r b7b37a45ee98 -r cc8f24e902b9 multimedia/x264-devel/patches/patch-ab
--- a/multimedia/x264-devel/patches/patch-ab    Tue Mar 18 13:25:29 2008 +0000
+++ b/multimedia/x264-devel/patches/patch-ab    Tue Mar 18 15:05:03 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2008/03/11 13:20:29 tron Exp $
+$NetBSD: patch-ab,v 1.5 2008/03/18 15:05:04 tron Exp $
 
 --- Makefile.orig      2007-12-18 22:45:04.000000000 +0100
 +++ Makefile
@@ -78,7 +78,7 @@
 +common/amd64/*.lo: common/amd64/amd64inc.asm
 +common/i386/*.lo: common/i386/i386inc.asm
 +%.lo: %.asm
-+      ${LIBTOOL} --mode=compile --tag=ASM sh strip_fPIC.sh $(AS) $(ASFLAGS) -o $@ $<
++      ${LIBTOOL} --mode=compile --tag=ASM ./strip_fopt.sh $(AS) $(ASFLAGS) -o $@ $<
  # delete local/anonymous symbols, so they don't show up in oprofile
        -@ strip -x $@
  
diff -r b7b37a45ee98 -r cc8f24e902b9 multimedia/x264-devel/patches/patch-ac
--- a/multimedia/x264-devel/patches/patch-ac    Tue Mar 18 13:25:29 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2008/03/10 11:59:26 drochner Exp $
-
---- strip_fPIC.sh.orig 2008-01-11 20:38:05.000000000 +0100
-+++ strip_fPIC.sh
-@@ -0,0 +1,17 @@
-+#!/bin/sh
-+#
-+# libtool assumes that the compiler can handle the -fPIC flag
-+# This isn't always true (for example, nasm can't handle it)
-+command=""
-+while [ $1 ]; do
-+      if [ "$1" != "-fPIC" ]; then
-+              if [ "$1" = "-DPIC" ]; then
-+                      command="$command -D__PIC__"
-+              else
-+                      command="$command $1"
-+              fi
-+      fi
-+      shift
-+done
-+echo $command
-+exec $command