diff options
author | dholland <dholland@pkgsrc.org> | 2021-08-16 01:29:37 +0000 |
---|---|---|
committer | dholland <dholland@pkgsrc.org> | 2021-08-16 01:29:37 +0000 |
commit | aef9c48d6df0d44bcf75f8b545f47a5ecbd10d07 (patch) | |
tree | 6ed4590cc009d9e92b89137373453e300adb66a6 /games/mirrormagic | |
parent | 7de070b25eb09958c583adcc9c33944ae85a3a34 (diff) | |
download | pkgsrc-aef9c48d6df0d44bcf75f8b545f47a5ecbd10d07.tar.gz |
games/mirrormagic: fix makefile to be parallel, failed in the procyon builds
Diffstat (limited to 'games/mirrormagic')
-rw-r--r-- | games/mirrormagic/distinfo | 4 | ||||
-rw-r--r-- | games/mirrormagic/patches/patch-src_Makefile | 24 |
2 files changed, 23 insertions, 5 deletions
diff --git a/games/mirrormagic/distinfo b/games/mirrormagic/distinfo index e833bb01f8b..dcf96f80cb5 100644 --- a/games/mirrormagic/distinfo +++ b/games/mirrormagic/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.10 2018/07/13 17:28:46 adam Exp $ +$NetBSD: distinfo,v 1.11 2021/08/16 01:29:37 dholland Exp $ SHA1 (mirrormagic-3.0.0.tar.gz) = 44f401ae883edb7cdc981cdde8807f18ec342bdc RMD160 (mirrormagic-3.0.0.tar.gz) = 69db03f025d57bb921d4b0143db06f37bb6371d7 SHA512 (mirrormagic-3.0.0.tar.gz) = 4cec053bc78a10090a5f9cf678429fd3c927637c3299652de9914b4d8a19518c2e5e10d72bba56aff6a545bbf30e95874576be5b08978060cd59cdba1903de2a Size (mirrormagic-3.0.0.tar.gz) = 4052452 bytes -SHA1 (patch-src_Makefile) = 702af16aeb41f10d3ea995ad8c5c2a43f3ce9a0e +SHA1 (patch-src_Makefile) = 765b7a450384e420ca0e8726bef8e276183111d4 SHA1 (patch-src_libgame_joystick.c) = 152bfcca101d5b66838d68532fbd76599297a6ef SHA1 (patch-src_libgame_joystick.h) = a6bae0443a6285b9e4179119f1101ba7bf8d6727 SHA1 (patch-src_libgame_system.c) = 5e45cba46865f43c7f7d9de3a1f5b44aebb185d0 diff --git a/games/mirrormagic/patches/patch-src_Makefile b/games/mirrormagic/patches/patch-src_Makefile index 42e935b33bf..db69d2bf96d 100644 --- a/games/mirrormagic/patches/patch-src_Makefile +++ b/games/mirrormagic/patches/patch-src_Makefile @@ -1,10 +1,12 @@ -$NetBSD: patch-src_Makefile,v 1.1 2019/05/05 07:59:38 adam Exp $ +$NetBSD: patch-src_Makefile,v 1.2 2021/08/16 01:29:37 dholland Exp $ Append to CFLAGS and LDFLAGS. ---- src/Makefile.orig 2017-03-15 20:15:06.000000000 +0000 +Fix the makefile to not choke on parallel builds. + +--- src/Makefile.orig 2018-04-10 19:44:08.000000000 +0000 +++ src/Makefile -@@ -117,8 +117,10 @@ SYS_LDFLAGS := $(shell echo $(SYS_LDFLAG +@@ -119,8 +119,10 @@ SYS_LDFLAGS := $(shell echo $(SYS_LDFLAG OPTIONS = -O3 -Wall endif @@ -17,3 +19,19 @@ Append to CFLAGS and LDFLAGS. SRCS = main.c \ +@@ -218,7 +220,14 @@ GRAPHICS_DIR = ../graphics + # build targets + # ----------------------------------------------------------------------------- + +-all: $(AUTOCONF) libgame_dir game_em_dir game_sp_dir game_mm_dir $(PROGNAME) graphics_dir ++# since gmake has no .WAIT the only option is to serialize fully ++#all: $(AUTOCONF) libgame_dir game_em_dir game_sp_dir game_mm_dir $(PROGNAME) graphics_dir ++all: ++ $(MAKE) $(AUTOCONF) ++ $(MAKE) libgame_dir ++ $(MAKE) game_em_dir game_sp_dir game_mm_dir ++ $(MAKE) $(PROGNAME) ++ $(MAKE) graphics_dir + + $(PROGNAME): $(RNDLIBS) $(TIMESTAMP_FILE) $(OBJS) $(ICON) + $(CC) $(PROFILING) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME) |