[93756] trunk/dports/multimedia/live555

[jmr at macports.org]

Revision: 93756
          https://trac.macports.org/changeset/93756
Author:   jmr at macports.org
Date:     2012-05-29 17:41:53 -0700 (Tue, 29 May 2012)
Log Message:
-----------
live555: improve configuration, enable universal (#31349)

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

Added Paths:
-----------
    trunk/dports/multimedia/live555/files/
    trunk/dports/multimedia/live555/files/patch-config.macosx.diff

Modified: trunk/dports/multimedia/live555/Portfile
===================================================================
--- trunk/dports/multimedia/live555/Portfile	2012-05-29 23:13:41 UTC (rev 93755)
+++ trunk/dports/multimedia/live555/Portfile	2012-05-30 00:41:53 UTC (rev 93756)
@@ -22,8 +22,21 @@
                     sha256  bd55b78d72d8a7b32a69d54f1a852ea7c4e666b90272a74091105b8c9292eccd
 
 distname         live.${version}
-universal_variant no
 worksrcdir       live
+# Configure settings remain in installed Makefiles, so be minimalistic
+configure.ccache no
+configure.distcc no
+patchfiles       patch-config.macosx.diff
+post-patch {
+    reinplace "s|@ARCHFLAGS@|[get_canonical_archflags]|g
+        s|@CC@|${configure.cc}|g
+        s|@CXX@|${configure.cxx}|g
+        s|@CPPFLAGS@|${configure.cppflags}|g
+        s|@CFLAGS@|${configure.cflags}|g
+        s|@CXXFLAGS@|${configure.cxxflags}|g
+        s|@LDFLAGS@|${configure.ldflags}|g" \
+        ${worksrcpath}/config.macosx
+}
 
 set files_0      ${workpath}/files-0.txt
 set files_1      ${workpath}/files-1.txt
@@ -31,16 +44,13 @@
 
 configure.cmd    ./genMakefiles
 configure.pre_args {}
+configure.universal_args-delete	--disable-dependency-tracking
 
 post-configure {
     ui_debug "Create a list of files: \[${files_0}\]"
     system -W ${worksrcpath} "find -s . ! -type d > ${files_0}"
 }
 
-build.args-append   C_COMPILER='${configure.cc} [get_canonical_archflags]' \
-                    CPLUSPLUS_COMPILER='${configure.cxx} [get_canonical_archflags]' \
-                    LINK='${configure.cxx} [get_canonical_archflags] -o '
-
 post-build {
     ui_debug "Create an updated list of files: \[${files_1}\]"
     system -W ${worksrcpath} "find -s . ! -type d > ${files_1}"

Added: trunk/dports/multimedia/live555/files/patch-config.macosx.diff
===================================================================
--- trunk/dports/multimedia/live555/files/patch-config.macosx.diff	                        (rev 0)
+++ trunk/dports/multimedia/live555/files/patch-config.macosx.diff	2012-05-30 00:41:53 UTC (rev 93756)
@@ -0,0 +1,27 @@
+--- config.macosx.orig	2011-09-20 00:03:06.000000000 +0200
++++ config.macosx	2011-09-21 17:31:03.000000000 +0200
+@@ -1,15 +1,16 @@
+-COMPILE_OPTS =		$(INCLUDES) -I. $(EXTRA_LDFLAGS) -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1
++ARCHFLAGS =		@ARCHFLAGS@
++COMPILE_OPTS =		$(INCLUDES) -I. $(EXTRA_LDFLAGS) -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1 @CPPFLAGS@
+ C =			c
+-C_COMPILER =		cc
+-C_FLAGS =		$(COMPILE_OPTS)
++C_COMPILER =		@CC@ $(ARCHFLAGS)
++C_FLAGS =		$(COMPILE_OPTS) @CFLAGS@
+ CPP =			cpp
+-CPLUSPLUS_COMPILER =	c++
+-CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -Wall
++CPLUSPLUS_COMPILER =	@CXX@ $(ARCHFLAGS)
++CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -Wall @CXXFLAGS@
+ OBJ =			o
+-LINK =			c++ -o 
+-LINK_OPTS =		-L.
++LINK =			$(CPLUSPLUS_COMPILER) -o 
++LINK_OPTS =		-L. @LDFLAGS@
+ CONSOLE_LINK_OPTS =	$(LINK_OPTS)
+-LIBRARY_LINK =		libtool -s -o 
++LIBRARY_LINK =		/usr/bin/libtool -s -o 
+ LIBRARY_LINK_OPTS =	
+ LIB_SUFFIX =			a
+ LIBS_FOR_CONSOLE_APPLICATION =
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120529/3106eeba/attachment.html>