From: Remy Bohmer <linux@bohmer.net>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH 6/9 v2] [x86_64, multilib] Install Ncurses libraries at the right place
Date: Mon, 19 Mar 2012 22:14:49 +0100 [thread overview]
Message-ID: <1332191692-20833-6-git-send-email-linux@bohmer.net> (raw)
In-Reply-To: <1332191692-20833-1-git-send-email-linux@bohmer.net>
Signed-off-by: Remy Bohmer <linux@bohmer.net>
---
v2: no changes since v1
rules/ncurses.make | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/rules/ncurses.make b/rules/ncurses.make
index 19247bd..bf25512 100644
--- a/rules/ncurses.make
+++ b/rules/ncurses.make
@@ -37,7 +37,7 @@ NCURSES_AUTOCONF_SHARED := \
--disable-nls \
--enable-const \
--enable-overwrite \
- --libdir=/lib \
+ --libdir=/$(CROSS_LIB_DIR) \
--with-debug \
--with-normal \
--with-shared \
@@ -115,9 +115,9 @@ ifdef PTXCONF_NCURSES_WIDE_CHAR
# For this, the links at runtime are required
#
for lib in $(NCURSES_LIBRARY_LIST); do \
- echo "INPUT(-l$${lib}w)" > $(NCURSES_PKGDIR)/lib/lib$${lib}.so ; \
+ echo "INPUT(-l$${lib}w)" > $(NCURSES_PKGDIR)/$(CROSS_LIB_DIR)/lib$${lib}.so ; \
done
- ln -sf libncurses++w.a $(NCURSES_PKGDIR)/lib/libncurses++.a
+ ln -sf libncurses++w.a $(NCURSES_PKGDIR)/$(CROSS_LIB_DIR)/libncurses++.a
ln -sf -- "ncursesw$(NCURSES_MAJOR)-config" \
"$(NCURSES_PKGDIR)/usr/bin/ncurses$(NCURSES_MAJOR)-config"
@@ -147,22 +147,22 @@ $(STATEDIR)/ncurses.targetinstall:
ifdef PTXCONF_NCURSES_BACKWARD_COMPATIBLE_NON_WIDE_CHAR
@$(call install_link, ncurses, libncursesw.so.$(NCURSES_VERSION), \
- /lib/libncurses.so.$(NCURSES_VERSION))
+ /$(CROSS_LIB_DIR)/libncurses.so.$(NCURSES_VERSION))
@$(call install_link, ncurses, libncursesw.so.$(NCURSES_VERSION), \
- /lib/libncurses.so.$(NCURSES_MAJOR))
+ /$(CROSS_LIB_DIR)/libncurses.so.$(NCURSES_MAJOR))
@$(call install_link, ncurses, libncursesw.so.$(NCURSES_VERSION), \
- /lib/libncurses.so)
+ /$(CROSS_LIB_DIR)/libncurses.so)
endif
ifdef PTXCONF_NCURSES_FORM
@$(call install_lib, ncurses, 0, 0, 0644, libform$(NCURSES_WIDE))
ifdef PTXCONF_NCURSES_BACKWARD_COMPATIBLE_NON_WIDE_CHAR
@$(call install_link, ncurses, libformw.so.$(NCURSES_VERSION), \
- /lib/libform.so.$(NCURSES_VERSION))
+ /$(CROSS_LIB_DIR)/libform.so.$(NCURSES_VERSION))
@$(call install_link, ncurses, libformw.so.$(NCURSES_VERSION), \
- /lib/libform.so.$(NCURSES_MAJOR))
+ /$(CROSS_LIB_DIR)/libform.so.$(NCURSES_MAJOR))
@$(call install_link, ncurses, libformw.so.$(NCURSES_VERSION), \
- /lib/libform.so)
+ /$(CROSS_LIB_DIR)/libform.so)
endif
endif
@@ -171,11 +171,11 @@ ifdef PTXCONF_NCURSES_MENU
@$(call install_lib, ncurses, 0, 0, 0644, libmenu$(NCURSES_WIDE))
ifdef PTXCONF_NCURSES_BACKWARD_COMPATIBLE_NON_WIDE_CHAR
@$(call install_link, ncurses, libmenuw.so.$(NCURSES_VERSION), \
- /lib/libmenu.so.$(NCURSES_VERSION))
+ /$(CROSS_LIB_DIR)/libmenu.so.$(NCURSES_VERSION))
@$(call install_link, ncurses, libmenuw.so.$(NCURSES_VERSION), \
- /lib/libmenu.so.$(NCURSES_MAJOR))
+ /$(CROSS_LIB_DIR)/libmenu.so.$(NCURSES_MAJOR))
@$(call install_link, ncurses, libmenuw.so.$(NCURSES_VERSION), \
- /lib/libmenu.so)
+ /$(CROSS_LIB_DIR)/libmenu.so)
endif
endif
@@ -184,11 +184,11 @@ ifdef PTXCONF_NCURSES_PANEL
@$(call install_lib, ncurses, 0, 0, 0644, libpanel$(NCURSES_WIDE))
ifdef PTXCONF_NCURSES_BACKWARD_COMPATIBLE_NON_WIDE_CHAR
@$(call install_link, ncurses, libpanelw.so.$(NCURSES_VERSION), \
- /lib/libpanel.so.$(NCURSES_VERSION))
+ /$(CROSS_LIB_DIR)/libpanel.so.$(NCURSES_VERSION))
@$(call install_link, ncurses, libpanelw.so.$(NCURSES_VERSION), \
- /lib/libpanel.so.$(NCURSES_MAJOR))
+ /$(CROSS_LIB_DIR)/libpanel.so.$(NCURSES_MAJOR))
@$(call install_link, ncurses, libpanelw.so.$(NCURSES_VERSION), \
- /lib/libpanel.so)
+ /$(CROSS_LIB_DIR)/libpanel.so)
endif
endif
--
1.7.5.4
--
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2012-03-19 21:15 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-19 21:14 [ptxdist] [PATCH 1/9 v2] [x86_64] Add x86_64 architecture strings Remy Bohmer
2012-03-19 21:14 ` [ptxdist] [PATCH 2/9 v2] [x86_64] libgcc need to be install in /lib64 instead of /lib Remy Bohmer
2012-03-19 21:14 ` [ptxdist] [PATCH 3/9 v2] [x86_64, multilib] Remove all hardcoded paths from glibc.make Remy Bohmer
2012-03-23 7:42 ` Michael Olbrich
2012-03-24 18:24 ` Remy Bohmer
2012-03-25 11:29 ` Michael Olbrich
2012-03-19 21:14 ` [ptxdist] [PATCH 4/9 v2] [x86_64, multilib] Make packages install their libraries at the right place Remy Bohmer
2012-03-24 11:04 ` Michael Olbrich
2012-03-24 11:06 ` Michael Olbrich
2012-03-19 21:14 ` [ptxdist] [PATCH 5/9 v2] [x86_64, multilib] Install Zlib " Remy Bohmer
2012-03-19 21:14 ` Remy Bohmer [this message]
2012-03-19 21:14 ` [ptxdist] [PATCH 7/9 v2] [x86_64, multilib] Install Util-linux-ng " Remy Bohmer
2012-03-19 21:14 ` [ptxdist] [PATCH 8/9 v2] [x86_64, multilib] Install Readline " Remy Bohmer
2012-03-19 21:14 ` [ptxdist] [PATCH 9/9 v2] [x86_64, multilib] Install Procps " Remy Bohmer
2012-03-23 7:53 ` [ptxdist] [PATCH 1/9 v2] [x86_64] Add x86_64 architecture strings Michael Olbrich
2012-03-24 18:29 ` Remy Bohmer
2012-03-26 8:50 ` Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1332191692-20833-6-git-send-email-linux@bohmer.net \
--to=linux@bohmer.net \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox