NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use DISTCC_BUILDDIR instead of DISTCC_DIR as that environment variable is

Browse Source 
used by distcc itself, causing havoc if you compile buildroot under distcc.
This commit is contained in:
Peter Korsgaard 2007-08-29 15:43:59 +00:00
parent 1ff5f164f0
commit 935c1df694
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
package/distcc/distcc.mk
View File

@ -7,7 +7,7 @@ DISTCC_VERSION:=2.18.3
DISTCC_SOURCE:=distcc-$(DISTCC_VERSION).tar.bz2
DISTCC_CAT:=$(BZCAT)
DISTCC_SITE:=http://distcc.samba.org/ftp/distcc/
DISTCC_DIR:=$(BUILD_DIR)/distcc-$(DISTCC_VERSION)
DISTCC_BUILDDIR:=$(BUILD_DIR)/distcc-$(DISTCC_VERSION)
DISTCC_BINARY:=distcc
DISTCC_TARGET_BINARY:=usr/bin/distcc
@ -16,13 +16,13 @@ $(DL_DIR)/$(DISTCC_SOURCE):
distcc-source: $(DL_DIR)/$(CVS_SOURCE)
$(DISTCC_DIR)/.unpacked: $(DL_DIR)/$(DISTCC_SOURCE)
$(DISTCC_BUILDDIR)/.unpacked: $(DL_DIR)/$(DISTCC_SOURCE)
$(DISTCC_CAT) $(DL_DIR)/$(DISTCC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
$(CONFIG_UPDATE) $(DISTCC_DIR)
touch $(DISTCC_DIR)/.unpacked
$(CONFIG_UPDATE) $(DISTCC_BUILDDIR)
touch $(DISTCC_BUILDDIR)/.unpacked
$(DISTCC_DIR)/.configured: $(DISTCC_DIR)/.unpacked
(cd $(DISTCC_DIR); rm -rf config.cache; \
$(DISTCC_BUILDDIR)/.configured: $(DISTCC_BUILDDIR)/.unpacked
(cd $(DISTCC_BUILDDIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
./configure \
@ -43,24 +43,24 @@ $(DISTCC_DIR)/.configured: $(DISTCC_DIR)/.unpacked
--without-gtk \
--without-gnome \
)
touch $(DISTCC_DIR)/.configured
touch $(DISTCC_BUILDDIR)/.configured
$(DISTCC_DIR)/$(DISTCC_BINARY): $(DISTCC_DIR)/.configured
$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(DISTCC_DIR)
$(DISTCC_BUILDDIR)/$(DISTCC_BINARY): $(DISTCC_BUILDDIR)/.configured
$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(DISTCC_BUILDDIR)
$(TARGET_DIR)/$(DISTCC_TARGET_BINARY): $(DISTCC_DIR)/$(DISTCC_BINARY)
install -D $(DISTCC_DIR)/$(DISTCC_BINARY)d $(TARGET_DIR)/$(DISTCC_TARGET_BINARY)d
install -D $(DISTCC_DIR)/$(DISTCC_BINARY) $(TARGET_DIR)/$(DISTCC_TARGET_BINARY)
$(TARGET_DIR)/$(DISTCC_TARGET_BINARY): $(DISTCC_BUILDDIR)/$(DISTCC_BINARY)
install -D $(DISTCC_BUILDDIR)/$(DISTCC_BINARY)d $(TARGET_DIR)/$(DISTCC_TARGET_BINARY)d
install -D $(DISTCC_BUILDDIR)/$(DISTCC_BINARY) $(TARGET_DIR)/$(DISTCC_TARGET_BINARY)
distcc: uclibc $(TARGET_DIR)/$(DISTCC_TARGET_BINARY)
distcc-clean:
rm -f $(TARGET_DIR)/$(DISTCC_TARGET_BINARY)
rm -f $(TARGET_DIR)/$(DISTCC_TARGET_BINARY)d
-$(MAKE) -C $(DISTCC_DIR) clean
-$(MAKE) -C $(DISTCC_BUILDDIR) clean
distcc-dirclean:
rm -rf $(DISTCC_DIR)
rm -rf $(DISTCC_BUILDDIR)
#############################################################
#
# Toplevel Makefile options