From 22bb02b9471737440fce645839ee76e3b5bc3133 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 30 Jan 2019 12:37:32 -0800 Subject: [PATCH] screen: Reorganize Makefile Reorganized the Makefile a bit for consistency between packages. Added PKG_BUILD_PARALLEL for faster compilation. Removed USEMEMMOVE hack as that is no longer used in the codebase. Added PKG_FIXUP as the patches touch configure.ac. Signed-off-by: Rosen Penev --- utils/screen/Makefile | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/utils/screen/Makefile b/utils/screen/Makefile index 8399f19bd..c4244522f 100644 --- a/utils/screen/Makefile +++ b/utils/screen/Makefile @@ -9,14 +9,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=screen PKG_VERSION:=4.6.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_HASH:=1b6922520e6a0ce5e28768d620b0f640a6631397f95ccb043b70b91bb503fa3a PKG_SOURCE_URL:=@GNU/screen +PKG_HASH:=1b6922520e6a0ce5e28768d620b0f640a6631397f95ccb043b70b91bb503fa3a +PKG_MAINTAINER:=Etienne CHAMPETIER PKG_LICENSE:=GPL-3.0+ -PKG_LICENSE_FILES:= +PKG_LICENSE_FILES:=COPYING + +PKG_FIXUP:=autoreconf +PKG_BUILD_PARALLEL:=1 +PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk @@ -26,8 +31,7 @@ define Package/screen SUBMENU:=Terminal DEPENDS:=+libncurses TITLE:=Full-screen terminal window manager - URL:=http://www.gnu.org/software/screen/ - MAINTAINER:=Etienne CHAMPETIER + URL:=https://www.gnu.org/software/screen/ endef define Package/screen/description @@ -35,14 +39,9 @@ define Package/screen/description terminal between several processes, typically interactive shells. endef -define Build/Configure - $(call Build/Configure/Default,\ - --with-sys-screenrc=/etc/screenrc \ - --enable-colors256 \ - ) - # XXX: memmove() works well with overlapped memory areas - echo "#define USEMEMMOVE 1" >>$(PKG_BUILD_DIR)/config.h -endef +CONFIGURE_ARGS += \ + --enable-colors256 \ + --with-sys-screenrc=/etc/screenrc define Package/screen/install $(INSTALL_DIR) $(1)/usr/sbin