diff options
| author | Maarten ter Huurne <maarten@treewalker.org> | 2014-09-15 04:39:49 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-09-21 19:58:28 +0200 |
| commit | 6a16e1631f37e9d1e7c0cfb97ba25cd2f5e17bda (patch) | |
| tree | 6e627f07cf3f6e10480b262e0248f69a9d70ab31 /package/screen/screen-0009-install-dir-dependency.patch | |
| parent | 22b65765556d544678749fc24fcd03d968a9a1c5 (diff) | |
| download | buildroot-6a16e1631f37e9d1e7c0cfb97ba25cd2f5e17bda.tar.gz buildroot-6a16e1631f37e9d1e7c0cfb97ba25cd2f5e17bda.zip | |
screen: bump to version 4.2.1
I re-did the patches: one patch per change, patch configure.in instead
of the configure script itself, a few more issues fixed. This should
hopefully make the patches acceptable for upstream, or at least make it
easier to migrate them on version bumps.
This also fixes compilation with musl libc.
Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/screen/screen-0009-install-dir-dependency.patch')
| -rw-r--r-- | package/screen/screen-0009-install-dir-dependency.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/package/screen/screen-0009-install-dir-dependency.patch b/package/screen/screen-0009-install-dir-dependency.patch new file mode 100644 index 0000000000..9016cb90be --- /dev/null +++ b/package/screen/screen-0009-install-dir-dependency.patch @@ -0,0 +1,43 @@ +From: Maarten ter Huurne <maarten@treewalker.org> +Date: Mon, 15 Sep 2014 02:27:09 +0200 +Subject: Ensure that installation dirs exist before copying files into them + +Since the "install_bin" target requires the installation directories +to exist, it should depend on the "installdirs" target. The previous +approach of having "install" depend on "installdirs" is not reliable. + +For example, in a parallel build, there was no guarantee that +"installdirs" would be finished before "install_bin" runs. Also if +the user requested only "install_bin" to be made, "installdirs" would +be skipped altogether. + +Signed-off-by: Maarten ter Huurne <maarten@treewalker.org> +--- + Makefile.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 860f351..f0fe08d 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -82,7 +82,7 @@ screen: $(OFILES) + $(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(CPPFLAGS) $(DEFS) \ + $(OPTIONS) $(CFLAGS) $< + +-install_bin: .version screen ++install_bin: .version screen installdirs + $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) + -chown root $(DESTDIR)$(bindir)/$(SCREEN) + -chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) +@@ -94,7 +94,7 @@ endif + cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS) + + ############################################################################### +-install: installdirs install_bin ++install: install_bin + cd doc ; $(MAKE) install + -if [ -d /usr/lib/terminfo ]; then \ + PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \ +-- +1.8.4.5 + |
