Source: groff
Version: 1.22.4-1
Tags: patch
User: [email protected]
Usertags: rebootstrap

groff fails to cross build from source, because it now fails running the
native cross. It uses two build passes (native and cross) since it needs
a native groff. That used to be located in
build-native/src/roff/groff/groff, but some recent upstream release
moved it to build-native/groff. Other tools followed. The hierarchy got
flattened. Unfortunately the debian packaging was not updated for the
new layout and now it fails. The attached patch fixes that. Please
include that in buster, because groff is part of build-essential.

Helmut
diff --minimal -Nru groff-1.22.4/debian/changelog groff-1.22.4/debian/changelog
--- groff-1.22.4/debian/changelog       2018-12-24 00:35:24.000000000 +0100
+++ groff-1.22.4/debian/changelog       2018-12-28 16:24:18.000000000 +0100
@@ -1,3 +1,10 @@
+groff (1.22.4-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Update build-native paths to new layout. (Closes: #-1)
+
+ -- Helmut Grohne <[email protected]>  Fri, 28 Dec 2018 16:24:18 +0100
+
 groff (1.22.4-1) unstable; urgency=medium
 
   * New upstream release.
diff --minimal -Nru groff-1.22.4/debian/rules groff-1.22.4/debian/rules
--- groff-1.22.4/debian/rules   2018-12-24 00:29:59.000000000 +0100
+++ groff-1.22.4/debian/rules   2018-12-28 16:24:18.000000000 +0100
@@ -65,27 +65,12 @@
   cross :=
 else
   native_tmp := $(CURDIR)/debian/build-native
-  groff_bin_dirs := \
-       $(native_tmp)/src/roff/groff \
-       $(native_tmp)/src/roff/troff \
-       $(native_tmp)/src/preproc/pic \
-       $(native_tmp)/src/preproc/eqn \
-       $(native_tmp)/src/preproc/tbl \
-       $(native_tmp)/src/preproc/grn \
-       $(native_tmp)/src/preproc/refer \
-       $(native_tmp)/src/preproc/soelim \
-       $(native_tmp)/src/preproc/html \
-       $(native_tmp)/src/devices/grops \
-       $(native_tmp)/src/devices/grodvi \
-       $(native_tmp)/src/devices/grotty \
-       $(native_tmp)/src/devices/grolj4 \
-       $(native_tmp)/src/devices/grolbp \
-       $(native_tmp)/src/devices/grohtml
+  groff_bin_dirs := $(native_tmp)
   empty :=
   space := $(empty) $(empty)
   cross := \
-       GROFFBIN=$(native_tmp)/src/roff/groff/groff \
-       GROFF_BIN_DIR=$(native_tmp)/src/roff/groff \
+       GROFFBIN=$(native_tmp)/groff \
+       GROFF_BIN_DIR=$(native_tmp) \
        GROFF_BIN_PATH=$(subst $(space),:,$(groff_bin_dirs))
 endif
 

Reply via email to