diff options
| author | danfe <danfe@FreeBSD.org> | 2006-06-16 04:45:44 +0000 |
|---|---|---|
| committer | danfe <danfe@FreeBSD.org> | 2006-06-16 04:45:44 +0000 |
| commit | 24286f3259f9ae998ba3202d2d3e66e083778384 (patch) | |
| tree | c3c1596acf936ccc5af861ae698ec87dffaa5248 /games/openttd | |
| parent | 600cd6d4c87525d13525454758e13dfb41422795 (diff) | |
| download | FreeBSD-ports-24286f3259f9ae998ba3202d2d3e66e083778384.zip FreeBSD-ports-24286f3259f9ae998ba3202d2d3e66e083778384.tar.gz | |
Fix the build on 4.X, respect CFLAGS.
Reported by: krismail
Diffstat (limited to 'games/openttd')
| -rw-r--r-- | games/openttd/Makefile | 2 | ||||
| -rw-r--r-- | games/openttd/files/patch-Makefile | 29 |
2 files changed, 29 insertions, 2 deletions
diff --git a/games/openttd/Makefile b/games/openttd/Makefile index 1657851..ba4202c 100644 --- a/games/openttd/Makefile +++ b/games/openttd/Makefile @@ -34,8 +34,6 @@ MAKE_ARGS+= DEDICATED=1 .endif post-extract: - @${REINPLACE_CMD} -e 's|-O2 $$(WARNING_DISPLAY)|${CFLAGS} $$(WARNING_DISPLAY)|' \ - ${WRKSRC}/Makefile .if defined(WITH_DEDICATED_SERVER_ONLY) @${REINPLACE_CMD} -e 's|^WITH_SDL|#WITH_SDL|' ${WRKSRC}/makefiledir/Makefile.libdetection .endif diff --git a/games/openttd/files/patch-Makefile b/games/openttd/files/patch-Makefile new file mode 100644 index 0000000..21d9e64 --- /dev/null +++ b/games/openttd/files/patch-Makefile @@ -0,0 +1,29 @@ +--- Makefile.orig Mon Mar 27 02:32:00 2006 ++++ Makefile Fri Jun 16 04:30:11 2006 +@@ -240,7 +240,7 @@ + ifndef WIN32 + ifndef MORPHOS + ifndef OSX +- LDFLAGS+=-lpthread ++ LDFLAGS+=${PTHREAD_LIBS} + endif + endif + endif +@@ -297,7 +297,7 @@ + # GNU make can only test for (in)equality + # this is a workaround to test for >= + ifeq ($(shell expr $(CC_VERSION) \>= 29), 1) +- CFLAGS += -O -Wall -Wno-multichar -Wsign-compare -Wstrict-prototypes -Wundef ++ CFLAGS += -Wall -Wno-multichar -Wsign-compare -Wstrict-prototypes -Wundef + CFLAGS += -Wwrite-strings -Wpointer-arith + endif + ifeq ($(shell expr $(CC_VERSION) \>= 30), 1) +@@ -350,8 +350,6 @@ + ifdef MORPHOS + BASECFLAGS += -I/gg/os-include -O2 -noixemul -fstrict-aliasing -fexpensive-optimizations + BASECFLAGS += -mcpu=604 -fno-inline -mstring -mmultiple +-else +-BASECFLAGS += -O2 + endif + ifndef PROFILE + ifndef IRIX |
