]> git.ipfire.org Git - people/amarx/ipfire-3.x.git/blob - vim/patches/vim-7.3.485.patch0
Merge remote-tracking branch 'stevee/openvswitch-systemd'
[people/amarx/ipfire-3.x.git] / vim / patches / vim-7.3.485.patch0
1 To: vim_dev@googlegroups.com
2 Subject: Patch 7.3.485
3 Fcc: outbox
4 From: Bram Moolenaar <Bram@moolenaar.net>
5 Mime-Version: 1.0
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
8 ------------
9
10 Patch 7.3.485
11 Problem: When building Vim LDFLAGS isn't passed on to building xxd.
12 Solution: Pass the LDFLAGS value. (James McCoy)
13 Files: src/Makefile
14
15
16 *** ../vim-7.3.484/src/Makefile 2011-12-14 20:51:19.000000000 +0100
17 --- src/Makefile 2012-03-28 17:16:06.000000000 +0200
18 ***************
19 *** 1720,1726 ****
20 sh $(srcdir)/link.sh
21
22 xxd/xxd$(EXEEXT): xxd/xxd.c
23 ! cd xxd; CC="$(CC)" CFLAGS="$(CPPFLAGS) $(CFLAGS)" \
24 $(MAKE) -f Makefile
25
26 # Build the language specific files if they were unpacked.
27 --- 1720,1726 ----
28 sh $(srcdir)/link.sh
29
30 xxd/xxd$(EXEEXT): xxd/xxd.c
31 ! cd xxd; CC="$(CC)" CFLAGS="$(CPPFLAGS) $(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
32 $(MAKE) -f Makefile
33
34 # Build the language specific files if they were unpacked.
35 *** ../vim-7.3.484/src/version.c 2012-03-28 17:10:26.000000000 +0200
36 --- src/version.c 2012-03-28 17:16:15.000000000 +0200
37 ***************
38 *** 716,717 ****
39 --- 716,719 ----
40 { /* Add new patch number below this line */
41 + /**/
42 + 485,
43 /**/
44
45 --
46 GOD: That is your purpose Arthur ... the Quest for the Holy Grail ...
47 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
48
49 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
50 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
51 \\\ an exciting new programming language -- http://www.Zimbu.org ///
52 \\\ help me help AIDS victims -- http://ICCF-Holland.org ///