diff options
author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2011-09-23 22:26:39 +0000 |
---|---|---|
committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2011-09-23 22:26:39 +0000 |
commit | 6f6fbe4bdf9851de1eb6ebef5287e3007846045e (patch) | |
tree | 3b556699991305af672fba96e0e8b6bb88bcc7da /lang/python26 | |
parent | Fix installation with PORTSDOCS (diff) |
- Add LDFLAGS to CONFIGURE_ENV and MAKE_ENV (as it was done with LDFLAGS)
- Fix all ports that add {CPP,LD}FLAGS to *_ENV to modify flags instead
PR: 157936
Submitted by: myself
Exp-runs by: pav
Approved by: pav
Notes
Notes:
svn path=/head/; revision=282282
Diffstat (limited to 'lang/python26')
-rw-r--r-- | lang/python26/Makefile | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lang/python26/Makefile b/lang/python26/Makefile index 8f742fcc5e9b..dfc413af7b28 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -89,12 +89,12 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-configure-pth LIB_DEPENDS+= pth:${PORTSDIR}/devel/pth _PTH_CPPFLAGS= "-I${LOCALBASE}/include/pth" _PTH_LDFLAGS= "-L${LOCALBASE}/lib/pth" -CONFIGURE_ENV+= CPPFLAGS="${_PTH_CPPFLAGS} ${CPPFLAGS}" -CONFIGURE_ENV+= LDFLAGS="${_PTH_LDFLAGS} ${LDFLAGS}" +CPPFLAGS+= ${_PTH_CPPFLAGS} +LDFLAGS+= ${_PTH_LDFLAGS} .else # !defined(WITH_PTH) CONFIGURE_ARGS+= --with-threads CFLAGS+= ${PTHREAD_CFLAGS} -CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}" +LDFLAGS+= ${PTHREAD_LIBS} .endif # defined(WITH_PTH) .if defined(WITHOUT_HUGE_STACK_SIZE) CFLAGS+= -DTHREAD_STACK_SIZE=0x20000 @@ -104,9 +104,6 @@ CFLAGS+= -DTHREAD_STACK_SIZE=0x100000 .else # defined(WITHOUT_THREADS) PLIST_SUB+= THREADS="@comment " CONFIGURE_ARGS+= --without-threads -.if defined(LDFLAGS) -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" -.endif # defined(LDFLAGS) .endif # !defined(WITHOUT_THREADS) .if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2) |