From 04063820e85831e4f623faf395323e3e48b18b7d Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 24 Jun 2017 13:58:56 +0200 Subject: libreadline: add host-build Also make sure that the PKG_NAME and folder name are equal. Signed-off-by: Daniel Golle --- package/libs/libreadline/Makefile | 72 --------------------- .../libreadline/patches/001-install_perm.patch | 11 ---- package/libs/readline/Makefile | 74 ++++++++++++++++++++++ .../libs/readline/patches/001-install_perm.patch | 11 ++++ 4 files changed, 85 insertions(+), 83 deletions(-) delete mode 100644 package/libs/libreadline/Makefile delete mode 100644 package/libs/libreadline/patches/001-install_perm.patch create mode 100644 package/libs/readline/Makefile create mode 100644 package/libs/readline/patches/001-install_perm.patch diff --git a/package/libs/libreadline/Makefile b/package/libs/libreadline/Makefile deleted file mode 100644 index 3c1b048fe8..0000000000 --- a/package/libs/libreadline/Makefile +++ /dev/null @@ -1,72 +0,0 @@ -# -# Copyright (C) 2006-2014 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=readline -PKG_VERSION:=7.0 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@GNU/readline -PKG_HASH:=750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334 - -PKG_LICENSE:=GPL-3.0 -PKG_LICENSE_FILES:=COPYING - -PKG_BUILD_PARALLEL:=1 -PKG_FIXUP:=autoreconf -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/libreadline - SECTION:=libs - CATEGORY:=Libraries - TITLE:=Command lines edition library - URL:=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html - ABI_VERSION:=$(PKG_VERSION) -endef - -define Package/libreadline/description - The Readline library provides a set of functions for use by applications - that allow users to edit command lines as they are typed in. Both Emacs - and vi editing modes are available. The Readline library includes - additional functions to maintain a list of previously-entered command - lines, to recall and perhaps reedit those lines, and perform csh-like - history expansion on previous commands. -endef - -# prevent "autoreconf" from removing "aclocal.m4" -PKG_REMOVE_FILES:= - -CONFIGURE_ARGS += \ - --enable-shared \ - --enable-static \ - --with-curses \ - -CONFIGURE_VARS += \ - bash_cv_wcwidth_broken=no \ - bash_cv_func_sigsetjmp=yes \ - -TARGET_CPPFLAGS:=-I. -I.. $(TARGET_CPPFLAGS) - -TARGET_CFLAGS += $(FPIC) - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/readline $(1)/usr/include/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{history,readline}.{a,so,so.7,so.7.0} $(1)/usr/lib/ -endef - -define Package/libreadline/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{history,readline}.{so,so.7,so.7.0} $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libreadline)) diff --git a/package/libs/libreadline/patches/001-install_perm.patch b/package/libs/libreadline/patches/001-install_perm.patch deleted file mode 100644 index 951ff73e5b..0000000000 --- a/package/libs/libreadline/patches/001-install_perm.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/support/shlib-install -+++ b/support/shlib-install -@@ -73,7 +73,7 @@ fi - case "$host_os" in - hpux*|darwin*|macosx*|linux*|solaris2*) - if [ -z "$uninstall" ]; then -- chmod 555 ${INSTALLDIR}/${LIBNAME} -+ chmod +x ${INSTALLDIR}/${LIBNAME} - fi ;; - cygwin*|mingw*) - IMPLIBNAME=`echo ${LIBNAME} \ diff --git a/package/libs/readline/Makefile b/package/libs/readline/Makefile new file mode 100644 index 0000000000..ccd20a4b18 --- /dev/null +++ b/package/libs/readline/Makefile @@ -0,0 +1,74 @@ +# +# Copyright (C) 2006-2014 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=readline +PKG_VERSION:=7.0 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@GNU/readline +PKG_HASH:=750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334 + +PKG_LICENSE:=GPL-3.0 +PKG_LICENSE_FILES:=COPYING + +PKG_BUILD_PARALLEL:=1 +PKG_FIXUP:=autoreconf +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/host-build.mk + +define Package/libreadline + SECTION:=libs + CATEGORY:=Libraries + TITLE:=Command lines edition library + URL:=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html + ABI_VERSION:=$(PKG_VERSION) +endef + +define Package/libreadline/description + The Readline library provides a set of functions for use by applications + that allow users to edit command lines as they are typed in. Both Emacs + and vi editing modes are available. The Readline library includes + additional functions to maintain a list of previously-entered command + lines, to recall and perhaps reedit those lines, and perform csh-like + history expansion on previous commands. +endef + +# prevent "autoreconf" from removing "aclocal.m4" +PKG_REMOVE_FILES:= + +CONFIGURE_ARGS += \ + --enable-shared \ + --enable-static \ + --with-curses \ + +CONFIGURE_VARS += \ + bash_cv_wcwidth_broken=no \ + bash_cv_func_sigsetjmp=yes \ + +TARGET_CPPFLAGS:=-I. -I.. $(TARGET_CPPFLAGS) + +TARGET_CFLAGS += $(FPIC) + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/readline $(1)/usr/include/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{history,readline}.{a,so,so.7,so.7.0} $(1)/usr/lib/ +endef + +define Package/libreadline/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{history,readline}.{so,so.7,so.7.0} $(1)/usr/lib/ +endef + +$(eval $(call HostBuild)) +$(eval $(call BuildPackage,libreadline)) diff --git a/package/libs/readline/patches/001-install_perm.patch b/package/libs/readline/patches/001-install_perm.patch new file mode 100644 index 0000000000..951ff73e5b --- /dev/null +++ b/package/libs/readline/patches/001-install_perm.patch @@ -0,0 +1,11 @@ +--- a/support/shlib-install ++++ b/support/shlib-install +@@ -73,7 +73,7 @@ fi + case "$host_os" in + hpux*|darwin*|macosx*|linux*|solaris2*) + if [ -z "$uninstall" ]; then +- chmod 555 ${INSTALLDIR}/${LIBNAME} ++ chmod +x ${INSTALLDIR}/${LIBNAME} + fi ;; + cygwin*|mingw*) + IMPLIBNAME=`echo ${LIBNAME} \ -- cgit v1.2.3