diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2014-12-14 17:04:39 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-12-15 22:14:50 +0100 |
| commit | 19569281dd7e1482908b5bfb6e0d928bdf246008 (patch) | |
| tree | 001e090cb69136c8f31a6ddd32a8f0028c3bde7c /package/ncurses | |
| parent | 43fa88ae90f7c8684456ff931dc0e57efbb5e3f4 (diff) | |
| download | buildroot-19569281dd7e1482908b5bfb6e0d928bdf246008.tar.gz buildroot-19569281dd7e1482908b5bfb6e0d928bdf246008.zip | |
package/ncurses: trim leading 'lib' from definition of libs to install
Currently, ncurses creates symlinks from the non-'w' variants to the
equivalent 'w' variant, but forgets to do so for pkg-config files.
To be able to share the same list between the libraries and the
pkg-config files to symlink, just trim the 'lib' prefix of libraries in
the definition, and just add it back at the time we need it.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/ncurses')
| -rw-r--r-- | package/ncurses/ncurses.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index b870aa4972..9b660fdf7a 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -43,17 +43,17 @@ else ifeq ($(BR2_SHARED_STATIC_LIBS),y) NCURSES_CONF_OPTS += --with-shared --with-normal endif -NCURSES_LIBS-y = libncurses -NCURSES_LIBS-$(BR2_PACKAGE_NCURSES_TARGET_MENU) += libmenu -NCURSES_LIBS-$(BR2_PACKAGE_NCURSES_TARGET_PANEL) += libpanel -NCURSES_LIBS-$(BR2_PACKAGE_NCURSES_TARGET_FORM) += libform +NCURSES_LIBS-y = ncurses +NCURSES_LIBS-$(BR2_PACKAGE_NCURSES_TARGET_MENU) += menu +NCURSES_LIBS-$(BR2_PACKAGE_NCURSES_TARGET_PANEL) += panel +NCURSES_LIBS-$(BR2_PACKAGE_NCURSES_TARGET_FORM) += form ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) NCURSES_CONF_OPTS += --enable-widec NCURSES_LIB_SUFFIX = w define NCURSES_LINK_LIBS_STATIC - for lib in $(NCURSES_LIBS-y); do \ + for lib in $(NCURSES_LIBS-y:%=lib%); do \ ln -sf $${lib}$(NCURSES_LIB_SUFFIX).a \ $(1)/usr/lib/$${lib}.a; \ done @@ -62,7 +62,7 @@ define NCURSES_LINK_LIBS_STATIC endef define NCURSES_LINK_LIBS_SHARED - for lib in $(NCURSES_LIBS-y); do \ + for lib in $(NCURSES_LIBS-y:%=lib%); do \ ln -sf $${lib}$(NCURSES_LIB_SUFFIX).so \ $(1)/usr/lib/$${lib}.so; \ done @@ -95,7 +95,7 @@ endef ifneq ($(BR2_STATIC_LIBS),y) define NCURSES_INSTALL_TARGET_LIBS - for lib in $(NCURSES_LIBS-y); do \ + for lib in $(NCURSES_LIBS-y:%=lib%); do \ cp -dpf $(NCURSES_DIR)/lib/$${lib}$(NCURSES_LIB_SUFFIX).so* \ $(TARGET_DIR)/usr/lib/; \ done |
