* [Buildroot] svn commit: trunk/buildroot/toolchain/ccache
@ 2008-10-06 20:28 wberrier at uclibc.org
0 siblings, 0 replies; 15+ messages in thread
From: wberrier at uclibc.org @ 2008-10-06 20:28 UTC (permalink / raw)
To: buildroot
Author: wberrier
Date: 2008-10-06 13:28:46 -0700 (Mon, 06 Oct 2008)
New Revision: 23609
Log:
ccache:
-Don't show custom location dir if ccache isn't selected.
Modified:
trunk/buildroot/toolchain/ccache/Config.in
Changeset:
Modified: trunk/buildroot/toolchain/ccache/Config.in
===================================================================
--- trunk/buildroot/toolchain/ccache/Config.in 2008-10-06 19:54:58 UTC (rev 23608)
+++ trunk/buildroot/toolchain/ccache/Config.in 2008-10-06 20:28:46 UTC (rev 23609)
@@ -14,6 +14,3 @@
help
Where ccache should store cached files.
-comment "ccache dir location? - disabled (requires ccache support)"
- depends on !BR2_CCACHE
-
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/toolchain/ccache
@ 2008-10-06 19:14 wberrier at uclibc.org
2008-10-06 19:52 ` Peter Korsgaard
0 siblings, 1 reply; 15+ messages in thread
From: wberrier at uclibc.org @ 2008-10-06 19:14 UTC (permalink / raw)
To: buildroot
Author: wberrier
Date: 2008-10-06 12:14:41 -0700 (Mon, 06 Oct 2008)
New Revision: 23604
Log:
ccache:
-Allow user to specify custom ccache location.
This allows you to build a toolchain and put it on
an nfs share so other people can use the toolchain
without errors about the ccache dir missing.
Modified:
trunk/buildroot/toolchain/ccache/Config.in
trunk/buildroot/toolchain/ccache/ccache.mk
Changeset:
Modified: trunk/buildroot/toolchain/ccache/Config.in
===================================================================
--- trunk/buildroot/toolchain/ccache/Config.in 2008-10-06 19:09:14 UTC (rev 23603)
+++ trunk/buildroot/toolchain/ccache/Config.in 2008-10-06 19:14:41 UTC (rev 23604)
@@ -7,3 +7,13 @@
help
Enable ccache support?
+config BR2_CCACHE_DIR
+ string "ccache dir location?"
+ depends on BR2_CCACHE
+ default "$(TOOL_BUILD_DIR)/ccache-$(CCACHE_VER)/cache"
+ help
+ Where ccache should store cached files.
+
+comment "ccache dir location? - disabled (requires ccache support)"
+ depends on !BR2_CCACHE
+
Modified: trunk/buildroot/toolchain/ccache/ccache.mk
===================================================================
--- trunk/buildroot/toolchain/ccache/ccache.mk 2008-10-06 19:09:14 UTC (rev 23603)
+++ trunk/buildroot/toolchain/ccache/ccache.mk 2008-10-06 19:14:41 UTC (rev 23604)
@@ -24,8 +24,9 @@
# Should probably patch things to use a relative path.
$(SED) "s,getenv(\"CCACHE_PATH\"),\"$(STAGING_DIR)/usr/bin-ccache\",g" \
$(CCACHE_DIR1)/execute.c
- # WARNING - this will break if the toolchain build dir is deleted.
- $(SED) "s,getenv(\"CCACHE_DIR\"),\"$(CCACHE_DIR1)/cache\",g" \
+ # WARNING - this will break if the toolchain build dir is deleted
+ # when using the default cache dir location.
+ $(SED) "s,getenv(\"CCACHE_DIR\"),\"$(BR2_CCACHE_DIR)\",g" \
$(CCACHE_DIR1)/ccache.c
mkdir -p $(CCACHE_DIR1)/cache
touch $@
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/toolchain/ccache
2008-10-06 19:14 wberrier at uclibc.org
@ 2008-10-06 19:52 ` Peter Korsgaard
2008-10-06 20:29 ` Wade Berrier
0 siblings, 1 reply; 15+ messages in thread
From: Peter Korsgaard @ 2008-10-06 19:52 UTC (permalink / raw)
To: buildroot
>>>>> "wberrier" == wberrier <wberrier@uclibc.org> writes:
wberrier> Author: wberrier
wberrier> Date: 2008-10-06 12:14:41 -0700 (Mon, 06 Oct 2008)
wberrier> New Revision: 23604
wberrier> Log:
wberrier> ccache:
wberrier> -Allow user to specify custom ccache location.
...
wberrier> +config BR2_CCACHE_DIR
wberrier> + string "ccache dir location?"
wberrier> + depends on BR2_CCACHE
wberrier> + default "$(TOOL_BUILD_DIR)/ccache-$(CCACHE_VER)/cache"
wberrier> + help
wberrier> + Where ccache should store cached files.
wberrier> +
wberrier> +comment "ccache dir location? - disabled (requires ccache support)"
wberrier> + depends on !BR2_CCACHE
wberrier> +
Do we really need that comment line? Would anyone go looking for
something like this if they weren't using ccache in the first place?
wberrier> Modified: trunk/buildroot/toolchain/ccache/ccache.mk
wberrier> ===================================================================
wberrier> --- trunk/buildroot/toolchain/ccache/ccache.mk 2008-10-06 19:09:14 UTC (rev 23603)
wberrier> +++ trunk/buildroot/toolchain/ccache/ccache.mk 2008-10-06 19:14:41 UTC (rev 23604)
wberrier> @@ -24,8 +24,9 @@
wberrier> # Should probably patch things to use a relative path.
wberrier> $(SED) "s,getenv(\"CCACHE_PATH\"),\"$(STAGING_DIR)/usr/bin-ccache\",g" \
wberrier> $(CCACHE_DIR1)/execute.c
wberrier> - # WARNING - this will break if the toolchain build dir is deleted.
wberrier> - $(SED) "s,getenv(\"CCACHE_DIR\"),\"$(CCACHE_DIR1)/cache\",g" \
wberrier> + # WARNING - this will break if the toolchain build dir is deleted
wberrier> + # when using the default cache dir location.
wberrier> + $(SED) "s,getenv(\"CCACHE_DIR\"),\"$(BR2_CCACHE_DIR)\",g" \
Why do we even do this in the first place? What's wrong with the user
simply setting CCACHE_DIR like they expect to do for ccache?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/toolchain/ccache
2008-10-06 19:52 ` Peter Korsgaard
@ 2008-10-06 20:29 ` Wade Berrier
0 siblings, 0 replies; 15+ messages in thread
From: Wade Berrier @ 2008-10-06 20:29 UTC (permalink / raw)
To: buildroot
On Mon, Oct 6, 2008 at 1:52 PM, Peter Korsgaard <jacmet@uclibc.org> wrote:
>>>>>> "wberrier" == wberrier <wberrier@uclibc.org> writes:
>
> wberrier> Author: wberrier
> wberrier> Date: 2008-10-06 12:14:41 -0700 (Mon, 06 Oct 2008)
> wberrier> New Revision: 23604
>
> wberrier> Log:
> wberrier> ccache:
> wberrier> -Allow user to specify custom ccache location.
>
>
> ...
>
>
> wberrier> +config BR2_CCACHE_DIR
> wberrier> + string "ccache dir location?"
> wberrier> + depends on BR2_CCACHE
> wberrier> + default "$(TOOL_BUILD_DIR)/ccache-$(CCACHE_VER)/cache"
> wberrier> + help
> wberrier> + Where ccache should store cached files.
> wberrier> +
> wberrier> +comment "ccache dir location? - disabled (requires ccache support)"
> wberrier> + depends on !BR2_CCACHE
> wberrier> +
>
>
> Do we really need that comment line? Would anyone go looking for
> something like this if they weren't using ccache in the first place?
Good point. Fixed.
>
>
> wberrier> Modified: trunk/buildroot/toolchain/ccache/ccache.mk
> wberrier> ===================================================================
> wberrier> --- trunk/buildroot/toolchain/ccache/ccache.mk 2008-10-06 19:09:14 UTC (rev 23603)
> wberrier> +++ trunk/buildroot/toolchain/ccache/ccache.mk 2008-10-06 19:14:41 UTC (rev 23604)
> wberrier> @@ -24,8 +24,9 @@
> wberrier> # Should probably patch things to use a relative path.
> wberrier> $(SED) "s,getenv(\"CCACHE_PATH\"),\"$(STAGING_DIR)/usr/bin-ccache\",g" \
> wberrier> $(CCACHE_DIR1)/execute.c
> wberrier> - # WARNING - this will break if the toolchain build dir is deleted.
> wberrier> - $(SED) "s,getenv(\"CCACHE_DIR\"),\"$(CCACHE_DIR1)/cache\",g" \
> wberrier> + # WARNING - this will break if the toolchain build dir is deleted
> wberrier> + # when using the default cache dir location.
> wberrier> + $(SED) "s,getenv(\"CCACHE_DIR\"),\"$(BR2_CCACHE_DIR)\",g" \
>
>
> Why do we even do this in the first place? What's wrong with the user
> simply setting CCACHE_DIR like they expect to do for ccache?
I'm not sure why it was done originally, but the intent was to make it
configurable without ruffling too many feathers.
Wade
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/toolchain/ccache
@ 2008-08-04 19:08 jacmet at uclibc.org
0 siblings, 0 replies; 15+ messages in thread
From: jacmet at uclibc.org @ 2008-08-04 19:08 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-04 12:08:06 -0700 (Mon, 04 Aug 2008)
New Revision: 23032
Log:
ccache: expand help text
Modified:
trunk/buildroot/toolchain/ccache/Config.in.2
Changeset:
Modified: trunk/buildroot/toolchain/ccache/Config.in.2
===================================================================
--- trunk/buildroot/toolchain/ccache/Config.in.2 2008-08-04 19:08:04 UTC (rev 23031)
+++ trunk/buildroot/toolchain/ccache/Config.in.2 2008-08-04 19:08:06 UTC (rev 23032)
@@ -1,7 +1,12 @@
#
config BR2_PACKAGE_CCACHE_TARGET
- bool "ccache support in the target filesystem"
+ bool "ccache"
help
- ccache support in the target filesystem
+ ccache is a compiler cache. It speeds up recompilation of
+ C/C++ code by caching previous compiles and detecting when
+ the same compile is being done again.
+ http://ccache.samba.org
+
+
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/toolchain/ccache
@ 2008-08-04 19:08 jacmet at uclibc.org
0 siblings, 0 replies; 15+ messages in thread
From: jacmet at uclibc.org @ 2008-08-04 19:08 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-04 12:08:04 -0700 (Mon, 04 Aug 2008)
New Revision: 23031
Log:
ccache: cleanup configure args and respect BR2_HAVE_MANPAGES
Modified:
trunk/buildroot/toolchain/ccache/ccache.mk
Changeset:
Modified: trunk/buildroot/toolchain/ccache/ccache.mk
===================================================================
--- trunk/buildroot/toolchain/ccache/ccache.mk 2008-08-04 19:08:01 UTC (rev 23030)
+++ trunk/buildroot/toolchain/ccache/ccache.mk 2008-08-04 19:08:04 UTC (rev 23031)
@@ -149,15 +149,7 @@
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libexecdir=/usr/lib \
--sysconfdir=/etc \
- --datadir=/usr/share \
- --localstatedir=/var \
- --mandir=/usr/man \
- --infodir=/usr/info \
$(DISABLE_NLS) \
)
touch $@
@@ -167,8 +159,9 @@
$(TARGET_DIR)/$(CCACHE_TARGET_BINARY): $(CCACHE_DIR2)/$(CCACHE_BINARY)
$(MAKE) DESTDIR=$(TARGET_DIR) -C $(CCACHE_DIR2) install
- rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
- $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
+ifneq ($(BR2_HAVE_MANPAGES),y)
+ rm -rf $(TARGET_DIR)/usr/man
+endif
# put a bunch of symlinks into /bin, since that is earlier
# in the default PATH than /usr/bin where gcc lives
(cd $(TARGET_DIR)/bin; \
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/toolchain/ccache
@ 2008-08-04 19:08 jacmet at uclibc.org
0 siblings, 0 replies; 15+ messages in thread
From: jacmet at uclibc.org @ 2008-08-04 19:08 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-04 12:08:01 -0700 (Mon, 04 Aug 2008)
New Revision: 23030
Log:
ccache: also remove target symlinks on clean
Modified:
trunk/buildroot/toolchain/ccache/ccache.mk
Changeset:
Modified: trunk/buildroot/toolchain/ccache/ccache.mk
===================================================================
--- trunk/buildroot/toolchain/ccache/ccache.mk 2008-08-04 19:07:58 UTC (rev 23029)
+++ trunk/buildroot/toolchain/ccache/ccache.mk 2008-08-04 19:08:01 UTC (rev 23030)
@@ -183,7 +183,8 @@
ccache_target-sources: $(DL_DIR)/$(CCACHE_SOURCE)
ccache_target-clean:
- rm -f $(TARGET_DIR)/$(CCACHE_TARGET_BINARY)
+ rm -f $(TARGET_DIR)/$(CCACHE_TARGET_BINARY) \
+ $(addprefix $(TARGET_DIR)/bin/,cc gcc c++ g++)
-$(MAKE) -C $(CCACHE_DIR2) clean
ccache_target-dirclean:
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/toolchain/ccache
@ 2008-08-04 19:07 jacmet at uclibc.org
0 siblings, 0 replies; 15+ messages in thread
From: jacmet at uclibc.org @ 2008-08-04 19:07 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-04 12:07:58 -0700 (Mon, 04 Aug 2008)
New Revision: 23029
Log:
ccache: cleanup config
Modified:
trunk/buildroot/toolchain/ccache/Config.in.2
Changeset:
Modified: trunk/buildroot/toolchain/ccache/Config.in.2
===================================================================
--- trunk/buildroot/toolchain/ccache/Config.in.2 2008-08-04 19:07:51 UTC (rev 23028)
+++ trunk/buildroot/toolchain/ccache/Config.in.2 2008-08-04 19:07:58 UTC (rev 23029)
@@ -1,7 +1,7 @@
#
config BR2_PACKAGE_CCACHE_TARGET
- bool"ccache support in the target filesystem"
+ bool "ccache support in the target filesystem"
help
- Add help text here.
+ ccache support in the target filesystem
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/toolchain/ccache
@ 2007-06-23 13:49 aldot at uclibc.org
0 siblings, 0 replies; 15+ messages in thread
From: aldot at uclibc.org @ 2007-06-23 13:49 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-06-23 06:49:33 -0700 (Sat, 23 Jun 2007)
New Revision: 18900
Log:
- "Keep the actual toolchain binaries in a directory at the same level".
Modified:
trunk/buildroot/toolchain/ccache/ccache.mk
Changeset:
Modified: trunk/buildroot/toolchain/ccache/ccache.mk
===================================================================
--- trunk/buildroot/toolchain/ccache/ccache.mk 2007-06-23 13:43:39 UTC (rev 18899)
+++ trunk/buildroot/toolchain/ccache/ccache.mk 2007-06-23 13:49:33 UTC (rev 18900)
@@ -17,18 +17,18 @@
$(CCACHE_DIR1)/.unpacked: $(DL_DIR)/$(CCACHE_SOURCE)
$(CCACHE_CAT) $(DL_DIR)/$(CCACHE_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
- touch $(CCACHE_DIR1)/.unpacked
+ touch $@
$(CCACHE_DIR1)/.patched: $(CCACHE_DIR1)/.unpacked
# WARNING - this will break if the toolchain is moved.
# Should probably patch things to use a relative path.
- $(SED) "s,getenv(\"CCACHE_PATH\"),\"$(STAGING_DIR)/bin-ccache\",g" \
+ $(SED) "s,getenv(\"CCACHE_PATH\"),\"$(STAGING_DIR)/usr/bin-ccache\",g" \
$(CCACHE_DIR1)/execute.c
# WARNING - this will break if the toolchain build dir is deleted.
$(SED) "s,getenv(\"CCACHE_DIR\"),\"$(CCACHE_DIR1)/cache\",g" \
$(CCACHE_DIR1)/ccache.c
mkdir -p $(CCACHE_DIR1)/cache
- touch $(CCACHE_DIR1)/.patched
+ touch $@
$(CCACHE_DIR1)/.configured: $(CCACHE_DIR1)/.patched
mkdir -p $(CCACHE_DIR1)
@@ -40,7 +40,7 @@
--build=$(GNU_HOST_NAME) \
--prefix=/usr \
);
- touch $(CCACHE_DIR1)/.configured
+ touch $@
$(CCACHE_DIR1)/$(CCACHE_BINARY): $(CCACHE_DIR1)/.configured
$(MAKE) CC="$(HOSTCC)" -C $(CCACHE_DIR1)
@@ -50,13 +50,13 @@
cp $(CCACHE_DIR1)/ccache $(STAGING_DIR)/usr/bin
# Keep the actual toolchain binaries in a directory at the same level.
# Otherwise, relative paths for include dirs break.
- mkdir -p $(STAGING_DIR)/bin-ccache;
- (cd $(STAGING_DIR)/bin-ccache; \
+ mkdir -p $(STAGING_DIR)/usr/bin-ccache;
+ (cd $(STAGING_DIR)/usr/bin-ccache; \
ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-gcc; \
ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-cc; \
ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(REAL_GNU_TARGET_NAME)-cc);
[ -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc ] && \
- mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/bin-ccache/
+ mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/usr/bin-ccache/
(cd $(STAGING_DIR)/usr/bin; \
ln -fs ccache $(GNU_TARGET_NAME)-cc; \
ln -fs ccache $(GNU_TARGET_NAME)-gcc; \
@@ -64,15 +64,15 @@
ln -fs ccache $(REAL_GNU_TARGET_NAME)-gcc);
ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
[ -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++ ] && \
- mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/bin-ccache/
+ mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/usr/bin-ccache/
[ -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++ ] && \
- mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++ $(STAGING_DIR)/bin-ccache/
+ mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++ $(STAGING_DIR)/usr/bin-ccache/
(cd $(STAGING_DIR)/usr/bin; \
ln -fs ccache $(GNU_TARGET_NAME)-c++; \
ln -fs ccache $(GNU_TARGET_NAME)-g++;\
ln -fs ccache $(REAL_GNU_TARGET_NAME)-c++; \
ln -fs ccache $(REAL_GNU_TARGET_NAME)-g++);
- (cd $(STAGING_DIR)/bin-ccache; \
+ (cd $(STAGING_DIR)/usr/bin-ccache; \
ln -fs $(REAL_GNU_TARGET_NAME)-c++ $(GNU_TARGET_NAME)-c++; \
ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-g++);
endif
@@ -84,22 +84,22 @@
rm -rf $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc
rm -rf $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc
rm -rf $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc
- if [ -f $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc ] ; then \
- mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/usr/bin/; \
+ if [ -f $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc ] ; then \
+ mv $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/usr/bin/; \
(cd $(STAGING_DIR)/usr/bin; \
ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(REAL_GNU_TARGET_NAME)-cc; \
ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-cc; \
ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-gcc); \
fi;
- if [ -f $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ ] ; then \
+ if [ -f $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ ] ; then \
rm -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++; \
- mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/usr/bin/; \
+ mv $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/usr/bin/; \
fi;
- if [ -f $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ ] ; then \
+ if [ -f $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ ] ; then \
rm -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++; \
- mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ $(STAGING_DIR)/usr/bin/; \
+ mv $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ $(STAGING_DIR)/usr/bin/; \
fi;
- rm -rf $(STAGING_DIR)/bin-ccache/*
+ rm -rf $(STAGING_DIR)/usr/bin-ccache/*
(cd $(STAGING_DIR)/usr/bin; \
ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-c++; \
ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-g++;\
@@ -120,10 +120,10 @@
$(CCACHE_DIR2)/.unpacked: $(DL_DIR)/$(CCACHE_SOURCE)
$(CCACHE_CAT) $(DL_DIR)/$(CCACHE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $(CCACHE_DIR2)/.unpacked
+ touch $@
$(CCACHE_DIR2)/.patched: $(CCACHE_DIR2)/.unpacked
- touch $(CCACHE_DIR2)/.patched
+ touch $@
$(CCACHE_DIR2)/.configured: $(CCACHE_DIR2)/.patched
mkdir -p $(CCACHE_DIR2)
@@ -145,7 +145,7 @@
--infodir=/usr/info \
$(DISABLE_NLS) \
);
- touch $(CCACHE_DIR2)/.configured
+ touch $@
$(CCACHE_DIR2)/$(CCACHE_BINARY): $(CCACHE_DIR2)/.configured
$(MAKE) -C $(CCACHE_DIR2) CFLAGS="$(TARGET_CFLAGS)"
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/toolchain/ccache
@ 2007-06-22 19:01 aldot at uclibc.org
2007-06-22 21:58 ` Julien Letessier
0 siblings, 1 reply; 15+ messages in thread
From: aldot at uclibc.org @ 2007-06-22 19:01 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-06-22 12:01:48 -0700 (Fri, 22 Jun 2007)
New Revision: 18897
Log:
- fixup ccache to know about usr/bin
Modified:
trunk/buildroot/toolchain/ccache/ccache.mk
Changeset:
Modified: trunk/buildroot/toolchain/ccache/ccache.mk
===================================================================
--- trunk/buildroot/toolchain/ccache/ccache.mk 2007-06-22 17:49:14 UTC (rev 18896)
+++ trunk/buildroot/toolchain/ccache/ccache.mk 2007-06-22 19:01:48 UTC (rev 18897)
@@ -46,7 +46,7 @@
$(MAKE) CC="$(HOSTCC)" -C $(CCACHE_DIR1)
$(STAGING_DIR)/$(CCACHE_TARGET_BINARY): $(CCACHE_DIR1)/$(CCACHE_BINARY)
- mkdir -p $(STAGING_DIR)/usr/bin;
+ mkdir -p $(STAGING_DIR)/usr/bin
cp $(CCACHE_DIR1)/ccache $(STAGING_DIR)/usr/bin
# Keep the actual toolchain binaries in a directory at the same level.
# Otherwise, relative paths for include dirs break.
@@ -55,23 +55,23 @@
ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-gcc; \
ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-cc; \
ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(REAL_GNU_TARGET_NAME)-cc);
- [ -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gcc ] && \
- mv $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/bin-ccache/
- (cd $(STAGING_DIR)/bin; \
- ln -fs ../usr/bin/ccache $(GNU_TARGET_NAME)-cc; \
- ln -fs ../usr/bin/ccache $(GNU_TARGET_NAME)-gcc; \
- ln -fs ../usr/bin/ccache $(REAL_GNU_TARGET_NAME)-cc; \
- ln -fs ../usr/bin/ccache $(REAL_GNU_TARGET_NAME)-gcc);
+ [ -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc ] && \
+ mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/bin-ccache/
+ (cd $(STAGING_DIR)/usr/bin; \
+ ln -fs ccache $(GNU_TARGET_NAME)-cc; \
+ ln -fs ccache $(GNU_TARGET_NAME)-gcc; \
+ ln -fs ccache $(REAL_GNU_TARGET_NAME)-cc; \
+ ln -fs ccache $(REAL_GNU_TARGET_NAME)-gcc);
ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
- [ -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-c++ ] && \
- mv $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/bin-ccache/
- [ -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-g++ ] && \
- mv $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-g++ $(STAGING_DIR)/bin-ccache/
- (cd $(STAGING_DIR)/bin; \
- ln -fs ../usr/bin/ccache $(GNU_TARGET_NAME)-c++; \
- ln -fs ../usr/bin/ccache $(GNU_TARGET_NAME)-g++;\
- ln -fs ../usr/bin/ccache $(REAL_GNU_TARGET_NAME)-c++; \
- ln -fs ../usr/bin/ccache $(REAL_GNU_TARGET_NAME)-g++);
+ [ -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++ ] && \
+ mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/bin-ccache/
+ [ -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++ ] && \
+ mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++ $(STAGING_DIR)/bin-ccache/
+ (cd $(STAGING_DIR)/usr/bin; \
+ ln -fs ccache $(GNU_TARGET_NAME)-c++; \
+ ln -fs ccache $(GNU_TARGET_NAME)-g++;\
+ ln -fs ccache $(REAL_GNU_TARGET_NAME)-c++; \
+ ln -fs ccache $(REAL_GNU_TARGET_NAME)-g++);
(cd $(STAGING_DIR)/bin-ccache; \
ln -fs $(REAL_GNU_TARGET_NAME)-c++ $(GNU_TARGET_NAME)-c++; \
ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-g++);
@@ -80,27 +80,27 @@
ccache: gcc $(STAGING_DIR)/$(CCACHE_TARGET_BINARY)
ccache-clean:
- rm -rf $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-cc
- rm -rf $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-gcc
- rm -rf $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-cc
- rm -rf $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gcc
+ rm -rf $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-cc
+ rm -rf $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc
+ rm -rf $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc
+ rm -rf $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc
if [ -f $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc ] ; then \
- mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/bin/; \
- (cd $(STAGING_DIR)/bin; \
+ mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/usr/bin/; \
+ (cd $(STAGING_DIR)/usr/bin; \
ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(REAL_GNU_TARGET_NAME)-cc; \
ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-cc; \
ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-gcc); \
fi;
if [ -f $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ ] ; then \
- rm -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-c++; \
- mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/bin/; \
+ rm -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++; \
+ mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/usr/bin/; \
fi;
if [ -f $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ ] ; then \
- rm -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-g++; \
- mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ $(STAGING_DIR)/bin/; \
+ rm -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++; \
+ mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ $(STAGING_DIR)/usr/bin/; \
fi;
rm -rf $(STAGING_DIR)/bin-ccache/*
- (cd $(STAGING_DIR)/bin; \
+ (cd $(STAGING_DIR)/usr/bin; \
ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-c++; \
ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-g++;\
ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(REAL_GNU_TARGET_NAME)-c++);
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/toolchain/ccache
2007-06-22 19:01 aldot at uclibc.org
@ 2007-06-22 21:58 ` Julien Letessier
2007-06-23 8:39 ` Julien Letessier
2007-06-23 9:14 ` Bernhard Fischer
0 siblings, 2 replies; 15+ messages in thread
From: Julien Letessier @ 2007-06-22 21:58 UTC (permalink / raw)
To: buildroot
Almost exactly what I was about to submit :)
(my builds were broken)
Extra patch:
- replace $(STAGING_DIR)/ccache-bin with a $(CCACHE_PATH) variable
(lower redundandy)
- define CCACHE_PATH to be under usr/libexec, which is more LSB-ish.
2007/6/22, aldot at uclibc.org <aldot@uclibc.org>:
> Author: aldot
> Date: 2007-06-22 12:01:48 -0700 (Fri, 22 Jun 2007)
> New Revision: 18897
>
> Log:
> - fixup ccache to know about usr/bin
>
>
> Modified:
> trunk/buildroot/toolchain/ccache/ccache.mk
>
>
> Changeset:
> Modified: trunk/buildroot/toolchain/ccache/ccache.mk
> ===================================================================
> --- trunk/buildroot/toolchain/ccache/ccache.mk 2007-06-22 17:49:14 UTC (rev 18896)
> +++ trunk/buildroot/toolchain/ccache/ccache.mk 2007-06-22 19:01:48 UTC (rev 18897)
> @@ -46,7 +46,7 @@
> $(MAKE) CC="$(HOSTCC)" -C $(CCACHE_DIR1)
>
> $(STAGING_DIR)/$(CCACHE_TARGET_BINARY): $(CCACHE_DIR1)/$(CCACHE_BINARY)
> - mkdir -p $(STAGING_DIR)/usr/bin;
> + mkdir -p $(STAGING_DIR)/usr/bin
> cp $(CCACHE_DIR1)/ccache $(STAGING_DIR)/usr/bin
> # Keep the actual toolchain binaries in a directory at the same level.
> # Otherwise, relative paths for include dirs break.
> @@ -55,23 +55,23 @@
> ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-gcc; \
> ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-cc; \
> ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(REAL_GNU_TARGET_NAME)-cc);
> - [ -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gcc ] && \
> - mv $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/bin-ccache/
> - (cd $(STAGING_DIR)/bin; \
> - ln -fs ../usr/bin/ccache $(GNU_TARGET_NAME)-cc; \
> - ln -fs ../usr/bin/ccache $(GNU_TARGET_NAME)-gcc; \
> - ln -fs ../usr/bin/ccache $(REAL_GNU_TARGET_NAME)-cc; \
> - ln -fs ../usr/bin/ccache $(REAL_GNU_TARGET_NAME)-gcc);
> + [ -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc ] && \
> + mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/bin-ccache/
> + (cd $(STAGING_DIR)/usr/bin; \
> + ln -fs ccache $(GNU_TARGET_NAME)-cc; \
> + ln -fs ccache $(GNU_TARGET_NAME)-gcc; \
> + ln -fs ccache $(REAL_GNU_TARGET_NAME)-cc; \
> + ln -fs ccache $(REAL_GNU_TARGET_NAME)-gcc);
> ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
> - [ -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-c++ ] && \
> - mv $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/bin-ccache/
> - [ -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-g++ ] && \
> - mv $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-g++ $(STAGING_DIR)/bin-ccache/
> - (cd $(STAGING_DIR)/bin; \
> - ln -fs ../usr/bin/ccache $(GNU_TARGET_NAME)-c++; \
> - ln -fs ../usr/bin/ccache $(GNU_TARGET_NAME)-g++;\
> - ln -fs ../usr/bin/ccache $(REAL_GNU_TARGET_NAME)-c++; \
> - ln -fs ../usr/bin/ccache $(REAL_GNU_TARGET_NAME)-g++);
> + [ -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++ ] && \
> + mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/bin-ccache/
> + [ -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++ ] && \
> + mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++ $(STAGING_DIR)/bin-ccache/
> + (cd $(STAGING_DIR)/usr/bin; \
> + ln -fs ccache $(GNU_TARGET_NAME)-c++; \
> + ln -fs ccache $(GNU_TARGET_NAME)-g++;\
> + ln -fs ccache $(REAL_GNU_TARGET_NAME)-c++; \
> + ln -fs ccache $(REAL_GNU_TARGET_NAME)-g++);
> (cd $(STAGING_DIR)/bin-ccache; \
> ln -fs $(REAL_GNU_TARGET_NAME)-c++ $(GNU_TARGET_NAME)-c++; \
> ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-g++);
> @@ -80,27 +80,27 @@
> ccache: gcc $(STAGING_DIR)/$(CCACHE_TARGET_BINARY)
>
> ccache-clean:
> - rm -rf $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-cc
> - rm -rf $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-gcc
> - rm -rf $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-cc
> - rm -rf $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gcc
> + rm -rf $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-cc
> + rm -rf $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc
> + rm -rf $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc
> + rm -rf $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc
> if [ -f $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc ] ; then \
> - mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/bin/; \
> - (cd $(STAGING_DIR)/bin; \
> + mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/usr/bin/; \
> + (cd $(STAGING_DIR)/usr/bin; \
> ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(REAL_GNU_TARGET_NAME)-cc; \
> ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-cc; \
> ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-gcc); \
> fi;
> if [ -f $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ ] ; then \
> - rm -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-c++; \
> - mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/bin/; \
> + rm -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++; \
> + mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/usr/bin/; \
> fi;
> if [ -f $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ ] ; then \
> - rm -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-g++; \
> - mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ $(STAGING_DIR)/bin/; \
> + rm -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++; \
> + mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ $(STAGING_DIR)/usr/bin/; \
> fi;
> rm -rf $(STAGING_DIR)/bin-ccache/*
> - (cd $(STAGING_DIR)/bin; \
> + (cd $(STAGING_DIR)/usr/bin; \
> ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-c++; \
> ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-g++;\
> ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(REAL_GNU_TARGET_NAME)-c++);
>
> _______________________________________________
> buildroot mailing list
> buildroot at uclibc.org
> http://busybox.net/mailman/listinfo/buildroot
>
--
Julien Letessier
<julien.letessier@technosens.fr>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: ccache-lsb.patch
Type: application/octet-stream
Size: 3927 bytes
Desc: not available
Url : http://busybox.net/lists/buildroot/attachments/20070622/5b2f7752/attachment.obj
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/toolchain/ccache
2007-06-22 21:58 ` Julien Letessier
@ 2007-06-23 8:39 ` Julien Letessier
2007-06-23 9:14 ` Bernhard Fischer
1 sibling, 0 replies; 15+ messages in thread
From: Julien Letessier @ 2007-06-23 8:39 UTC (permalink / raw)
To: buildroot
Sorry -- my earlier patch doesn't work (I sent the wrong file).
Anyways, for some reason the "real" gcc binaries can be only moved to
a location at the same depth in the filesystem, so my idea is not
applicable.
2007/6/22, Julien Letessier <julien.letessier@technosens.fr>:
> Almost exactly what I was about to submit :)
> (my builds were broken)
>
> Extra patch:
> - replace $(STAGING_DIR)/ccache-bin with a $(CCACHE_PATH) variable
> (lower redundandy)
> - define CCACHE_PATH to be under usr/libexec, which is more LSB-ish.
>
> 2007/6/22, aldot at uclibc.org <aldot@uclibc.org>:
> > Author: aldot
> > Date: 2007-06-22 12:01:48 -0700 (Fri, 22 Jun 2007)
> > New Revision: 18897
> >
> > Log:
> > - fixup ccache to know about usr/bin
> >
> >
> > Modified:
> > trunk/buildroot/toolchain/ccache/ccache.mk
> >
> >
> > Changeset:
> > Modified: trunk/buildroot/toolchain/ccache/ccache.mk
> > ===================================================================
> > --- trunk/buildroot/toolchain/ccache/ccache.mk 2007-06-22 17:49:14 UTC (rev 18896)
> > +++ trunk/buildroot/toolchain/ccache/ccache.mk 2007-06-22 19:01:48 UTC (rev 18897)
> > @@ -46,7 +46,7 @@
> > $(MAKE) CC="$(HOSTCC)" -C $(CCACHE_DIR1)
> >
> > $(STAGING_DIR)/$(CCACHE_TARGET_BINARY): $(CCACHE_DIR1)/$(CCACHE_BINARY)
> > - mkdir -p $(STAGING_DIR)/usr/bin;
> > + mkdir -p $(STAGING_DIR)/usr/bin
> > cp $(CCACHE_DIR1)/ccache $(STAGING_DIR)/usr/bin
> > # Keep the actual toolchain binaries in a directory at the same level.
> > # Otherwise, relative paths for include dirs break.
> > @@ -55,23 +55,23 @@
> > ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-gcc; \
> > ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-cc; \
> > ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(REAL_GNU_TARGET_NAME)-cc);
> > - [ -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gcc ] && \
> > - mv $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/bin-ccache/
> > - (cd $(STAGING_DIR)/bin; \
> > - ln -fs ../usr/bin/ccache $(GNU_TARGET_NAME)-cc; \
> > - ln -fs ../usr/bin/ccache $(GNU_TARGET_NAME)-gcc; \
> > - ln -fs ../usr/bin/ccache $(REAL_GNU_TARGET_NAME)-cc; \
> > - ln -fs ../usr/bin/ccache $(REAL_GNU_TARGET_NAME)-gcc);
> > + [ -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc ] && \
> > + mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/bin-ccache/
> > + (cd $(STAGING_DIR)/usr/bin; \
> > + ln -fs ccache $(GNU_TARGET_NAME)-cc; \
> > + ln -fs ccache $(GNU_TARGET_NAME)-gcc; \
> > + ln -fs ccache $(REAL_GNU_TARGET_NAME)-cc; \
> > + ln -fs ccache $(REAL_GNU_TARGET_NAME)-gcc);
> > ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
> > - [ -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-c++ ] && \
> > - mv $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/bin-ccache/
> > - [ -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-g++ ] && \
> > - mv $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-g++ $(STAGING_DIR)/bin-ccache/
> > - (cd $(STAGING_DIR)/bin; \
> > - ln -fs ../usr/bin/ccache $(GNU_TARGET_NAME)-c++; \
> > - ln -fs ../usr/bin/ccache $(GNU_TARGET_NAME)-g++;\
> > - ln -fs ../usr/bin/ccache $(REAL_GNU_TARGET_NAME)-c++; \
> > - ln -fs ../usr/bin/ccache $(REAL_GNU_TARGET_NAME)-g++);
> > + [ -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++ ] && \
> > + mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/bin-ccache/
> > + [ -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++ ] && \
> > + mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++ $(STAGING_DIR)/bin-ccache/
> > + (cd $(STAGING_DIR)/usr/bin; \
> > + ln -fs ccache $(GNU_TARGET_NAME)-c++; \
> > + ln -fs ccache $(GNU_TARGET_NAME)-g++;\
> > + ln -fs ccache $(REAL_GNU_TARGET_NAME)-c++; \
> > + ln -fs ccache $(REAL_GNU_TARGET_NAME)-g++);
> > (cd $(STAGING_DIR)/bin-ccache; \
> > ln -fs $(REAL_GNU_TARGET_NAME)-c++ $(GNU_TARGET_NAME)-c++; \
> > ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-g++);
> > @@ -80,27 +80,27 @@
> > ccache: gcc $(STAGING_DIR)/$(CCACHE_TARGET_BINARY)
> >
> > ccache-clean:
> > - rm -rf $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-cc
> > - rm -rf $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-gcc
> > - rm -rf $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-cc
> > - rm -rf $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gcc
> > + rm -rf $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-cc
> > + rm -rf $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc
> > + rm -rf $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc
> > + rm -rf $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc
> > if [ -f $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc ] ; then \
> > - mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/bin/; \
> > - (cd $(STAGING_DIR)/bin; \
> > + mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/usr/bin/; \
> > + (cd $(STAGING_DIR)/usr/bin; \
> > ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(REAL_GNU_TARGET_NAME)-cc; \
> > ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-cc; \
> > ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-gcc); \
> > fi;
> > if [ -f $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ ] ; then \
> > - rm -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-c++; \
> > - mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/bin/; \
> > + rm -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++; \
> > + mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/usr/bin/; \
> > fi;
> > if [ -f $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ ] ; then \
> > - rm -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-g++; \
> > - mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ $(STAGING_DIR)/bin/; \
> > + rm -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++; \
> > + mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ $(STAGING_DIR)/usr/bin/; \
> > fi;
> > rm -rf $(STAGING_DIR)/bin-ccache/*
> > - (cd $(STAGING_DIR)/bin; \
> > + (cd $(STAGING_DIR)/usr/bin; \
> > ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-c++; \
> > ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-g++;\
> > ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(REAL_GNU_TARGET_NAME)-c++);
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot at uclibc.org
> > http://busybox.net/mailman/listinfo/buildroot
> >
>
>
> --
> Julien Letessier
> <julien.letessier@technosens.fr>
>
>
--
Julien Letessier
<julien.letessier@technosens.fr>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/toolchain/ccache
2007-06-22 21:58 ` Julien Letessier
2007-06-23 8:39 ` Julien Letessier
@ 2007-06-23 9:14 ` Bernhard Fischer
1 sibling, 0 replies; 15+ messages in thread
From: Bernhard Fischer @ 2007-06-23 9:14 UTC (permalink / raw)
To: buildroot
On Fri, Jun 22, 2007 at 11:58:11PM +0200, Julien Letessier wrote:
>Almost exactly what I was about to submit :)
>(my builds were broken)
>
>Extra patch:
>- replace $(STAGING_DIR)/ccache-bin with a $(CCACHE_PATH) variable
>(lower redundandy)
>- define CCACHE_PATH to be under usr/libexec, which is more LSB-ish.
Sounds nice. Care to send a tested patch?
cheers,
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/toolchain/ccache
@ 2007-02-03 21:07 andersen at uclibc.org
0 siblings, 0 replies; 15+ messages in thread
From: andersen at uclibc.org @ 2007-02-03 21:07 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2007-02-03 13:07:43 -0800 (Sat, 03 Feb 2007)
New Revision: 17745
Log:
patch from rick68:
make certain uninstall works more than once.
Modified:
trunk/buildroot/toolchain/ccache/ccache.mk
Changeset:
Modified: trunk/buildroot/toolchain/ccache/ccache.mk
===================================================================
--- trunk/buildroot/toolchain/ccache/ccache.mk 2007-02-03 21:05:53 UTC (rev 17744)
+++ trunk/buildroot/toolchain/ccache/ccache.mk 2007-02-03 21:07:43 UTC (rev 17745)
@@ -84,18 +84,21 @@
rm -rf $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-gcc
rm -rf $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-cc
rm -rf $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gcc
- [ -f $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc ] && \
- mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/bin/
- (cd $(STAGING_DIR)/bin; \
- ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(REAL_GNU_TARGET_NAME)-cc; \
- ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-cc; \
- ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-gcc;)
- [ -f $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ ] && \
+ if [ -f $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc ] ; then \
+ mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/bin/; \
+ (cd $(STAGING_DIR)/bin; \
+ ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(REAL_GNU_TARGET_NAME)-cc; \
+ ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-cc; \
+ ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-gcc); \
+ fi;
+ if [ -f $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ ] ; then \
rm -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-c++; \
- mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/bin/
- [ -f $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ ] && \
+ mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/bin/; \
+ fi;
+ if [ -f $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ ] ; then \
rm -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-g++; \
- mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ $(STAGING_DIR)/bin/
+ mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ $(STAGING_DIR)/bin/; \
+ fi;
rm -rf $(STAGING_DIR)/bin-ccache/*
(cd $(STAGING_DIR)/bin; \
ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-c++; \
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/toolchain/ccache
@ 2007-02-03 0:52 andersen at uclibc.org
0 siblings, 0 replies; 15+ messages in thread
From: andersen at uclibc.org @ 2007-02-03 0:52 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2007-02-02 16:52:39 -0800 (Fri, 02 Feb 2007)
New Revision: 17730
Log:
There is no 'make uninstall' for ccache.
Attempt to manually make uninstall work....
Modified:
trunk/buildroot/toolchain/ccache/ccache.mk
Changeset:
Modified: trunk/buildroot/toolchain/ccache/ccache.mk
===================================================================
--- trunk/buildroot/toolchain/ccache/ccache.mk 2007-02-03 00:52:17 UTC (rev 17729)
+++ trunk/buildroot/toolchain/ccache/ccache.mk 2007-02-03 00:52:39 UTC (rev 17730)
@@ -80,7 +80,27 @@
ccache: gcc $(STAGING_DIR)/$(CCACHE_TARGET_BINARY)
ccache-clean:
- $(MAKE) -C $(CCACHE_DIR1) uninstall
+ rm -rf $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-cc
+ rm -rf $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-gcc
+ rm -rf $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-cc
+ rm -rf $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gcc
+ [ -f $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc ] && \
+ mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/bin/
+ (cd $(STAGING_DIR)/bin; \
+ ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(REAL_GNU_TARGET_NAME)-cc; \
+ ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-cc; \
+ ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-gcc;)
+ [ -f $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ ] && \
+ rm -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-c++; \
+ mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/bin/
+ [ -f $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ ] && \
+ rm -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-g++; \
+ mv $(STAGING_DIR)/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ $(STAGING_DIR)/bin/
+ rm -rf $(STAGING_DIR)/bin-ccache/*
+ (cd $(STAGING_DIR)/bin; \
+ ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-c++; \
+ ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-g++;\
+ ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(REAL_GNU_TARGET_NAME)-c++);
-$(MAKE) -C $(CCACHE_DIR1) clean
ccache-dirclean:
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2008-10-06 20:29 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-10-06 20:28 [Buildroot] svn commit: trunk/buildroot/toolchain/ccache wberrier at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2008-10-06 19:14 wberrier at uclibc.org
2008-10-06 19:52 ` Peter Korsgaard
2008-10-06 20:29 ` Wade Berrier
2008-08-04 19:08 jacmet at uclibc.org
2008-08-04 19:08 jacmet at uclibc.org
2008-08-04 19:08 jacmet at uclibc.org
2008-08-04 19:07 jacmet at uclibc.org
2007-06-23 13:49 aldot at uclibc.org
2007-06-22 19:01 aldot at uclibc.org
2007-06-22 21:58 ` Julien Letessier
2007-06-23 8:39 ` Julien Letessier
2007-06-23 9:14 ` Bernhard Fischer
2007-02-03 21:07 andersen at uclibc.org
2007-02-03 0:52 andersen at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox