| 1 | # Work around a qmake bug where, in some cases, it will add an |
|---|
| 2 | # extraneous '-arch' flag. In other ports (and in previous versions of |
|---|
| 3 | # this one), this was handled with reinplace in the post-configure |
|---|
| 4 | # step. Unfortunately, Makefile.qmake doesn't exist at post-configure |
|---|
| 5 | # so this patch modifies the Makefile rule which creates |
|---|
| 6 | # Makefile.qmake to remove the '-arch' flag. |
|---|
| 7 | |
|---|
| 8 | --- src/Makefile.am.orig 2015-03-14 13:56:11.000000000 -0400 |
|---|
| 9 | +++ src/Makefile.am 2015-03-14 14:26:15.000000000 -0400 |
|---|
| 10 | @@ -68,7 +68,8 @@ |
|---|
| 11 | QMAKE_CPPFLAGS+='$(CPPFLAGS) $(qmake_allflags)' \ |
|---|
| 12 | LIBS+='$(QMAKELIBS)' \ |
|---|
| 13 | VPATH='$(srcdir)' -o - djview.pro |\ |
|---|
| 14 | - $(AWK) -f $(top_srcdir)/config/qmsilent.awk > $@ |
|---|
| 15 | + $(AWK) -f $(top_srcdir)/config/qmsilent.awk |\ |
|---|
| 16 | #+ $(SED) 's/-arch *-/-/g' > $@ |
|---|
| 17 | + $(SED) -e 's/-arch *-/-/g' -e 's/-arch *\$//g' > $@ |
|---|
| 18 | |
|---|
| 19 | # cleaning |
|---|
| 20 | |
|---|
| 21 | --- src/Makefile.in.orig 2015-03-14 13:56:20.000000000 -0400 |
|---|
| 22 | +++ src/Makefile.in 2015-03-14 14:26:46.000000000 -0400 |
|---|
| 23 | @@ -677,7 +677,8 @@ |
|---|
| 24 | QMAKE_CPPFLAGS+='$(CPPFLAGS) $(qmake_allflags)' \ |
|---|
| 25 | LIBS+='$(QMAKELIBS)' \ |
|---|
| 26 | VPATH='$(srcdir)' -o - djview.pro |\ |
|---|
| 27 | - $(AWK) -f $(top_srcdir)/config/qmsilent.awk > $@ |
|---|
| 28 | + $(AWK) -f $(top_srcdir)/config/qmsilent.awk |\ |
|---|
| 29 | #+ $(SED) 's/-arch *-/-/g' > $@ |
|---|
| 30 | + $(SED) -e 's/-arch *-/-/g' -e 's/-arch *\$//g' > $@ |
|---|
| 31 | |
|---|
| 32 | # cleaning |
|---|
| 33 | |
|---|
