aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2016-05-30 15:05:03 +0200
committerJo-Philipp Wich <jo@mein.io>2016-05-31 15:18:27 +0200
commit927ab9a2623f4e8e414d77bb2744b0c192e62238 (patch)
tree4588570819806337fc29f34e674210f3568fb7b5
parent1205e9a78111c99cbf6e92c401d7071ba18cf498 (diff)
downloadupstream-927ab9a2623f4e8e414d77bb2744b0c192e62238.tar.gz
upstream-927ab9a2623f4e8e414d77bb2744b0c192e62238.tar.bz2
upstream-927ab9a2623f4e8e414d77bb2744b0c192e62238.zip
gettext-full: prevent using emacs
When the gettext-full host build phase finds an `emacs` exectuble during the build it will launch an `emacs --batch` command to run some Lisp code. On certain Debian systems the `/usr/bin/emacs` path might point, via alternatives, to the `/usr/bin/jove` editor which will then launch an interactive session when invoked by the gettext build. In order to avoid this problem, explicitely disable emacs handling during the build through a configure environment variable. Also remove my now unreachable maintainer address. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
-rw-r--r--package/libs/gettext-full/Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/package/libs/gettext-full/Makefile b/package/libs/gettext-full/Makefile
index e525d3002c..abe311fe69 100644
--- a/package/libs/gettext-full/Makefile
+++ b/package/libs/gettext-full/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gettext-full
PKG_VERSION:=0.19.6
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_SOURCE:=gettext-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNU/gettext
@@ -17,7 +17,7 @@ PKG_MD5SUM:=69d79254ee3b41df23f41c2f4fd720d9
PKG_BUILD_DIR:=$(BUILD_DIR)/gettext-$(PKG_VERSION)
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/gettext-$(PKG_VERSION)
-PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
PKG_LICENSE:=GPL-3.0+
PKG_FIXUP:=autoreconf
@@ -60,6 +60,9 @@ CONFIGURE_ARGS += \
HOST_CONFIGURE_ARGS += \
--with-included-libxml --without-libxml2-prefix --with-included-libcroco
+HOST_CONFIGURE_VARS += \
+ EMACS="no"
+
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/lib/libintl-full/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/libintl.h $(1)/usr/lib/libintl-full/include/