Properly fix build on -current.

This commit is contained in:
Adam Weinberger 2014-08-15 16:54:04 +00:00
parent cf0749bcbe
commit 80a45ad6bf
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=365000
2 changed files with 21 additions and 3 deletions

View File

@ -12,8 +12,6 @@ COMMENT= Temperature control for fermenting beer and other applications
LICENSE= BSD2CLAUSE
USES= readline
MAKE_ARGS= CFLAGS="${CFLAGS} -Wall -Wno-parentheses ${CPPFLAGS}" \
LFLAGS="${LDFLAGS}"
NO_WRKSUBDIR= yes
PLIST_FILES= bin/tempcontrol share/tempcontrol/temperaturecontrolrc.sample \
@ -26,7 +24,7 @@ OPTIONS_DEFINE= DOCS
# Must (re)generate depedencies, otherwise parallel builds would not work
pre-build:
${MAKE_CMD} -C ${WRKSRC} depend
${DO_MAKE_BUILD} -C ${WRKSRC} depend
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/tempcontrol ${STAGEDIR}${PREFIX}/bin/

View File

@ -0,0 +1,20 @@
--- Makefile.orig 2006-01-25 18:03:13.000000000 -0500
+++ Makefile 2014-08-15 12:53:03.000000000 -0400
@@ -39,7 +39,7 @@
# Where to install the startup script
RCDIR = /usr/local/etc/rc.d
-CFLAGS = -g -O3 -Wall -Wno-parentheses ${INCLUDES}
+CFLAGS += -g -Wall -Wno-parentheses ${CPPFLAGS}
LINK=gcc
LFLAGS= -g
@@ -88,7 +88,7 @@
.FORCE:
tempcontrol: ${OBJS}
- ${CC} -o $@ ${CFLAGS} ${OBJS} -lreadline -lcurses -lutil
+ ${CC} -o $@ ${CFLAGS} ${OBJS} ${LDFLAGS} -lreadline -lcurses -lutil
clean:
rm -f *~ myparser* parser.h parserc.h parsercommands.c.sample parserkeys.h *.o ${PROG}