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

Remove unnecessary optimization workaround after hppa / sparc switched

Browse Source 
to gcc4.

tested by landry@ (hppa) and todd@ (sparc)
from Brad
This commit is contained in:
ajacoutot 2011-08-29 12:44:29 +00:00
parent eefa356fc1
commit 790ee995f0
3 changed files with 2 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
games/ggz/libggz/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.10 2010/11/16 11:23:27 espie Exp $
# $OpenBSD: Makefile,v 1.11 2011/08/29 12:44:29 ajacoutot Exp $
COMMENT= GGZ Gaming Zone - base library
DISTNAME= libggz-$V
REVISION = 2
REVISION = 3
SHARED_LIBS += ggz 0.0 # .5.0
CONFIGURE_ARGS+= --with-gcrypt \
@ -18,11 +18,4 @@ WANTLIB= crypto gpg-error ssl pthread gcrypt
LIB_DEPENDS= security/libgcrypt
# compiler takes insane amounts of time to compile
.if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "hppa"
EXTRA_CFLAGS= -O1
.endif
MAKE_FLAGS+= EXTRA_CFLAGS=${EXTRA_CFLAGS}
.include <bsd.port.mk>

23
games/ggz/libggz/patches/patch-src_Makefile_in
View File

@ -1,23 +0,0 @@
$OpenBSD: patch-src_Makefile_in,v 1.1 2008/12/22 22:57:45 jasper Exp $
Append extra CFLAGS if needed (fixes build on sparc64).
--- src/Makefile.in.orig Fri Dec 5 18:55:05 2008
+++ src/Makefile.in Fri Dec 5 18:55:46 2008
@@ -72,13 +72,14 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(EXTRA_CFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(libggz_la_SOURCES)
DIST_SOURCES = $(libggz_la_SOURCES)

30
games/ggz/libggz/patches/patch-src_security_Makefile_in
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-src_security_Makefile_in,v 1.1 2008/12/22 22:57:45 jasper Exp $
Append extra CFLAGS if needed (fixes build on sparc64).
--- src/security/Makefile.in.orig Fri Dec 5 18:56:39 2008
+++ src/security/Makefile.in Fri Dec 5 18:57:04 2008
@@ -56,19 +56,20 @@ am_libggzsecurity_la_OBJECTS = libggzsecurity_la-hashf
libggzsecurity_la-ggz_tls_none.lo
libggzsecurity_la_OBJECTS = $(am_libggzsecurity_la_OBJECTS)
libggzsecurity_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) \
$(libggzsecurity_la_LDFLAGS) $(LDFLAGS) -o $@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(EXTRA_CFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(libggzsecurity_la_SOURCES)
DIST_SOURCES = $(libggzsecurity_la_SOURCES)