Initial commit
This commit is contained in:
Your Name
@@ -0,0 +1,43 @@
|
||||
From 133ab27cdb17ca20ef6b0304cf30621d2bcbe757 Mon Sep 17 00:00:00 2001
|
||||
From: Mingli Yu <mingli.yu@windriver.com>
|
||||
Date: Thu, 31 Jan 2019 21:32:26 -0800
|
||||
Subject: [PATCH] src/Makefile: improve reproducibility
|
||||
|
||||
Clear all_cflags, all_lflags, compiled_user
|
||||
and compiled_sys to avoid introducing build
|
||||
info to improve reproducibility as below:
|
||||
|
||||
WARNING: vim-8.1.0347-r0 do_package_qa: QA Issue: File /work/core2-64-wrs-linux/vim/8.1.0347-r0/packages-split/vim/usr/bin/vim.vim in package contained reference to tmpdir [buildpaths]
|
||||
|
||||
Upstream-Status: Inappropriate [oe specific]
|
||||
|
||||
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
|
||||
---
|
||||
src/Makefile | 14 ++++----------
|
||||
1 file changed, 4 insertions(+), 10 deletions(-)
|
||||
|
||||
Index: git/src/Makefile
|
||||
===================================================================
|
||||
--- git.orig/src/Makefile
|
||||
+++ git/src/Makefile
|
||||
@@ -3101,16 +3101,10 @@ auto/pathdef.c: Makefile auto/config.mk
|
||||
-@echo '#include "vim.h"' >> $@
|
||||
-@echo 'char_u *default_vim_dir = (char_u *)"$(VIMRCLOC)";' | $(QUOTESED) >> $@
|
||||
-@echo 'char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR)";' | $(QUOTESED) >> $@
|
||||
- -@echo 'char_u *all_cflags = (char_u *)"$(CC) -c -I$(srcdir) $(ALL_CFLAGS)";' | $(QUOTESED) >> $@
|
||||
- -@echo 'char_u *all_lflags = (char_u *)"$(CC) $(ALL_LIB_DIRS) $(LDFLAGS) -o $(VIMTARGET) $(ALL_LIBS) ";' | $(QUOTESED) >> $@
|
||||
- -@echo 'char_u *compiled_user = (char_u *)"' | tr -d $(NL) >> $@
|
||||
- -@if test -n "$(COMPILEDBY)"; then \
|
||||
- echo "$(COMPILEDBY)" | tr -d $(NL) >> $@; \
|
||||
- else ((logname) 2>/dev/null || whoami) | tr -d $(NL) >> $@; fi
|
||||
- -@echo '";' >> $@
|
||||
- -@echo 'char_u *compiled_sys = (char_u *)"' | tr -d $(NL) >> $@
|
||||
- -@if test -z "$(COMPILEDBY)"; then hostname | tr -d $(NL) >> $@; fi
|
||||
- -@echo '";' >> $@
|
||||
+ -@echo 'char_u *all_cflags = (char_u *)"";' | $(QUOTESED) >> $@
|
||||
+ -@echo 'char_u *all_lflags = (char_u *)"";' | $(QUOTESED) >> $@
|
||||
+ -@echo 'char_u *compiled_user = (char_u *)"";' >> $@
|
||||
+ -@echo 'char_u *compiled_sys = (char_u *)"";' >> $@
|
||||
-@sh $(srcdir)/pathdef.sh
|
||||
|
||||
GUI_GTK_RES_INPUTS = \
|
||||
@@ -0,0 +1,36 @@
|
||||
From 5ed25c076a1fb1889a3c50dddf29f21850b59a13 Mon Sep 17 00:00:00 2001
|
||||
From: Wenzong Fan <wenzong.fan@windriver.com>
|
||||
Date: Tue, 26 Jun 2018 17:29:09 +0800
|
||||
Subject: [PATCH] disable acl header check
|
||||
|
||||
Don't check 'sys/acl.h' if acl support disabled for vim/vim-tiny.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
|
||||
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
||||
---
|
||||
src/configure.ac | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
Index: git/src/configure.ac
|
||||
===================================================================
|
||||
--- git.orig/src/configure.ac
|
||||
+++ git/src/configure.ac
|
||||
@@ -3292,7 +3292,7 @@ AC_CHECK_HEADERS(stdint.h stdlib.h strin
|
||||
sys/systeminfo.h locale.h sys/stream.h termios.h \
|
||||
libc.h sys/statfs.h poll.h sys/poll.h pwd.h \
|
||||
utime.h sys/param.h sys/ptms.h libintl.h libgen.h \
|
||||
- util/debug.h util/msg18n.h frame.h sys/acl.h \
|
||||
+ util/debug.h util/msg18n.h frame.h \
|
||||
sys/access.h sys/sysinfo.h wchar.h wctype.h)
|
||||
|
||||
dnl sys/ptem.h depends on sys/stream.h on Solaris
|
||||
@@ -3974,6 +3974,7 @@ AC_ARG_ENABLE(acl,
|
||||
, [enable_acl="yes"])
|
||||
if test "$enable_acl" = "yes"; then
|
||||
AC_MSG_RESULT(no)
|
||||
+ AC_CHECK_HEADERS(sys/acl.h)
|
||||
AC_CHECK_LIB(posix1e, acl_get_file, [LIBS="$LIBS -lposix1e"],
|
||||
AC_CHECK_LIB(acl, acl_get_file, [LIBS="$LIBS -lacl"
|
||||
AC_CHECK_LIB(attr, fgetxattr, LIBS="$LIBS -lattr",,)],,),)
|
||||
@@ -0,0 +1,36 @@
|
||||
From 4125a1ccb82fd53d003acdc34e462f238f0c4f0d Mon Sep 17 00:00:00 2001
|
||||
From: Joe Slater <joe.slater@windriver.com>
|
||||
Date: Fri, 8 Jul 2022 11:03:22 +0800
|
||||
Subject: [PATCH] vim: do not adjust script pathnames
|
||||
|
||||
When cross-compiling, we do not want to reference the host versions of
|
||||
things like perl and awk.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
|
||||
---
|
||||
src/Makefile | 6 +-----
|
||||
1 file changed, 1 insertion(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/Makefile b/src/Makefile
|
||||
index c9513a632..7a7cbdc43 100644
|
||||
--- a/src/Makefile
|
||||
+++ b/src/Makefile
|
||||
@@ -2534,11 +2534,7 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_prefix) $(DEST_BIN) \
|
||||
rm -rf $$cvs; \
|
||||
fi
|
||||
-chmod $(FILEMOD) $(DEST_TOOLS)/*
|
||||
-# replace the path in some tools
|
||||
- perlpath=`./which.sh perl` && sed -e "s+/usr/bin/perl+$$perlpath+" $(TOOLSSOURCE)/efm_perl.pl >$(DEST_TOOLS)/efm_perl.pl
|
||||
- awkpath=`./which.sh nawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \
|
||||
- awkpath=`./which.sh gawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \
|
||||
- awkpath=`./which.sh awk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; fi; fi
|
||||
+# not replace the path in some tools
|
||||
-chmod $(SCRIPTMOD) `grep -l "^#!" $(DEST_TOOLS)/*`
|
||||
|
||||
# install the language specific files for tools, if they were unpacked
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
From 38de4bccdb8a861ffdd447f12fdab19d6d852c02 Mon Sep 17 00:00:00 2001
|
||||
From: Chong Lu <Chong.Lu@windriver.com>
|
||||
Date: Tue, 26 Jun 2018 17:34:15 +0800
|
||||
Subject: [PATCH] vim: add knob whether elf.h are checked
|
||||
|
||||
Previously, it still was checked when there was no elf library in sysroots directory.
|
||||
Add knob to decide whether elf.h are checked or not.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
|
||||
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
||||
---
|
||||
src/configure.ac | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
Index: git/src/configure.ac
|
||||
===================================================================
|
||||
--- git.orig/src/configure.ac
|
||||
+++ git/src/configure.ac
|
||||
@@ -3264,11 +3264,18 @@ AC_TRY_COMPILE([#include <stdio.h>], [in
|
||||
AC_MSG_RESULT(no))
|
||||
|
||||
dnl Checks for header files.
|
||||
+AC_MSG_CHECKING(whether or not to look for elf.h)
|
||||
+AC_ARG_ENABLE(elf-check,
|
||||
+ [ --enable-elf-check If elfutils, check for elf.h [default=no]],
|
||||
+ , enable_elf_check="no")
|
||||
+AC_MSG_RESULT($enable_elf_check)
|
||||
+if test "x$enable_elf_check" != "xno"; then
|
||||
AC_CHECK_HEADER(elf.h, HAS_ELF=1)
|
||||
dnl AC_CHECK_HEADER(dwarf.h, SVR4=1)
|
||||
if test "$HAS_ELF" = 1; then
|
||||
AC_CHECK_LIB(elf, main)
|
||||
fi
|
||||
+fi
|
||||
|
||||
AC_HEADER_DIRENT
|
||||
|
||||
Reference in New Issue
Block a user