[90682] trunk/dports/net/dynamips

[jmr at macports.org]

Revision: 90682
          http://trac.macports.org/changeset/90682
Author:   jmr at macports.org
Date:     2012-03-12 04:33:16 -0700 (Mon, 12 Mar 2012)
Log Message:
-----------
dynamips: fix libelf includes and libpcap linking, enable JIT for x86_64, disable parallel build (#28888)

Modified Paths:
--------------
    trunk/dports/net/dynamips/Portfile
    trunk/dports/net/dynamips/files/Makefile.diff

Modified: trunk/dports/net/dynamips/Portfile
===================================================================
--- trunk/dports/net/dynamips/Portfile	2012-03-12 05:48:34 UTC (rev 90681)
+++ trunk/dports/net/dynamips/Portfile	2012-03-12 11:33:16 UTC (rev 90682)
@@ -4,7 +4,7 @@
 
 name		dynamips
 version		0.2.7
-revision	1
+revision	2
 categories	net
 maintainers	vexate.net:jstrine
 description	Cisco router emulator
@@ -35,15 +35,22 @@
 # patch.pre_args set to allow use of unmodified idle_pcs patch from developer
 patch.pre_args	-p1
 
-build.pre_args-append		PREFIX=${prefix}
-destroot.pre_args-append	PREFIX=${prefix}
+build.pre_args-append		PREFIX=${prefix} CC=${configure.cc}
+build.env-append            CFLAGS="${configure.cc_archflags}"
+use_parallel_build          no
 
-# compile using nojit if on non-i386 platform
-# is meant to work on x86_64 too but apparently crashes; ticket #22285
-if {${build_arch} != "i386"} {
-	build.pre_args-append		DYNAMIPS_ARCH=nojit
-	destroot.pre_args-append	DYNAMIPS_ARCH=nojit
+destroot.pre_args-append	PREFIX=${prefix} CC=${configure.cc}
+destroot.env-append         CFLAGS="${configure.cc_archflags}"
+
+if {${build_arch} == "x86_64"} {
+	set dynamips_arch amd64
+} elseif {${build_arch} == "i386"} {
+    set dynamips_arch x86
+} else {
+    set dynamips_arch nojit
 }
+build.pre_args-append		DYNAMIPS_ARCH=${dynamips_arch}
+destroot.pre_args-append	DYNAMIPS_ARCH=${dynamips_arch}
 
 default_variants	+idle_pcs
 

Modified: trunk/dports/net/dynamips/files/Makefile.diff
===================================================================
--- trunk/dports/net/dynamips/files/Makefile.diff	2012-03-12 05:48:34 UTC (rev 90681)
+++ trunk/dports/net/dynamips/files/Makefile.diff	2012-03-12 11:33:16 UTC (rev 90682)
@@ -14,7 +14,7 @@
  	-DHAS_RFC2553=$(HAS_RFC2553)
  
 -PCAP_LIB=/usr/local/lib/libpcap.a
-+PCAP_LIB=$(PREFIX)/lib/libpcap.a
++PCAP_LIB=-lpcap
  #PCAP_LIB=-lpcap
  
 -ifeq ($(shell uname), FreeBSD)
@@ -46,7 +46,7 @@
 -	-D_FILE_OFFSET_BITS=64
 -   LIBS=-L/usr/local/lib -L. -lelf -lpthread
 -   PCAP_LIB=-lpacket -lwpcap
-+   CFLAGS+=-I$(PREFIX)/include -mdynamic-no-pic -D_FILE_OFFSET_BITS=64
++   CFLAGS+=-I$(PREFIX)/include/libelf -I$(PREFIX)/include -mdynamic-no-pic -D_FILE_OFFSET_BITS=64
 +   LIBS=-L$(PREFIX)/lib -L. -lelf -lpthread
  else
 -   CFLAGS+=-I/usr/include/libelf -D_FILE_OFFSET_BITS=64
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120312/4cad8a87/attachment.html>