From: ulf at uclibc.org <ulf@uclibc.org>
To: buildroot@busybox.net
Subject: [Buildroot] svn commit: trunk/buildroot/package/curl
Date: Wed, 28 Nov 2007 00:57:26 -0800 (PST) [thread overview]
Message-ID: <20071128085726.AB79A3005E@busybox.net> (raw)
Author: ulf
Date: 2007-11-28 00:57:26 -0800 (Wed, 28 Nov 2007)
New Revision: 20561
Log:
Move curl from lib to usr/lib, update curl.la
Modified:
trunk/buildroot/package/curl/curl.mk
Changeset:
Modified: trunk/buildroot/package/curl/curl.mk
===================================================================
--- trunk/buildroot/package/curl/curl.mk 2007-11-28 08:57:00 UTC (rev 20560)
+++ trunk/buildroot/package/curl/curl.mk 2007-11-28 08:57:26 UTC (rev 20561)
@@ -10,6 +10,7 @@
CURL_CAT:=$(BZCAT)
CURL_DIR:=$(BUILD_DIR)/curl-$(CURL_VERSION)
CURL_BINARY:=curl
+CURL_DESTDIR:=$(STAGING_DIR)/usr
$(DL_DIR)/$(CURL_SOURCE):
$(WGET) -P $(DL_DIR) $(CURL_SITE)/$(CURL_SOURCE)
@@ -32,39 +33,50 @@
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
- --prefix=$(STAGING_DIR) \
+ --prefix=/usr \
+ --exec-prefix=/usr \
+ --bindir=/usr/bin \
+ --sbindir=/usr/sbin \
+ --libdir=/usr/lib \
+ --libexecdir=/usr/lib \
+ --sysconfdir=/etc \
+ --datadir=/usr/share \
+ --localstatedir=/var \
+ --includedir=/usr/include \
+ --mandir=/usr/share/man \
+ --infodir=/usr/share/info \
)
touch $(CURL_DIR)/.configured
$(CURL_DIR)/src/.libs/$(CURL_BINARY): $(CURL_DIR)/.configured
$(MAKE) -C $(CURL_DIR)
-$(STAGING_DIR)/bin/$(CURL_BINARY): $(CURL_DIR)/src/.libs/$(CURL_BINARY)
- -mkdir $(STAGING_DIR)/bin
- $(MAKE) prefix=$(STAGING_DIR) -C $(CURL_DIR) install
- -rm -rf $(STAGING_DIR)/man
- touch $(STAGING_DIR)/bin/$(CURL_BINARY)
+$(CURL_DESTDIR)/bin/$(CURL_BINARY): $(CURL_DIR)/src/.libs/$(CURL_BINARY)
+ -mkdir $(CURL_DESTDIR)/bin
+ $(MAKE) DESTDIR=$(STAGING_DIR) -C $(CURL_DIR) install
+ $(SED) "s,^libdir=.*,libdir=\'$(CURL_DESTDIR)/lib\',g" $(CURL_DESTDIR)/lib/libcurl.la
+ touch $(CURL_DESTDIR)/bin/$(CURL_BINARY)
-$(TARGET_DIR)/usr/lib/libcurl.so.$(LIBCURL_VERSION): $(STAGING_DIR)/bin/$(CURL_BINARY)
+$(TARGET_DIR)/usr/lib/libcurl.so.$(LIBCURL_VERSION): $(CURL_DESTDIR)/bin/$(CURL_BINARY)
-mkdir $(TARGET_DIR)/usr/lib
-mkdir $(TARGET_DIR)/usr/bin
- cp -a $(STAGING_DIR)/lib/libcurl.so* $(TARGET_DIR)/usr/lib
+ cp -a $(CURL_DESTDIR)/lib/libcurl.so* $(TARGET_DIR)/usr/lib
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libcurl.so.$(LIBCURL_VERSION)
$(TARGET_DIR)/usr/bin/$(CURL_BINARY): $(TARGET_DIR)/usr/lib/libcurl.so.$(LIBCURL_VERSION)
- cp -a $(STAGING_DIR)/bin/$(CURL_BINARY) $(TARGET_DIR)/usr/bin
+ cp -a $(CURL_DESTDIR)/bin/$(CURL_BINARY) $(TARGET_DIR)/usr/bin
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/$(CURL_BINARY)
curl: uclibc $(TARGET_DIR)/usr/bin/$(CURL_BINARY)
-libcurl: $(STAGING_DIR)/bin/$(CURL_BINARY)
+libcurl: $(CURL_DESTDIR)/bin/$(CURL_BINARY)
curl-clean:
rm -f $(TARGET_DIR)/usr/lib/libcurl.so*
rm -f $(TARGET_DIR)/usr/bin/curl
- rm -f $(STAGING_DIR)/bin/curl*
- rm -f $(STAGING_DIR)/lib/libcurl.so*
- rm -rf $(STAGING_DIR)/usr/include/curl
+ rm -f $(CURL_DESTDIR)/bin/curl*
+ rm -f $(CURL_DESTDIR)/lib/libcurl.so*
+ rm -rf $(CURL_DESTDIR)/include/curl
-$(MAKE) -C $(CURL_DIR) clean
curl-dirclean:
next reply other threads:[~2007-11-28 8:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-28 8:57 ulf at uclibc.org [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-12-28 13:50 [Buildroot] svn commit: trunk/buildroot/package/curl jacmet at uclibc.org
2008-12-28 13:50 jacmet at uclibc.org
2008-07-05 7:44 ulf at uclibc.org
2007-11-27 8:22 ulf at uclibc.org
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=20071128085726.AB79A3005E@busybox.net \
--to=ulf@uclibc.org \
--cc=buildroot@busybox.net \
/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