import patch from upstream for out-of-tree cross-builds
Daniel Kahn Gillmor
3 years ago
| 0 | From: David Michael <fedora.dm0@gmail.com> | |
| 1 | Date: Mon, 1 Jun 2020 10:24:53 -0400 | |
| 2 | Subject: build: Fix cross-compiling into a separate build dir. | |
| 3 | ||
| 4 | * configure.ac: Create the src directory before writing into it. | |
| 5 | * src/Makefile.am (EXTRA_DIST): Add gen-lock-obj.sh. | |
| 6 | ||
| 7 | -- | |
| 8 | ||
| 9 | Signed-off-by: David Michael <fedora.dm0@gmail.com> | |
| 10 | (cherry picked from commit 013720333c6ec1d38791689bc49ba039d98e16b3) | |
| 11 | --- | |
| 12 | configure.ac | 1 + | |
| 13 | src/Makefile.am | 2 +- | |
| 14 | 2 files changed, 2 insertions(+), 1 deletion(-) | |
| 15 | ||
| 16 | diff --git a/configure.ac b/configure.ac | |
| 17 | index def8bba..8c0d845 100644 | |
| 18 | --- a/configure.ac | |
| 19 | +++ b/configure.ac | |
| 20 | @@ -598,6 +598,7 @@ if test x$cross_compiling = xyes; then | |
| 21 | case $host in | |
| 22 | *-*-linux*) | |
| 23 | lock_obj_h_generated=yes | |
| 24 | + mkdir src | |
| 25 | LOCK_ABI_VERSION=1 host=$host host_alias=$host_alias \ | |
| 26 | CC=$CC OBJDUMP=$host_alias-objdump \ | |
| 27 | ac_ext=$ac_ext ac_objext=$ac_objext \ | |
| 28 | diff --git a/src/Makefile.am b/src/Makefile.am | |
| 29 | index 7e36d69..b2bffd2 100644 | |
| 30 | --- a/src/Makefile.am | |
| 31 | +++ b/src/Makefile.am | |
| 32 | @@ -102,7 +102,7 @@ EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ | |
| 33 | gpg-error.vers gpg-error.def.in \ | |
| 34 | versioninfo.rc.in gpg-error.w32-manifest.in \ | |
| 35 | gpg-error-config-test.sh gpg-error.pc.in \ | |
| 36 | - $(lock_obj_pub) | |
| 37 | + gen-lock-obj.sh $(lock_obj_pub) | |
| 38 | ||
| 39 | BUILT_SOURCES = $(srcdir)/err-sources.h $(srcdir)/err-codes.h \ | |
| 40 | code-to-errno.h code-from-errno.h \ |