Changeset 90682


Ignore:
Timestamp:
Mar 12, 2012, 11:33:16 AM (8 years ago)
Author:
jmr@…
Message:

dynamips: fix libelf includes and libpcap linking, enable JIT for x86_64, disable parallel build (#28888)

Location:
trunk/dports/net/dynamips
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/net/dynamips/Portfile

    r69986 r90682  
    55name            dynamips
    66version         0.2.7
    7 revision        1
     7revision        2
    88categories      net
    99maintainers     vexate.net:jstrine
     
    3636patch.pre_args  -p1
    3737
    38 build.pre_args-append           PREFIX=${prefix}
    39 destroot.pre_args-append        PREFIX=${prefix}
     38build.pre_args-append           PREFIX=${prefix} CC=${configure.cc}
     39build.env-append            CFLAGS="${configure.cc_archflags}"
     40use_parallel_build          no
    4041
    41 # compile using nojit if on non-i386 platform
    42 # is meant to work on x86_64 too but apparently crashes; ticket #22285
    43 if {${build_arch} != "i386"} {
    44         build.pre_args-append           DYNAMIPS_ARCH=nojit
    45         destroot.pre_args-append        DYNAMIPS_ARCH=nojit
     42destroot.pre_args-append        PREFIX=${prefix} CC=${configure.cc}
     43destroot.env-append         CFLAGS="${configure.cc_archflags}"
     44
     45if {${build_arch} == "x86_64"} {
     46        set dynamips_arch amd64
     47} elseif {${build_arch} == "i386"} {
     48    set dynamips_arch x86
     49} else {
     50    set dynamips_arch nojit
    4651}
     52build.pre_args-append           DYNAMIPS_ARCH=${dynamips_arch}
     53destroot.pre_args-append        DYNAMIPS_ARCH=${dynamips_arch}
    4754
    4855default_variants        +idle_pcs
  • trunk/dports/net/dynamips/files/Makefile.diff

    r28813 r90682  
    1515 
    1616-PCAP_LIB=/usr/local/lib/libpcap.a
    17 +PCAP_LIB=$(PREFIX)/lib/libpcap.a
     17+PCAP_LIB=-lpcap
    1818 #PCAP_LIB=-lpcap
    1919 
     
    4747-   LIBS=-L/usr/local/lib -L. -lelf -lpthread
    4848-   PCAP_LIB=-lpacket -lwpcap
    49 +   CFLAGS+=-I$(PREFIX)/include -mdynamic-no-pic -D_FILE_OFFSET_BITS=64
     49+   CFLAGS+=-I$(PREFIX)/include/libelf -I$(PREFIX)/include -mdynamic-no-pic -D_FILE_OFFSET_BITS=64
    5050+   LIBS=-L$(PREFIX)/lib -L. -lelf -lpthread
    5151 else
Note: See TracChangeset for help on using the changeset viewer.