| Message ID | 20180107175626.19944-1-bernd.kuhls@t-online.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/x11r7/xlib_libXpm: disable gettext detection when not needed | expand |
Hello, On Sun, 7 Jan 2018 18:56:26 +0100, Bernd Kuhls wrote: > Patch originates from FreeBSD: > https://lists.freebsd.org/pipermail/freebsd-x11/2015-July/016528.html > https://svnweb.freebsd.org/ports/head/x11/libXpm/Makefile?r1=384234&r2=391122&pathrev=391122 > > Fixes > http://autobuild.buildroot.net/results/f24/f24dc74c111690f068833ff6fc72df9a0853d210/ > > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Not the nicest fix, but it is much simpler than fixing the gettext integration in xlib_libXpm, so: applied. Thanks! Thomas
>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes: > Patch originates from FreeBSD: > https://lists.freebsd.org/pipermail/freebsd-x11/2015-July/016528.html > https://svnweb.freebsd.org/ports/head/x11/libXpm/Makefile?r1=384234&r2=391122&pathrev=391122 > Fixes > http://autobuild.buildroot.net/results/f24/f24dc74c111690f068833ff6fc72df9a0853d210/ > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Committed to 2017.11.x, thanks.
diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk index e781a8b518..09f897ea09 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -16,4 +16,8 @@ XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ $(TARGET_NLS_DEPENDENCIES) +ifeq ($(BR2_SYSTEM_ENABLE_NLS),) +XLIB_LIBXPM_CONF_ENV = ac_cv_search_gettext=no +endif + $(eval $(autotools-package))
Patch originates from FreeBSD: https://lists.freebsd.org/pipermail/freebsd-x11/2015-July/016528.html https://svnweb.freebsd.org/ports/head/x11/libXpm/Makefile?r1=384234&r2=391122&pathrev=391122 Fixes http://autobuild.buildroot.net/results/f24/f24dc74c111690f068833ff6fc72df9a0853d210/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- package/x11r7/xlib_libXpm/xlib_libXpm.mk | 4 ++++ 1 file changed, 4 insertions(+)