diff options
| author | dholland <dholland@pkgsrc.org> | 2013-11-18 02:22:30 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2013-11-18 02:22:30 +0000 |
| commit | a2f66ef90186ad9e32aea76851efcb44a7cf7108 (patch) | |
| tree | 7c465665df576f8b0451f4c1a0ea5e369174800f /audio/flite | |
| parent | e733ca05a876e2eb6675bbabb8f82a40bc5ffac4 (diff) | |
| download | pkgsrc-a2f66ef90186ad9e32aea76851efcb44a7cf7108.tar.gz | |
Improve the workaround for what is now PR 48385.
Diffstat (limited to 'audio/flite')
| -rw-r--r-- | audio/flite/distinfo | 4 | ||||
| -rw-r--r-- | audio/flite/patches/patch-config_common__make__rules | 37 |
2 files changed, 20 insertions, 21 deletions
diff --git a/audio/flite/distinfo b/audio/flite/distinfo index 8dc00f106b5..c277a0f4f3c 100644 --- a/audio/flite/distinfo +++ b/audio/flite/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2013/11/17 16:25:09 dholland Exp $ +$NetBSD: distinfo,v 1.8 2013/11/18 02:22:30 dholland Exp $ SHA1 (flite-1.3-release.tar.gz) = 233144a772de72741ae1aa2292f672c30224afb3 RMD160 (flite-1.3-release.tar.gz) = a908acfd196754783ee4665ac84ea860d54bcf80 @@ -8,4 +8,4 @@ SHA1 (patch-ab) = 253876a3edc65b60a5891375b2a90a4fcc01da24 SHA1 (patch-ac) = 9e533a22ed3a59cb6d99b6bbd6eacdfaa1695285 SHA1 (patch-ad) = e75da7826581a1d93d4f5efe75f257cc749358a7 SHA1 (patch-ae) = c1bd0e1baea7464d3ef0d35481714f92af3da4d8 -SHA1 (patch-config_common__make__rules) = ab6a78f2d779679f2507d8858b5e510ce47fbac4 +SHA1 (patch-config_common__make__rules) = b7ac878a2d4008a796e3d53ac355b9ede6ff8249 diff --git a/audio/flite/patches/patch-config_common__make__rules b/audio/flite/patches/patch-config_common__make__rules index 263ad984010..1ce3458f355 100644 --- a/audio/flite/patches/patch-config_common__make__rules +++ b/audio/flite/patches/patch-config_common__make__rules @@ -1,28 +1,27 @@ -$NetBSD: patch-config_common__make__rules,v 1.1 2013/11/17 16:25:09 dholland Exp $ +$NetBSD: patch-config_common__make__rules,v 1.2 2013/11/18 02:22:30 dholland Exp $ -Work around what appears to be a bug in gmake 4.0 that causes the -build to loop infinitely making depend if building to tmpfs. +Work around PR 48385, a tmpfs bug that combined with this package's +build system causes gmake 4.0 to loop forever making depend. -The first echo makes it print something so you can tell what's looping -(otherwise it just sits there silently); the "false" is the -workaround. For some reason this recipe needs to fail to prevent the -loop. +The problem in tmpfs, which assigns file and directory timestamps +lazily and therefore frequently out of order, gets tickled because the +depend file depends on the directory containing it. + +It is, in any event, almost never a good idea to depend on directories +in makefiles. The workaround is to not do that and explicitly run a +sub-make to create the object directory. --- config/common_make_rules.orig 2004-12-19 22:20:43.000000000 +0000 +++ config/common_make_rules -@@ -190,12 +190,15 @@ endif +@@ -188,7 +188,10 @@ ifdef ALL_DIRS + done + endif - $(DEPEND): $(SRCS) $(OBJDIR) - @ rm -f $(DEPEND) +-$(DEPEND): $(SRCS) $(OBJDIR) ++$(DEPEND): $(SRCS) + @ echo Doing implicit make depend. ++ @ touch $(DEPEND) ++ @ $(MAKE) $(OBJDIR) + @ rm -f $(DEPEND) @ for i in $(SRCS) ; \ do \ - echo "# $$i" ; \ - $(MAKE_DEPEND) $$i | sed -e 's,^\([^:][^:]*\):,$(OBJDIR)/\1:,'; \ - echo ; \ - done > $(DEPEND) -+ @ echo The following is intentional. -+ false - - file-list: - @ echo making file-list in $(DIRNAME) ... |