Bump buidlroot version to 2018.02.6
This commit is contained in:
@@ -1,4 +1,7 @@
|
||||
Link against libintl if needed
|
||||
From f2b6f342325824399da3525df182031475b5c4dd Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Thu, 22 Jun 2017 13:56:03 +0300
|
||||
Subject: [PATCH] Link against libintl if needed
|
||||
|
||||
When built against a C library that has locale support, but for which
|
||||
intl support is provided by an external libintl library, psmisc
|
||||
@@ -8,26 +11,27 @@ properly checks that.
|
||||
This patch therefore ensure that we link against libintl when needed,
|
||||
thanks to the @INTLLIBS@ variable provided by the configure script.
|
||||
|
||||
We do not modify the Makefile.am file, because autoreconfiguring this
|
||||
package doesn't work: because of its usage of gettext, it wants to run
|
||||
the "autopoint" program, which itself depends on CVS being installed,
|
||||
for some strange reasons. That's the reason why we fall back to the
|
||||
hacky solution of modifying the Makefile.in file.
|
||||
|
||||
Forward-ported Thomas's patch to psmisc 22.16
|
||||
from commit f066ed70cd6939838d4057f66798cbc1d972cc73
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
[baruch: move from Makefile.in to Makefile.am for 23.1]
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Makefile.am | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 9f61ab4f2f70..8ce284e65124 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -65,6 +65,7 @@ src_fuser_LDADD = @LIBINTL@
|
||||
src_killall_SOURCES = src/killall.c src/comm.h src/signals.c src/signals.h src/i18n.h
|
||||
src_killall_LDADD = @LIBINTL@ @SELINUX_LIB@
|
||||
src_peekfd_SOURCES = src/peekfd.c
|
||||
+src_peekfd_LDADD = @LIBINTL@
|
||||
src_pslog_SOURCES = src/pslog.c
|
||||
src_pstree_SOURCES = src/pstree.c src/comm.h src/i18n.h
|
||||
src_pstree_LDADD = @LIBINTL@ @TERMCAP_LIB@ @SELINUX_LIB@
|
||||
--
|
||||
2.11.0
|
||||
|
||||
diff -Nura psmisc-22.16.orig/src/Makefile.in psmisc-22.16/src/Makefile.in
|
||||
--- psmisc-22.16.orig/src/Makefile.in 2012-03-28 22:27:33.106660358 -0300
|
||||
+++ psmisc-22.16/src/Makefile.in 2012-03-28 22:28:55.752219349 -0300
|
||||
@@ -76,7 +76,7 @@
|
||||
killall_DEPENDENCIES =
|
||||
am_peekfd_OBJECTS = peekfd.$(OBJEXT)
|
||||
peekfd_OBJECTS = $(am_peekfd_OBJECTS)
|
||||
-peekfd_LDADD = $(LDADD)
|
||||
+peekfd_LDADD = $(LDADD) @LIBINTL@
|
||||
am_prtstat_OBJECTS = prtstat.$(OBJEXT)
|
||||
prtstat_OBJECTS = $(am_prtstat_OBJECTS)
|
||||
prtstat_DEPENDENCIES =
|
||||
|
||||
Reference in New Issue
Block a user