From 57427523d48fde606fb9cff5d1c4ac61a9cd749b Mon Sep 17 00:00:00 2001 From: Mario Sergio Fujikawa Ferreira Date: Wed, 5 Mar 2003 21:27:17 +0000 Subject: o Unbreak WITH_QT for 4-STABLE branch o Fix so that USE_GCC is no longer required for 4-STABLE branch o CFLAGS safeness PR: 48862 Submitted by: David Yeske Approved by: maintainer --- print/lyx/Makefile | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'print/lyx') diff --git a/print/lyx/Makefile b/print/lyx/Makefile index af7d30da3290..232a13d8de43 100644 --- a/print/lyx/Makefile +++ b/print/lyx/Makefile @@ -24,6 +24,7 @@ RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ USE_PERL5= yes USE_GMAKE= yes GNU_CONFIGURE= yes +USE_REINPLACE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-extra-lib="${LOCALBASE}/lib" \ --with-extra-inc="${LOCALBASE}/include" @@ -53,14 +54,16 @@ RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell .include .if ${OSVERSION} < 500035 -USE_GCC= 3.1 +CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS} -Wno-non-template-friend -ftemplate-depth-30" .if defined(WITH_QT) -BROKEN= Does not build +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" \ + CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ + CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -Wno-non-template-friend -ftemplate-depth-30" .endif .endif pre-everything:: -.if ( ${OSVERSION} >= 500035 ) && !defined(WITH_QT) +.if !defined(WITH_QT) @${ECHO_MSG} @${ECHO_MSG} "If you want to build with the Qt3 frontend," @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_QT=yes\"" @@ -81,4 +84,9 @@ pre-everything:: @${ECHO_MSG} .endif +post-patch: + @${REINPLACE_CMD} -E -e \ + 's|CFLAGS=$$|#CFLAGS=|' \ + ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} + .include -- cgit v1.2.3