Skip to content

Commit

Permalink
readline: Update to 8.0 and various fixes
Browse files Browse the repository at this point in the history
Update (lib)readline to 8.0
Remove autoreconf
Remove blankspace at the end of the lines in description
Remove --enable-shared and --enable-static as they're enabled by default
Remove TARGET_CPPFLAGS
Simplify install sections
Install readline.pc (pkgconfig)
Add patch for linking (lib)ncurses

Source:
https://git.buildroot.net/buildroot/plain/package/readline/0000-curses-link.patch

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
  • Loading branch information
diizzyy authored and jow- committed Jan 22, 2019
1 parent 4da73af commit 166b335
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 32 deletions.
35 changes: 14 additions & 21 deletions package/libs/readline/Makefile
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -8,19 +8,18 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk


PKG_NAME:=readline PKG_NAME:=readline
PKG_VERSION:=7.0 PKG_VERSION:=8.0
PKG_RELEASE:=1 PKG_RELEASE:=1


PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@GNU/readline PKG_SOURCE_URL:=@GNU/readline
PKG_HASH:=750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334 PKG_HASH:=e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461


PKG_LICENSE:=GPL-3.0 PKG_LICENSE:=GPL-3.0
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
PKG_CPE_ID:=cpe:/a:gnu:readline PKG_CPE_ID:=cpe:/a:gnu:readline


PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1 PKG_INSTALL:=1


include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
Expand All @@ -30,45 +29,39 @@ define Package/libreadline
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=Command lines edition library TITLE:=Command lines edition library
DEPENDS:=+libncursesw
URL:=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html URL:=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
ABI_VERSION:=7 ABI_VERSION:=8
endef endef


define Package/libreadline/description define Package/libreadline/description
The Readline library provides a set of functions for use by applications 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 that allow users to edit command lines as they are typed in. Both Emacs
and vi editing modes are available. The Readline library includes and vi editing modes are available. The Readline library includes
additional functions to maintain a list of previously-entered command additional functions to maintain a list of previously-entered command
lines, to recall and perhaps reedit those lines, and perform csh-like lines, to recall and perhaps reedit those lines, and perform csh-like
history expansion on previous commands. history expansion on previous commands.
endef endef


# prevent "autoreconf" from removing "aclocal.m4" CONFIGURE_ARGS += --with-curses --disable-install-examples
PKG_REMOVE_FILES:=

CONFIGURE_ARGS += \
--enable-shared \
--enable-static \
--with-curses \


CONFIGURE_VARS += \ CONFIGURE_VARS += \
bash_cv_wcwidth_broken=no \ bash_cv_wcwidth_broken=no \
bash_cv_func_sigsetjmp=yes \ bash_cv_func_sigsetjmp=yes \


TARGET_CPPFLAGS:=-I. -I.. $(TARGET_CPPFLAGS)

TARGET_CFLAGS += $(FPIC) TARGET_CFLAGS += $(FPIC)


define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include $(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/readline $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/include/readline $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{history,readline}.{a,so,so.7,so.7.0} $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{history,readline}.{a,so*} $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/readline.pc $(1)/usr/lib/pkgconfig/
endef endef


define Package/libreadline/install define Package/libreadline/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{history,readline}.{so,so.7,so.7.0} $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{history,readline}.so.* $(1)/usr/lib/
endef endef


$(eval $(call HostBuild)) $(eval $(call HostBuild))
Expand Down
16 changes: 16 additions & 0 deletions package/libs/readline/patches/001-curses-link.patch
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,16 @@
link readline directly to ncurses since it needs symbols from it

upstream readline does this on purpose (no direct linking), but
it doesn't make much sense in a Linux world

--- a/support/shobj-conf
+++ b/support/shobj-conf
@@ -42,7 +42,7 @@ SHOBJ_XLDFLAGS=
SHOBJ_LIBS=

SHLIB_XLDFLAGS=
-SHLIB_LIBS=
+SHLIB_LIBS=-lncurses

SHLIB_DOT='.'
SHLIB_LIBPREF='lib'
11 changes: 0 additions & 11 deletions package/libs/readline/patches/001-install_perm.patch

This file was deleted.

0 comments on commit 166b335

Please sign in to comment.