Ignore:
Timestamp:
Nov 4, 2010, 1:28:03 AM (9 years ago)
Author:
michaelld@…
Message:

djview: Fixes ticket #27073 : qmake sometimes creates a Makefile with
"-arch foo -arch" for linking, which generates an error -- so patch
the created Makefile to remove this issue.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/aqua/djview/Portfile

    r72879 r73103  
    3030    port:djvulibre
    3131
     32archcheck.files \
     33    lib/libdjvulibre.dylib \
     34    lib/libQtCore.dylib
     35
     36universal_variant yes
     37
     38configure.ldflags
    3239configure.args \
    3340    --disable-nsdejavu \
     
    3542    QMAKESPEC=${qt_mkspecs_dir}/macx-g++
    3643
    37 universal_variant yes
     44# djview's 'configure' does not handle this flag.
     45configure.universal_args-delete --disable-dependency-tracking
     46configure.args-append           --disable-dependency-tracking
    3847
    39 # QMake does not handle this flag.
    40 configure.universal_args-delete --disable-dependency-tracking
    41 configure.args-delete  --disable-dependency-tracking
     48# when Qt is installed without +universal, and qmake is called with
     49# "QMAKE_LDFLAGS += -arch foo", and "foo" is the native arch, then, at
     50# least sometimes, qmake will erroneously remove the second "foo" but
     51# leave the "-arch" flag -- generating an error at linking.  Not sure
     52# if this is the case with +debug; does not matter for this port,
     53# since it has not debug variant.
     54post-configure {
     55    if {![variant_isset universal]} {
     56        reinplace "s|\\(-arch ${build_arch}\\) -arch|\\1|" \
     57            ${worksrcpath}/src/Makefile
     58    }
     59}
     60
     61# allow ccache, if specified by the user
     62pre-build {
     63    if {[tbool configure.ccache]} {
     64        build.post_args "CCACHE=ccache"
     65    }
     66}
    4267
    4368destroot {
Note: See TracChangeset for help on using the changeset viewer.