| Andrew Geissler | d688a01 | 2020-09-18 13:36:00 -0500 | [diff] [blame] | 1 | Upstream-Status: Inappropriate [OE-Specific] |
| 2 | |
| 3 | When building emacs, it builds some tools for the HOST |
| 4 | that are then used to build for target, such as |
| 5 | make-fingerprint and make-docfile, this needs to be |
| 6 | adapted to be used by bitbake, otherwise the compiled |
| 7 | executables arent compatible with the HOST. |
| 8 | |
| 9 | Use the above mentioned tools provided by the native |
| 10 | version of the recipe instead. |
| 11 | |
| 12 | Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandro@enedino.org> |
| 13 | |
| 14 | Index: emacs-27.1/src/Makefile.in |
| 15 | =================================================================== |
| 16 | --- emacs-27.1.orig/src/Makefile.in |
| 17 | +++ emacs-27.1/src/Makefile.in |
| 18 | @@ -472,7 +472,7 @@ ifeq ($(CHECK_STRUCTS),true) |
| 19 | pdumper.o: dmpstruct.h |
| 20 | endif |
| 21 | dmpstruct.h: $(srcdir)/dmpstruct.awk |
| 22 | -dmpstruct.h: $(libsrc)/make-fingerprint$(EXEEXT) $(dmpstruct_headers) |
| 23 | +dmpstruct.h: $(dmpstruct_headers) |
| 24 | $(AM_V_GEN)POSIXLY_CORRECT=1 awk -f $(srcdir)/dmpstruct.awk \ |
| 25 | $(dmpstruct_headers) > $@ |
| 26 | |
| 27 | @@ -566,8 +566,7 @@ ${lispintdir}/characters.elc: ${charscri |
| 28 | ## Strictly speaking, emacs does not depend directly on all of $lisp, |
| 29 | ## since not all pieces are used on all platforms. But DOC depends |
| 30 | ## on all of $lisp, and emacs depends on DOC, so it is ok to use $lisp here. |
| 31 | -emacs$(EXEEXT): temacs$(EXEEXT) \ |
| 32 | - lisp.mk $(etc)/DOC $(lisp) \ |
| 33 | +emacs$(EXEEXT): lisp.mk $(etc)/DOC $(lisp) \ |
| 34 | $(lispsource)/international/charprop.el ${charsets} |
| 35 | ifeq ($(DUMPING),unexec) |
| 36 | LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup --temacs=dump |
| 37 | @@ -596,15 +595,15 @@ endif |
| 38 | ## for the first time, this prevents any variation between configurations |
| 39 | ## in the contents of the DOC file. |
| 40 | ## |
| 41 | -$(etc)/DOC: lisp.mk $(libsrc)/make-docfile$(EXEEXT) $(obj) $(lisp) |
| 42 | +$(etc)/DOC: lisp.mk $(obj) $(lisp) |
| 43 | $(AM_V_GEN)$(MKDIR_P) $(etc) |
| 44 | $(AM_V_at)rm -f $(etc)/DOC |
| 45 | - $(AM_V_at)$(libsrc)/make-docfile -d $(srcdir) \ |
| 46 | + make-docfile -d $(srcdir) \ |
| 47 | $(SOME_MACHINE_OBJECTS) $(obj) > $(etc)/DOC |
| 48 | - $(AM_V_at)$(libsrc)/make-docfile -a $(etc)/DOC -d $(lispsource) \ |
| 49 | + make-docfile -a $(etc)/DOC -d $(lispsource) \ |
| 50 | $(shortlisp) |
| 51 | |
| 52 | -$(libsrc)/make-docfile$(EXEEXT) $(libsrc)/make-fingerprint$(EXEEXT): \ |
| 53 | +$(libsrc)/make-fingerprint$(EXEEXT): \ |
| 54 | $(lib)/libgnu.a |
| 55 | $(MAKE) -C $(dir $@) $(notdir $@) |
| 56 | |
| 57 | @@ -622,8 +621,8 @@ am__v_GLOBALS_ = $(am__v_GLOBALS_@AM_DEF |
| 58 | am__v_GLOBALS_0 = @echo " GEN " globals.h; |
| 59 | am__v_GLOBALS_1 = |
| 60 | |
| 61 | -gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES) |
| 62 | - $(AM_V_GLOBALS)$(libsrc)/make-docfile -d $(srcdir) -g $(obj) > globals.tmp |
| 63 | +gl-stamp: $(GLOBAL_SOURCES) |
| 64 | + make-docfile -d $(srcdir) -g $(obj) > globals.tmp |
| 65 | $(AM_V_at)$(top_srcdir)/build-aux/move-if-change globals.tmp globals.h |
| 66 | $(AM_V_at)echo timestamp > $@ |
| 67 | |
| 68 | @@ -637,7 +636,7 @@ $(LIBEGNU_ARCHIVE): $(config_h) |
| 69 | $(MAKE) -C $(dir $@) all |
| 70 | |
| 71 | ifeq ($(HAVE_PDUMPER),yes) |
| 72 | - MAKE_PDUMPER_FINGERPRINT = $(libsrc)/make-fingerprint$(EXEEXT) |
| 73 | + MAKE_PDUMPER_FINGERPRINT = make-fingerprint |
| 74 | else |
| 75 | MAKE_PDUMPER_FINGERPRINT = |
| 76 | endif |
| 77 | @@ -647,7 +646,7 @@ endif |
| 78 | ## This goes on to affect various things, and the emacs binary fails |
| 79 | ## to start if Vinstallation_directory has the wrong value. |
| 80 | temacs$(EXEEXT): $(LIBXMENU) $(ALLOBJS) $(LIBEGNU_ARCHIVE) $(EMACSRES) \ |
| 81 | - $(charsets) $(charscript) $(MAKE_PDUMPER_FINGERPRINT) |
| 82 | + $(charsets) $(charscript) |
| 83 | $(AM_V_CCLD)$(CC) -o $@.tmp \ |
| 84 | $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(LDFLAGS) \ |
| 85 | $(ALLOBJS) $(LIBEGNU_ARCHIVE) $(W32_RES_LINK) $(LIBES) |