[92695] trunk/dports/multimedia/VLC

[jeremyhu at macports.org]

Revision: 92695
          https://trac.macports.org/changeset/92695
Author:   jeremyhu at macports.org
Date:     2012-05-03 19:26:51 -0700 (Thu, 03 May 2012)
Log Message:
-----------
VLC: Avoid configure adding additional archs and causing build failures

Modified Paths:
--------------
    trunk/dports/multimedia/VLC/Portfile

Added Paths:
-----------
    trunk/dports/multimedia/VLC/files/configure.ac-no-arch.patch

Modified: trunk/dports/multimedia/VLC/Portfile
===================================================================
--- trunk/dports/multimedia/VLC/Portfile	2012-05-04 01:35:25 UTC (rev 92694)
+++ trunk/dports/multimedia/VLC/Portfile	2012-05-04 02:26:51 UTC (rev 92695)
@@ -56,6 +56,7 @@
 
 patchfiles \
     buildfix-package.mak.patch \
+    configure.ac-no-arch.patch \
     no-sparkle.patch
 
 post-patch {

Added: trunk/dports/multimedia/VLC/files/configure.ac-no-arch.patch
===================================================================
--- trunk/dports/multimedia/VLC/files/configure.ac-no-arch.patch	                        (rev 0)
+++ trunk/dports/multimedia/VLC/files/configure.ac-no-arch.patch	2012-05-04 02:26:51 UTC (rev 92695)
@@ -0,0 +1,42 @@
+--- configure.ac.orig	2012-05-03 18:38:38.000000000 -0700
++++ configure.ac	2012-05-03 18:40:40.000000000 -0700
+@@ -126,35 +126,11 @@ case "${host_os}" in
+     SYS=dragonfly
+     ;;
+   darwin*)
+-
+-    dnl Force gcc "-arch" flag
+-    ARCH_flag=""
+-    case "${host}" in
+-      i?86*)
+-        ARCH_flag="-arch i386"
+-      ;;
+-      ppc64*)
+-        ARCH_flag="-arch ppc64"
+-      ;;
+-      ppc*)
+-        ARCH_flag="-arch ppc"
+-      ;;
+-      x86_64*)
+-        ARCH_flag="-arch x86_64"
+-      ;;
+-      arm*)
+-        ARCH_flag="-arch armv7"
+-        ac_cv_c_bigendian="no"
+-        ac_cv_c_attribute_packed="no"
+-      ;;
+-    esac
+-
+     SYS=darwin
+-    CFLAGS="${CFLAGS} -D_INTL_REDIRECT_MACROS ${ARCH_flag}"
+-    CXXFLAGS="${CXXFLAGS} -D_INTL_REDIRECT_MACROS ${ARCH_flag}"
+-    CPPFLAGS="${CPPFLAGS} ${ARCH_flag}"
+-    OBJCFLAGS="${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu99 ${ARCH_flag}"
+-    LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names ${ARCH_flag}"
++    CFLAGS="${CFLAGS} -D_INTL_REDIRECT_MACROS"
++    CXXFLAGS="${CXXFLAGS} -D_INTL_REDIRECT_MACROS"
++    OBJCFLAGS="${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu99"
++    LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names"
+     VLC_ADD_LIBS([mkv mp4 motion], [-Wl,-framework,IOKit,-framework,CoreFoundation])
+     VLC_ADD_LIBS([libvlc vlc],[-Wl,-undefined,dynamic_lookup])
+     VLC_ADD_LIBS([avcodec avformat access_avio swscale postproc i420_rgb_mmx x264 x26410b],[-Wl,-read_only_relocs,suppress])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120503/4670894b/attachment.html>