From: Marcel Lorenz <marcel.lorenz@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 1/2] pkg-config: update lfs to build in toolchain
Date: Thu, 02 Jun 2016 19:39:50 +0200 [thread overview]
Message-ID: <1464889191-18295-1-git-send-email-marcel.lorenz@ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1311 bytes --]
This is needed by ncureses 6.0
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
---
lfs/pkg-config | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/lfs/pkg-config b/lfs/pkg-config
index 3da8556..cd07978 100644
--- a/lfs/pkg-config
+++ b/lfs/pkg-config
@@ -32,6 +32,16 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
+# Normal build or /tools build.
+#
+ifeq "$(ROOT)" ""
+ TARGET = $(DIR_INFO)/$(THISAPP)
+ PREFIX = /usr
+else
+ TARGET = $(DIR_INFO)/$(THISAPP)-tools
+ PREFIX = /tools
+endif
+
###############################################################################
# Top-level Rules
###############################################################################
@@ -70,7 +80,11 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr --with-internal-glib
+ifeq "$(ROOT)" ""
+else
+ mkdir /tools/lib/pkgconfig
+endif
+ cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --with-internal-glib
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
--
1.9.1
next reply other threads:[~2016-06-02 17:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-02 17:39 Marcel Lorenz [this message]
2016-06-02 17:39 ` [PATCH 2/2] ncurses: update to 6.0 and rename 5.9 to ncurses-compat v3 Marcel Lorenz
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=1464889191-18295-1-git-send-email-marcel.lorenz@ipfire.org \
--to=marcel.lorenz@ipfire.org \
--cc=development@lists.ipfire.org \
/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