pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

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



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b28d08daec6d
branches:  trunk
changeset: 539681:b28d08daec6d
user:      tron <tron%pkgsrc.org@localhost>
date:      Tue Mar 11 13:20:29 2008 +0000

description:
Fix build under Mac OS X PPC.

diffstat:

 multimedia/x264-devel/Makefile         |  10 +++++++++-
 multimedia/x264-devel/distinfo         |   4 ++--
 multimedia/x264-devel/patches/patch-ab |   4 ++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diffs (56 lines):

diff -r 83af0cabf096 -r b28d08daec6d multimedia/x264-devel/Makefile
--- a/multimedia/x264-devel/Makefile    Tue Mar 11 11:57:46 2008 +0000
+++ b/multimedia/x264-devel/Makefile    Tue Mar 11 13:20:29 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/03/10 11:59:26 drochner Exp $
+# $NetBSD: Makefile,v 1.9 2008/03/11 13:20:29 tron Exp $
 #
 
 SNAPSHOT_DATE=         20071218
@@ -22,6 +22,14 @@
 BUILD_DEPENDS+=        yasm>=0.4.0:../../devel/yasm
 .endif
 
+# Avoid linker warning under Mac OS X PPC.
+.if empty(MACHINE_PLATFORM:MDarwin-*-powerpc)
+DARWIN_PPC_LDFLAGS=
+.else
+DARWIN_PPC_LDFLAGS=    -Wl,-read_only_relocs -Wl,suppress
+.endif
+MAKE_ENV+=             DARWIN_PPC_LDFLAGS=${DARWIN_PPC_LDFLAGS:Q}
+
 USE_TOOLS+=            gmake
 USE_LIBTOOL=           yes
 
diff -r 83af0cabf096 -r b28d08daec6d multimedia/x264-devel/distinfo
--- a/multimedia/x264-devel/distinfo    Tue Mar 11 11:57:46 2008 +0000
+++ b/multimedia/x264-devel/distinfo    Tue Mar 11 13:20:29 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2008/03/10 11:59:26 drochner Exp $
+$NetBSD: distinfo,v 1.7 2008/03/11 13:20:29 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) = 52324079d8ef0cee899e29fc0edaecb0384b8999
+SHA1 (patch-ab) = e4ce859a2c395e81bb2c5de3a5943c600e3c86eb
 SHA1 (patch-ac) = 18a21816bddc28b9cd9139c3fdb179ebcbf03a4a
diff -r 83af0cabf096 -r b28d08daec6d multimedia/x264-devel/patches/patch-ab
--- a/multimedia/x264-devel/patches/patch-ab    Tue Mar 11 11:57:46 2008 +0000
+++ b/multimedia/x264-devel/patches/patch-ab    Tue Mar 11 13:20:29 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2008/03/10 11:59:26 drochner Exp $
+$NetBSD: patch-ab,v 1.4 2008/03/11 13:20:29 tron Exp $
 
 --- Makefile.orig      2007-12-18 22:45:04.000000000 +0100
 +++ Makefile
@@ -55,7 +55,7 @@
 +      ${LIBTOOL} --mode=compile ${CC} -c ${CFLAGS} -o $@ $<
 +
 +libx264.la: .depend $(OBJS) $(OBJASM)
-+      ${LIBTOOL} --mode=link ${CC} -o libx264.la $(OBJS) $(OBJASM) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -rpath ${PREFIX}/lib -version-info 0
++      ${LIBTOOL} --mode=link ${CC} -o libx264.la $(OBJS) $(OBJASM) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} ${DARWIN_PPC_LDFLAGS} -rpath ${PREFIX}/lib -version-info 0
  
  $(SONAME): .depend $(OBJS) $(OBJASM)
        $(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SONAME) $(LDFLAGS)



Home | Main Index | Thread Index | Old Index