cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove -O and allow our CFLAGS to do the right thing

Browse Source 
Fixes build on alpha.

ok naddy, mk
This commit is contained in:
merdely 2008-01-26 16:32:14 +00:00
parent 2506b0efb8
commit 17e33f433d
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
games/openttd/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.7 2007/10/05 18:22:22 mk Exp $
# $OpenBSD: Makefile,v 1.8 2008/01/26 16:32:14 merdely Exp $
COMMENT= open source clone of the game Transport Tycoon Deluxe
DISTNAME= openttd-0.5.3-source
PKGNAME= ${DISTNAME:S/-source//}
PKGNAME= ${DISTNAME:S/-source//}p0
EXTRACT_SUFX= .tar.bz2
CATEGORIES= games

19
games/openttd/patches/patch-Makefile
View File

@ -1,6 +1,15 @@
$OpenBSD: patch-Makefile,v 1.2 2007/06/11 10:56:28 mk Exp $
--- Makefile.orig Fri Apr 20 21:47:49 2007
+++ Makefile Tue May 29 15:00:57 2007
$OpenBSD: patch-Makefile,v 1.3 2008/01/26 16:32:14 merdely Exp $
--- Makefile.orig Sat Sep 15 05:31:37 2007
+++ Makefile Wed Jan 23 20:43:53 2008
@@ -319,7 +319,7 @@ CC_VERSION = $(shell $(CC_TARGET) -dumpversion | cut -
# 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 -Wundef
+ CFLAGS += -Wall -Wno-multichar -Wsign-compare -Wundef
CC_CFLAGS += -Wstrict-prototypes
CFLAGS += -Wwrite-strings -Wpointer-arith
endif
@@ -408,7 +408,6 @@ LRT:=
endif
endif
@ -9,7 +18,7 @@ $OpenBSD: patch-Makefile,v 1.2 2007/06/11 10:56:28 mk Exp $
ifdef UNIX
CDEFS += -DUNIX
@@ -929,7 +928,7 @@ endif
@@ -933,7 +932,7 @@ endif
$(STRGEN): strgen/strgen.c string.c endian_host.h table/control_codes.h
@echo '===> Compiling and Linking $@'
@ -18,7 +27,7 @@ $OpenBSD: patch-Makefile,v 1.2 2007/06/11 10:56:28 mk Exp $
table/strings.h: lang/english.txt $(STRGEN)
@echo '===> Generating $@'
@@ -953,8 +952,6 @@ release: all
@@ -957,8 +956,6 @@ release: all
$(Q)cp -R $(TTD) "/t/openttd-$(REV)-morphos/"
$(Q)cp data/* "/t/openttd-$(REV)-morphos/data/"
$(Q)cp lang/*.lng "/t/openttd-$(REV)-morphos/lang/"