Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: aldot at uclibc.org <aldot@uclibc.org>
To: buildroot@busybox.net
Subject: [Buildroot] svn commit: trunk/buildroot/package/fakeroot
Date: Fri, 15 Dec 2006 06:18:30 -0800 (PST)	[thread overview]
Message-ID: <20061215141830.C8DF54856B@busybox.net> (raw)

Author: aldot
Date: 2006-12-15 06:18:30 -0800 (Fri, 15 Dec 2006)
New Revision: 16944

Log:
- use one (patched) sourcedir and build the -host and -target fakeroute in their
  own dirs. Thanks to Ulrich Hecht.


Modified:
   trunk/buildroot/package/fakeroot/fakeroot.mk


Changeset:
Modified: trunk/buildroot/package/fakeroot/fakeroot.mk
===================================================================
--- trunk/buildroot/package/fakeroot/fakeroot.mk	2006-12-15 14:05:51 UTC (rev 16943)
+++ trunk/buildroot/package/fakeroot/fakeroot.mk	2006-12-15 14:18:30 UTC (rev 16944)
@@ -7,8 +7,9 @@
 FAKEROOT_SOURCE:=fakeroot_$(FAKEROOT_VERSION).tar.gz
 FAKEROOT_SITE:=http://ftp.debian.org/debian/pool/main/f/fakeroot
 FAKEROOT_CAT:=$(ZCAT)
-FAKEROOT_DIR1:=$(TOOL_BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION)
-FAKEROOT_DIR2:=$(BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION)
+FAKEROOT_SOURCE_DIR:=$(BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION)
+FAKEROOT_DIR1:=$(TOOL_BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION)-host
+FAKEROOT_DIR2:=$(BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION)-target
 
 
 $(DL_DIR)/$(FAKEROOT_SOURCE):
@@ -16,23 +17,26 @@
 
 fakeroot-source: $(DL_DIR)/$(FAKEROOT_SOURCE)
 
+$(FAKEROOT_SOURCE_DIR)/.unpacked: $(DL_DIR)/$(FAKEROOT_SOURCE)
+	$(FAKEROOT_CAT) $(DL_DIR)/$(FAKEROOT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	# If using busybox getopt, make it be quiet.
+	$(SED) "s,getopt --version,getopt --version 2>/dev/null," \
+		$(FAKEROOT_SOURCE_DIR)/scripts/fakeroot.in
+	toolchain/patch-kernel.sh $(FAKEROOT_SOURCE_DIR) package/fakeroot/ \*.patch
+	touch $(FAKEROOT_SOURCE_DIR)/.unpacked
 
+
 #############################################################
 #
 # build fakeroot for use on the host system
 #
 #############################################################
-$(FAKEROOT_DIR1)/.unpacked: $(DL_DIR)/$(FAKEROOT_SOURCE)
-	$(FAKEROOT_CAT) $(DL_DIR)/$(FAKEROOT_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
-	$(SED) "s,getopt --version,getopt --version 2>/dev/null," \
-		$(FAKEROOT_DIR1)/scripts/fakeroot.in
-	toolchain/patch-kernel.sh $(FAKEROOT_DIR1) package/fakeroot/ \*.patch
-	touch $(FAKEROOT_DIR1)/.unpacked
 
-$(FAKEROOT_DIR1)/.configured: $(FAKEROOT_DIR1)/.unpacked
+$(FAKEROOT_DIR1)/.configured: $(FAKEROOT_SOURCE_DIR)/.unpacked
+	mkdir -p $(FAKEROOT_DIR1)
 	(cd $(FAKEROOT_DIR1); rm -rf config.cache; \
 		CC="$(HOSTCC)" \
-		./configure \
+		$(FAKEROOT_SOURCE_DIR)/configure \
 		--prefix=/usr \
 		$(DISABLE_NLS) \
 	);
@@ -61,17 +65,12 @@
 # build fakeroot for use on the target system
 #
 #############################################################
-$(FAKEROOT_DIR2)/.unpacked: $(DL_DIR)/$(FAKEROOT_SOURCE)
-	$(FAKEROOT_CAT) $(DL_DIR)/$(FAKEROOT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	# If using busybox getopt, make it be quiet.
-	$(SED) "s,getopt --version,getopt --version 2>/dev/null," \
-		$(FAKEROOT_DIR2)/scripts/fakeroot.in
-	touch $(FAKEROOT_DIR2)/.unpacked
 
-$(FAKEROOT_DIR2)/.configured: $(FAKEROOT_DIR2)/.unpacked
+$(FAKEROOT_DIR2)/.configured: $(FAKEROOT_SOURCE_DIR)/.unpacked
+	mkdir -p $(FAKEROOT_DIR2)
 	(cd $(FAKEROOT_DIR2); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
-		./configure \
+		$(FAKEROOT_SOURCE_DIR)/configure \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
@@ -103,6 +102,7 @@
 
 fakeroot-clean:
 	$(MAKE) -C $(FAKEROOT_DIR2) clean
+	rm -f $(TARGET_DIR)/usr/bin/fake{d,root}
 
 fakeroot-dirclean:
 	rm -rf $(FAKEROOT_DIR2)

             reply	other threads:[~2006-12-15 14:18 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-12-15 14:18 aldot at uclibc.org [this message]
  -- strict thread matches above, loose matches on Subject: below --
2007-01-22 18:16 [Buildroot] svn commit: trunk/buildroot/package/fakeroot andersen at uclibc.org
2007-01-22 20:26 aldot at uclibc.org
2007-03-05 11:06 jacmet at uclibc.org
2007-04-03 15:36 jacmet at uclibc.org
2007-04-03 18:09 ` Benedict, Michael
2007-06-06 18:10 aldot at uclibc.org
2007-08-13  8:12 ulf at uclibc.org
2007-09-20 17:41 aldot at uclibc.org
2007-09-20 17:47 aldot at uclibc.org
2007-09-21 14:22 aldot at uclibc.org
2007-10-02 11:06 aldot at uclibc.org
2007-10-13 23:13 ulf at uclibc.org
2007-10-18 21:49 vanokuten at uclibc.org
2007-12-27 11:23 thomasez at uclibc.org
2008-01-21 11:07 thomasez at uclibc.org
2008-03-11 13:11 ninevoltz at uclibc.org
2008-03-11 13:17 ` Nigel Kukard
2008-03-11 13:30 ` Sunil Gupta
2008-03-11 13:32 ninevoltz at uclibc.org
2008-03-11 13:45 ` Sunil Gupta
2008-03-11 19:31 jacmet at uclibc.org
2008-03-12 13:58 ninevoltz at uclibc.org
2008-03-13  7:38 jacmet at uclibc.org
2008-09-07 14:31 jacmet at uclibc.org
2008-12-01  9:08 jacmet 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=20061215141830.C8DF54856B@busybox.net \
    --to=aldot@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