| Andrew Geissler | 475cb72 | 2020-07-10 16:00:51 -0500 | [diff] [blame] | 1 | From 6efe006e99a7e739afbf7fe8937445c82630fc8f Mon Sep 17 00:00:00 2001 |
| 2 | From: David Michael <fedora.dm0@gmail.com> |
| 3 | Date: Mon, 1 Jun 2020 10:24:53 -0400 |
| 4 | Subject: [PATCH] build: Fix cross-compiling into a separate build dir. |
| 5 | |
| 6 | * configure.ac: Create the src directory before writing into it. |
| 7 | * src/Makefile.am (EXTRA_DIST): Add gen-lock-obj.sh. |
| 8 | |
| 9 | -- |
| 10 | |
| 11 | Upstream-Status: Backport |
| 12 | Signed-off-by: David Michael <fedora.dm0@gmail.com> |
| 13 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 14 | --- |
| 15 | configure.ac | 1 + |
| 16 | src/Makefile.am | 2 +- |
| 17 | 2 files changed, 2 insertions(+), 1 deletion(-) |
| 18 | |
| 19 | diff --git a/configure.ac b/configure.ac |
| 20 | index def8bba..8c0d845 100644 |
| 21 | --- a/configure.ac |
| 22 | +++ b/configure.ac |
| 23 | @@ -598,6 +598,7 @@ if test x$cross_compiling = xyes; then |
| 24 | case $host in |
| 25 | *-*-linux*) |
| 26 | lock_obj_h_generated=yes |
| 27 | + mkdir src |
| 28 | LOCK_ABI_VERSION=1 host=$host host_alias=$host_alias \ |
| 29 | CC=$CC OBJDUMP=$host_alias-objdump \ |
| 30 | ac_ext=$ac_ext ac_objext=$ac_objext \ |
| 31 | diff --git a/src/Makefile.am b/src/Makefile.am |
| 32 | index 2fb83c0..d773877 100644 |
| 33 | --- a/src/Makefile.am |
| 34 | +++ b/src/Makefile.am |
| 35 | @@ -102,7 +102,7 @@ EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ |
| 36 | gpg-error.vers gpg-error.def.in \ |
| 37 | versioninfo.rc.in gpg-error.w32-manifest.in \ |
| 38 | gpg-error-config-test.sh gpg-error.pc.in \ |
| 39 | - $(lock_obj_pub) |
| 40 | + gen-lock-obj.sh $(lock_obj_pub) |
| 41 | |
| 42 | BUILT_SOURCES = $(srcdir)/err-sources.h $(srcdir)/err-codes.h \ |
| 43 | code-to-errno.h code-from-errno.h \ |