Add CFLAGS to the link targets (to get all binaries linked with libpthread).

From and with matthew. ok matthew, sthen
This commit is contained in:
kili 2012-06-18 22:03:46 +00:00
parent 025590d2b0
commit bad59a088d
2 changed files with 28 additions and 3 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.20 2012/03/23 21:33:45 kili Exp $
# $OpenBSD: Makefile,v 1.21 2012/06/18 22:03:46 kili Exp $
COMMENT = Haskell 98 interpreter
DISTNAME = hugs98-plus-Sep2006
PKGNAME = hugs98-2006.09
REVISION = 1
REVISION = 2
CATEGORIES = lang
MAINTAINER = Matthias Kilian <kili@openbsd.org>
HOMEPAGE = http://www.haskell.org/hugs/
@ -29,6 +29,6 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB = GL GLU X11 c m ncurses pthread-stubs readline xcb
WANTLIB = GL GLU X11 c m ncurses pthread readline
.include <bsd.port.mk>

View File

@ -0,0 +1,25 @@
$OpenBSD: patch-src_Makefile,v 1.1 2012/06/18 22:03:46 kili Exp $
--- src/Makefile.in.orig Wed Aug 2 19:18:34 2006
+++ src/Makefile.in Mon Jun 18 21:55:17 2012
@@ -90,7 +90,7 @@ all :: hugs$(EXEEXT) runhugs$(EXEEXT) ffihugs$(EXEEXT
################################################################
hugs$(EXEEXT) : $(IOBJECTS) $(WOBJECTS) $(RC_FILES)
- $(CC) $(LDFLAGS) $(IOBJECTS) $(WOBJECTS) $(LIBS) -o hugs$(EXEEXT)
+ $(CC) $(CFLAGS) $(LDFLAGS) $(IOBJECTS) $(WOBJECTS) $(LIBS) -o hugs$(EXEEXT)
$(STRIP)
version.$(OBJEXT) : version.c $(SOURCES)
@@ -101,10 +101,10 @@ version.$(OBJEXT) : version.c $(SOURCES)
SERVER_OBJECTS = server.$(OBJEXT) $(OBJECTS)
runhugs$(EXEEXT) : runhugs.$(OBJEXT) $(SERVER_OBJECTS)
- $(CC) $(LDFLAGS) runhugs.$(OBJEXT) $(SERVER_OBJECTS) $(LIBS) -o runhugs$(EXEEXT)
+ $(CC) $(CFLAGS) $(LDFLAGS) runhugs.$(OBJEXT) $(SERVER_OBJECTS) $(LIBS) -o runhugs$(EXEEXT)
ffihugs$(EXEEXT) : ffihugs.$(OBJEXT) $(SERVER_OBJECTS)
- $(CC) $(LDFLAGS) ffihugs.$(OBJEXT) $(SERVER_OBJECTS) $(LIBS) -o ffihugs$(EXEEXT)
+ $(CC) $(CFLAGS) $(LDFLAGS) ffihugs.$(OBJEXT) $(SERVER_OBJECTS) $(LIBS) -o ffihugs$(EXEEXT)
ffihugs.$(OBJEXT) : runhugs.$(OBJEXT)
$(CC) -c $(CFLAGS) $(OPTFLAGS) -DFFI_COMPILER runhugs.c -o ffihugs.$(OBJEXT)