Changeset fa38bca in freewrt

Timestamp:

Mar 11, 2007, 9:25:45 PM (19 years ago)

Author:

Lothar Gesslein <ulmen@…>

Children:

edb9a20

Parents:

493909a

Message:

• readd ccache functionality
• fix ccache issue with openssl
• fix ccache issue with libpri
• kernel is now also build explicit with CC="$(TARGET_CC)", thus it's ccached
• drop unnecessary sed call in kernel-build.mk while there

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@2150 afb5a338-a214-0410-bd46-81f09a774fd1

Files:

• mk/kernel-build.mk (modified) (4 diffs)
• mk/vars.mk (modified) (1 diff)
• package/Config.in (modified) (1 diff)
• package/libpri/patches/200-fix-makefile.patch (added)
• package/openssl/Makefile (modified) (1 diff)
• rules.mk (modified) (1 diff)
• scripts/scan-pkgs.sh (modified) (2 diffs)

mk/kernel-build.mk

@@ -78 +78 @@
 $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
         @$(TRACE) target/linux/$(BOARD)-$(KERNEL)-kernel-configure
-        $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" \
-          $(LINUX_DIR)/Makefile  \
-          $(LINUX_DIR)/arch/*/Makefile
         $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h $(MAKE_TRACE)
-        $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) dep $(MAKE_TRACE)
+        $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) CC="$(TARGET_CC)" dep $(MAKE_TRACE)
         touch $@
 else
 $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
         @$(TRACE) target/linux/$(BOARD)-$(KERNEL)-kernel-configure
-        $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts $(MAKE_TRACE)
+        $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) CC="$(TARGET_CC)" oldconfig prepare scripts $(MAKE_TRACE)
         touch $@
 endif
@@ -93 +90 @@
 $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.configured
         @$(TRACE) target/linux/$(BOARD)-$(KERNEL)-kernel-compile
-        $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) $(MAKE_TRACE)
+        $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) CC="$(TARGET_CC)" PATH=$(TARGET_PATH) $(MAKE_TRACE)
 
 $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
@@ -106 +103 @@
 $(LINUX_DIR)/.modules-compile:
         @$(TRACE) target/linux/$(BOARD)-$(KERNEL)-modules-compile
-        $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" modules $(MAKE_TRACE)
+        $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) CC="$(TARGET_CC)" PATH="$(TARGET_PATH)" modules $(MAKE_TRACE)
         touch $@
 
@@ -112 +109 @@
         @$(TRACE) target/linux/$(BOARD)-$(KERNEL)-modules-install
         rm -rf $(LINUX_BUILD_DIR)/modules
-        $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" DEPMOD=true INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules modules_install $(MAKE_TRACE)
+        $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" DEPMOD=true INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules modules_install $(MAKE_TRACE)
         touch $@
 

mk/vars.mk

@@ -35 +35 @@
 KERNEL_CROSS:=          $(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)-linux-uclibc-
 TARGET_CROSS:=          $(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)-linux-uclibc-
-TARGET_CC:=             $(TARGET_CROSS)gcc
-TARGET_CXX:=            $(TARGET_CROSS)g++
+TARGET_CC:=             $(TARGET_COMPILER_PREFIX) $(TARGET_CROSS)gcc
+TARGET_CXX:=            $(TARGET_COMPILER_PREFIX) $(TARGET_CROSS)g++
 PATCH=                  $(SCRIPT_DIR)/patch-kernel.sh
 SED:=                   $(STAGING_DIR)/bin/sed -i -e

package/Config.in

@@ -423 +423 @@
 
 config FWRT_USE_CCACHE
-        bool "Use ccache to speed up re-compilation (NOT WORKING FOR MOST PACKAGES)"
+        bool "Use ccache to speed up package re-compilation"
         default n
         help
-          ccache is a compiler cache. It speeds up re-compilation of C/C++ code
-          by caching previous compiles and detecting when the same compile is
-          being done again.
-          Requires ccache on your build machine.
-          The default cache dir "$HOME/.ccache" is used unless otherwise
-          specified in the CCACHE_DIR environment variable.
-          NOT WORKING FOR MOST PACKAGES (YET)
+          ccache is a compiler cache. It speeds up re-compilation of C/C++ code
+          by caching previous compiles and detecting when the same compile is
+          being done again.
+          Requires ccache on your build machine.
+          The default ccache options (cache dir, size etc) are used.
+          Note: To build the toolchain with ccache, you'll have to set it up
+          for yourself (e.g. with the CC environment variable or symlinks).
+          This option is only to prefix the _cross_compile calls with ccache.
 
 source "package/Config.in.runtime"

package/openssl/Makefile

@@ -50 +50 @@
 pre-build:
         ${MAKE} -C ${WRKBUILD} -j1 \
-                MAKEDEPPROG="${TARGET_CC}" \
+                MAKEDEPPROG="${TARGET_CROSS}gcc" \
                 depend
 

rules.mk

@@ -56 +56 @@
 FWRT_PREFIX:=           $(strip $(subst ",, $(FWRT_PREFIX)))
 #"))"))"))"))")) # for vim's broken syntax highlighting :)
+
+ifneq ($(FWRT_USE_CCACHE),)
+TARGET_COMPILER_PREFIX+=        ccache
+endif
 
 include $(TOPDIR)/mk/vars.mk

scripts/scan-pkgs.sh

@@ -65 +65 @@
 fi
 
-if [[ -n $FWRT_USE_CCACHE ]]; then
-        NEED_CCACHE="yes"
-fi
-
 #-- start checking dependencies here --
 
@@ -107 +103 @@
 fi
 
-if [[ -n $NEED_CCACHE ]]; then
+if [[ -n $FWRT_USE_CCACHE ]]; then
         if ! which ccache >/dev/null 2>&1; then
                 echo >&2 You have selected to build with ccache, but ccache could not be found.