From 89333450fd30c3fe3097406efc20ba6ebfc818f2 Mon Sep 17 00:00:00 2001 From: jasper Date: Mon, 22 Dec 2008 22:57:45 +0000 Subject: [PATCH] - compiling this took an aeon on sparc64, fix that. spotted by sturm@ some time ago --- games/ggz/libggz/Makefile | 10 ++++++- .../ggz/libggz/patches/patch-src_Makefile_in | 23 ++++++++++++++ .../patches/patch-src_security_Makefile_in | 30 +++++++++++++++++++ 3 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 games/ggz/libggz/patches/patch-src_Makefile_in create mode 100644 games/ggz/libggz/patches/patch-src_security_Makefile_in diff --git a/games/ggz/libggz/Makefile b/games/ggz/libggz/Makefile index 9e897cf3660..9d541951d9f 100644 --- a/games/ggz/libggz/Makefile +++ b/games/ggz/libggz/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.2 2008/11/17 18:33:47 jasper Exp $ +# $OpenBSD: Makefile,v 1.3 2008/12/22 22:57:45 jasper Exp $ COMMENT= GGZ Gaming Zone - base library DISTNAME= libggz-$V +PKGNAME= ${DISTNAME}p0 SHARED_LIBS += ggz 0.0 # .5.0 CONFIGURE_ARGS+= --with-gcrypt \ @@ -16,4 +17,11 @@ WANTLIB= crypto gpg-error ssl LIB_DEPENDS= gcrypt::security/libgcrypt +# compiler takes insane amounts of time to compile +.if ${MACHINE_ARCH} == "sparc64" +EXTRA_CFLAGS= -O1 +.endif + +MAKE_FLAGS+= EXTRA_CFLAGS=${EXTRA_CFLAGS} + .include diff --git a/games/ggz/libggz/patches/patch-src_Makefile_in b/games/ggz/libggz/patches/patch-src_Makefile_in new file mode 100644 index 00000000000..5127ee6688b --- /dev/null +++ b/games/ggz/libggz/patches/patch-src_Makefile_in @@ -0,0 +1,23 @@ +$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) diff --git a/games/ggz/libggz/patches/patch-src_security_Makefile_in b/games/ggz/libggz/patches/patch-src_security_Makefile_in new file mode 100644 index 00000000000..5a030599eea --- /dev/null +++ b/games/ggz/libggz/patches/patch-src_security_Makefile_in @@ -0,0 +1,30 @@ +$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)