File: 31_allow_overriding_AGexe_for_crossbuild.diff

package info (click to toggle)
autogen 1%3A5.18.16-7
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid, trixie
  • size: 9,112 kB
  • sloc: ansic: 24,878; sh: 14,624; makefile: 807; perl: 800; lisp: 128
file content (43 lines) | stat: -rw-r--r-- 1,682 bytes parent folder | download | duplicates (3)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
Description: Allow overriding of AGexe (for cross build)
 build-aux/run-ag.sh hard codes some path for AGexe, which makes the
 cross build unable to find a working autogen.
 The relevant callers of run-ag.sh fail to pass the correct AGexe.
Author: Helmut Grohne <helmut@subdivi.de>
Origin: vendor
Bug-Debian: https://bugs.debian.org/941025
Forwarded: no
Reviewed-By: Andreas Metzler <ametzler@debian.org>
Last-Update: 2019-10-05

--- autogen-5.18.16.orig/build-aux/run-ag.sh
+++ autogen-5.18.16/build-aux/run-ag.sh
@@ -25,7 +25,6 @@
 # any containing directory must be created. The target is created with a
 # very old time stamp.
 #
-AGexe=/u/bkorb/tools/ag/autogen-bld/agen5/.libs/autogen
 find_exe() {
   eval local exe=\${$1}
   test -x "$exe" && return 0
--- autogen-5.18.16.orig/getdefs/Makefile.am
+++ autogen-5.18.16/getdefs/Makefile.am
@@ -32,7 +32,7 @@ nodist_getdefs_SOURCES = $(BUILT_SOURCES
 SUBDIRS         = test
 EXTRA_DIST      = opts.def $(gdsrcs)
 AG_ENV          =  top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" \
-	VERBOSE="$(V)"
+	VERBOSE="$(V)" AGexe="$(AGexe)"
 RUN_AG          = $(AG_ENV) $(SHELL) "${top_srcdir}/build-aux/run-ag.sh"
 
 all : gen
--- autogen-5.18.16.orig/xml2ag/Makefile.am
+++ autogen-5.18.16/xml2ag/Makefile.am
@@ -37,7 +37,7 @@ DISTCLEANFILES  = $(DOCFILES) $(nodist_x
 AM_CPPFLAGS     = @INCLIST@ $(LIBXML2_CFLAGS)
 AM_CFLAGS       = @WARN_CFLAGS@
 AG_ENV          =  top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" \
-	VERBOSE="$(V)"
+	VERBOSE="$(V)" AGexe="$(AGexe)"
 RUN_AG       = $(AG_ENV) $(SHELL) "${top_srcdir}/build-aux/run-ag.sh"
 DOC_TIMEOUT     = -DLEVEL=section --timeout=`expr $(AG_TIMEOUT) '*' 3`