sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix build when CFLAGS is set in /etc/make.conf

Browse source 
PR:		ports/157918
Submitted by:	Grzegorz Blach <magik@roorback.net>
This commit is contained in:
Wen Heping 2011-06-16 08:42:28 +00:00
parent 7d323e23a1
commit 6a41502437
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=275663
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sysutils/tmux/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= tmux PORTNAME= tmux
PORTVERSION= 1.4 PORTVERSION= 1.4
PORTREVISION= 5 PORTREVISION= 6
CATEGORIES= sysutils CATEGORIES= sysutils
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@ -35,14 +35,14 @@ OPTIONS= KQUEUE "Build without define HAVE_BROKEN_KQUEUE " On \
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if defined(WITH_LIBEVENT2) .if defined(WITH_LIBEVENT2)
CFLAGS+= -I${LOCALBASE}/include/event2/compat -I${LOCALBASE}/include EXTRA_CPPFLAGS+= -I${LOCALBASE}/include/event2/compat -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib/event2 LDFLAGS+= -L${LOCALBASE}/lib/event2
.else .else
CFLAGS+= -I${LOCALBASE}/include EXTRA_CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib LDFLAGS+= -L${LOCALBASE}/lib
.endif .endif
MAKE_ENV+= LDFLAGS="${LDFLAGS}" MAKE_ENV+= EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}" LDFLAGS="${LDFLAGS}"
.if defined(WITH_LIBEVENT_STATIC) .if defined(WITH_LIBEVENT_STATIC)
. if defined(WITH_LIBEVENT2) . if defined(WITH_LIBEVENT2)
@ -81,6 +81,7 @@ post-patch:
${WRKSRC}/tmux.1 ${WRKSRC}/tmux.h ${WRKSRC}/tmux.1 ${WRKSRC}/tmux.h
@${REINPLACE_CMD} -e 's|-I/usr/local/include||g' \ @${REINPLACE_CMD} -e 's|-I/usr/local/include||g' \
-e 's|/usr/local|${LOCALBASE}|g' \ -e 's|/usr/local|${LOCALBASE}|g' \
-e 's|$${CPPFLAGS}$$|${CPPFLAGS} ${EXTRA_CPPFLAGS}|g' \
-e 's|LDFLAGS+=|#LDFLAGS+=|g' \ -e 's|LDFLAGS+=|#LDFLAGS+=|g' \
${WRKSRC}/Makefile ${WRKSRC}/Makefile
@${REINPLACE_CMD} -e 's|-levent|${_LEVENT_LIB}|g' \ @${REINPLACE_CMD} -e 's|-levent|${_LEVENT_LIB}|g' \