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-0008-install-nonversioned-binary.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-0008-install-nonversioned-binary.patch')
| -rw-r--r-- | package/screen/screen-0008-install-nonversioned-binary.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/package/screen/screen-0008-install-nonversioned-binary.patch b/package/screen/screen-0008-install-nonversioned-binary.patch new file mode 100644 index 0000000000..ecbbd65197 --- /dev/null +++ b/package/screen/screen-0008-install-nonversioned-binary.patch @@ -0,0 +1,31 @@ +From: Maarten ter Huurne <maarten@treewalker.org> +Date: Mon, 15 Sep 2014 00:06:20 +0200 +Subject: Support overriding SCREEN to get a non-versioned binary + +If a packager runs "make install SCREEN=screen", do not create +"screen" as a symlink to itself. + +Signed-off-by: Maarten ter Huurne <maarten@treewalker.org> +--- + Makefile.in | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Makefile.in b/Makefile.in +index 3c12fdb..860f351 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -86,9 +86,11 @@ install_bin: .version screen + $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) + -chown root $(DESTDIR)$(bindir)/$(SCREEN) + -chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) ++ifneq (${SCREEN},screen) + # This doesn't work if $(bindir)/screen is a symlink + rm -f $(DESTDIR)$(bindir)/screen + (cd $(DESTDIR)$(bindir) && ln -f -s $(SCREEN) screen) ++endif + cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS) + + ############################################################################### +-- +1.8.4.5 + |
