On Mon, Nov 08, 2010 at 06:59:00PM +0100, Marc Espie wrote:
> > Enable -qt4 for powerpc, only keep it disabled for arm (because qt4
> > currently doesn't build there).
> >
> > ok?
>
> No.
>
> This is not how things should work.
> You do not set a pseudo flavor based on arch.
[...]
Enable poppler-qt4 for powerpc (but not for arm) and clean up some
more mess:
- Remove arch specific FLAVOR settings for real.
- Don't set CXXFLAGS, it's not needed (and it confused qt3 and qt4).
- Don't pass CXXFLAGS and CFLAGS via CONFIGURE_ENV (not needed, either).
Successfully built on arm and powerpc. In addition, I've test-built
all combinations of the pseudo flavors on amd64.
ok?
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile
--- Makefile 6 Nov 2010 16:07:00 -0000 1.40
+++ Makefile 14 Nov 2010 17:00:13 -0000
@@ -29,35 +29,28 @@ PERMIT_DISTFILES_CDROM= Yes
MASTER_SITES= ${HOMEPAGE}
-QT4INC=
-
PSEUDO_FLAVORS=no_qt no_qt4
-MULTI_PACKAGES=-main
-FLAVOR-arm=no_qt4
-FLAVOR-powerpc=no_qt4
-FLAVOR?=${FLAVOR-${MACHINE_ARCH}}
+FLAVOR?=
-NOT_FOR_ARCHS-qt4 = arm powerpc
+MULTI_PACKAGES=-main
cWANTLIB= expat freetype fontconfig jpeg m z stdc++
-CXXFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng
.if empty(FLAVOR:L:Mno_qt)
MULTI_PACKAGES+=-qt
MODULES+= x11/qt3 converters/libiconv
-CXXFLAGS+= -I${MODQT4_INCDIR}
.else
CONFIGURE_ARGS+= --disable-poppler-qt
.endif
+NOT_FOR_ARCHS-qt4 = arm
.if empty(FLAVOR:L:Mno_qt4)
MULTI_PACKAGES+=-qt4
.endif
-.if ${MULTI_PACKAGES:L:M-qt4} && ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH}
!= "powerpc"
+.if ${MULTI_PACKAGES:L:M-qt4} && ${MACHINE_ARCH} != "arm"
MODULES+= x11/qt4 converters/libiconv
-CXXFLAGS+= -I${MODQT3_INCDIR}
.else
CONFIGURE_ARGS+= --disable-poppler-qt4
.endif
@@ -96,11 +89,11 @@ CONFIGURE_ARGS+= --enable-xpdf-headers \
--disable-utils \
--enable-zlib
-CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include ${QT4INC}"
\
- CFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
USE_LIBTOOL= Yes
USE_GMAKE= Yes
+
+CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng
.include <bsd.port.mk>
