Ticket #47155: patch-makefile-qmake-workaround.diff

File patch-makefile-qmake-workaround.diff, 1.2 KB (added by stevecheckoway (Stephen Checkoway), 10 years ago)

  • src/Makefile.am 

    # Work around a qmake bug where, in some cases, it will add an
# extraneous '-arch' flag. In other ports (and in previous versions of
# this one), this was handled with reinplace in the post-configure
# step. Unfortunately, Makefile.qmake doesn't exist at post-configure
# so this patch modifies the Makefile rule which creates
# Makefile.qmake to remove the '-arch' flag.
    old new  
    6868                QMAKE_CPPFLAGS+='$(CPPFLAGS) $(qmake_allflags)' \
    6969                LIBS+='$(QMAKELIBS)' \
    7070                VPATH='$(srcdir)' -o - djview.pro |\
    71           $(AWK) -f $(top_srcdir)/config/qmsilent.awk > $@
     71          $(AWK) -f $(top_srcdir)/config/qmsilent.awk |\
     72          $(SED) 's/-arch *-/-/g' > $@
    7273
    7374# cleaning
    7475

  • src/Makefile.in

    old new  
    677677                QMAKE_CPPFLAGS+='$(CPPFLAGS) $(qmake_allflags)' \
    678678                LIBS+='$(QMAKELIBS)' \
    679679                VPATH='$(srcdir)' -o - djview.pro |\
    680           $(AWK) -f $(top_srcdir)/config/qmsilent.awk > $@
     680          $(AWK) -f $(top_srcdir)/config/qmsilent.awk |\
     681          $(SED) 's/-arch *-/-/g' > $@
    681682
    682683# cleaning
    683684