gbranden pushed a commit to branch branden-2023-07-05
in repository groff.

commit 31dd6e19e178e577f74084256ae1ca8ac66b2e4e
Author: G. Branden Robinson <g.branden.robin...@gmail.com>
AuthorDate: Tue Mar 14 18:57:37 2023 -0500

    [build, man]: Fix Savannah #63924.
    
    * tmac/tmac.am (tmac/stamp-wrap): Stop prepending groff's man(7) package
      wrapper ("-man") on hosts with a system man package with a request to
      source itself; this was search-and-replace damage from resolving
      Savannah #60789.  The wrapper still worked, but reported any errors
      inside the wrapped macro package many times until the process ran out
      of file descriptors.  Problem introduced by me in commit fdac25937f,
      2021-07-05.
    
    Fixes <https://savannah.gnu.org/bugs/?63924>.
    
    Discovered while testing on Solaris 10.
---
 ChangeLog    | 12 ++++++++++++
 tmac/tmac.am |  3 ---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1f1055976..ad8c4671b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2023-03-14  G. Branden Robinson <g.branden.robin...@gmail.com>
+
+       * tmac/tmac.am (tmac/stamp-wrap): Stop prepending groff's man(7)
+       package wrapper ("-man") on hosts with a system man package with
+       a request to source itself; this was search-and-replace damage
+       from resolving Savannah #60789.  The wrapper still worked, but
+       reported any errors inside the wrapped macro package many times
+       until the process ran out of file descriptors.  Problem
+       introduced by me in commit fdac25937f, 2021-07-05.
+
+       Fixes <https://savannah.gnu.org/bugs/?63924>.
+
 2023-03-14  Deri James  <d...@chuzzlewit.myzen.co.uk>
 
        [gropdf]: Make pdfmom more versatile.
diff --git a/tmac/tmac.am b/tmac/tmac.am
index 81f689591..dfa034140 100644
--- a/tmac/tmac.am
+++ b/tmac/tmac.am
@@ -307,9 +307,6 @@ tmac/stamp-wrap:
        $(AM_V_at)if test -n "$(tmac_wrap)"; then \
          for m in ""$(tmac_wrap); do \
            $(RM) $(top_builddir)/tmac/$$m-wrap; \
-           if test "$$m" = an; then \
-             echo .do mso an.tmac >>$(top_builddir)/tmac/$$m-wrap; \
-           fi; \
            echo .cp 1 >>$(top_builddir)/tmac/$$m-wrap; \
            echo .so $(sys_tmac_prefix)$$m \
              >>$(top_builddir)/tmac/$$m-wrap; \

_______________________________________________
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

Reply via email to