From 2207152c1c293cfc80e0bc9a44fcab35fecba89c Mon Sep 17 00:00:00 2001 From: ppisa Date: Fri, 13 Mar 2009 01:38:37 +0100 Subject: [PATCH 1/1] Updated Makefile.rules, kernel compiler flags extraction and build script. This solves problem with includes pointing to the arch directory on newer 2.6.x kernels. --- omk/rules/linux/Makefile.rules | 154 ++++++++++++++------------------- omk/rules/linux/kernelcfg2mk | 6 +- 2 files changed, 67 insertions(+), 93 deletions(-) diff --git a/omk/rules/linux/Makefile.rules b/omk/rules/linux/Makefile.rules index 4698153..25507fa 100644 --- a/omk/rules/linux/Makefile.rules +++ b/omk/rules/linux/Makefile.rules @@ -1,23 +1,25 @@ -# Version for Linux/RTLinux builds. #OMK@linux -# -# Makefile.rules - OCERA make framework common project rules -*- makefile -*- #OMK@base +# Makefile.rules - OCERA make framework common project rules -*- makefile-gmake -*- #OMK:base.omk # # (C) Copyright 2003 by Pavel Pisa - OCERA team member # (C) Copyright 2006 by Michal Sojka - Czech Technical University, FEE, DCE # # Homepage: http://rtime.felk.cvut.cz/omk/ +# Version: 0.1-71-g6698de2 # # The OMK build system is distributed under the GNU General Public # License. See file COPYING for details. # -# input variables +# +# Version for Linux/RTLinux builds. #OMK:linux.omk +# +# +# input variables #OMK:base.omk # V .. if set to 1, full command text is shown else short form is used # W .. whole tree - if set to 1, make is always called from the top-level directory # SUBDIRS .. list of subdirectories intended for make from actual directory # default_CONFIG .. list of default config assignments CONFIG_XXX=y/n ... -# LN_HEADERS .. if "y", header files are symbolicaly linked instead of copied. #OMK@include -# #OMK@linux -# input variables +# LN_HEADERS .. if "y", header files are symbolicaly linked instead of copied. #OMK:include.omk +# input variables #OMK:linux.omk # lib_LIBRARIES .. list of the user-space libraries # shared_LIBRARIES .. list of the user-space shared libraries # kernel_LIBRARIES .. list of the kernel-space libraries @@ -45,7 +47,7 @@ # CXXFLAGS .. C++ compiler flags # CPPFLAGS .. C preprocessor flags # LDFLAGS .. linker flags for programs linking -# LOCAL_CONFIG_H .. name of local config.h file generated from values #OMK@config_h +# LOCAL_CONFIG_H .. name of local config.h file generated from values #OMK:config_h.omk # of options defined in the current directory # config_include_HEADERS .. names of global config files (possibly # with subdirectories) @@ -54,10 +56,11 @@ # DOXYGEN .. if non-empty, generated headers includes Doxygen's @file # command, so it is possible to document config # variables. -# QT_SUBDIRS .. subdirectories where to build QT applications using qmake #OMK@qt +# QT_PROJECTS .. list of QT .pro file to use for compilation #OMK:qt.omk +# QT_SUBDIRS .. subdirectories where to build QT applications using qmake (depricated) # QTDIR .. where QT resides -OMK_RULES_TYPE=linux #OMK@__type - #OMK@base +OMK_RULES_TYPE=linux #OMK:Makefile.rules.linux@ + #OMK:base.omk@Makefile.rules.linux # We need to ensure definition of sources directory first ifndef SOURCES_DIR # Only shell built-in pwd understands -L @@ -321,12 +324,12 @@ omkize: fi $(Q)for i in `find -L . -name Makefile.omk` ; do \ d=`dirname $${i}`; \ - if ! test -f "$${d}/Makefile.rules" && ( ! test -f "$${d}/Makefile" || ! cmp --silent Makefile "$${d}/Makefile" ); then \ + if ! test -f "$${d}/Makefile.rules" && ( test -f "$${d}/Makefile" && ! cmp --silent Makefile "$${d}/Makefile" ); then \ rm -f "$${d}/Makefile"; \ cp -v Makefile "$${d}/Makefile"; \ fi \ done -ifeq ($(OMK_VERBOSE),1) #OMK@include +ifeq ($(OMK_VERBOSE),1) #OMK:include.omk@Makefile.rules.linux CPHEADER_FLAGS += -v LNHEADER_FLAGS += -v endif @@ -363,11 +366,7 @@ include-pass-local-$(2): $$($(2)_GEN_HEADERS) $$(foreach f,$$(renamed_$(2)_GEN_H cmp --quiet $$$${srcfname} $(1)/$$$${destfname} \ || ( mkdir -p `dirname $(1)/$$$${destfname}` && $$(call cp_cmd,$$(LOCAL_BUILD_DIR)/$$$${srcfname},$(1)/$$$${destfname}) ) || exit 1 ; ) endef - -# Local Variables: -# mode:makefile -# End: - #OMK@linux + #OMK:linux.omk@Makefile.rules.linux # Hack to check RT-Linux rules #LINUX_DIR := /home/cvs/ocera/ocera-build/kernel/linux #RTL_DIR := /home/cvs/ocera/ocera-build/kernel/rtlinux @@ -618,7 +617,7 @@ USER_SOURCES += $$($(1)_SOURCES) $(2)/$(1)$(3): $$($(1)_OBJS) @$(QUIET_CMD_ECHO) " LINK $$@" $(Q) $$(if $$(filter %.cc,$$($(1)_SOURCES:%.cxx=%.cc)),$$(CXX),$$(CC)) \ - $$($(1)_OBJS) $$($(1)_LIBS:%=-l%) $$(LOADLIBES) $$(LDFLAGS) -Wl,-Map,$(USER_OBJS_DIR)/$(1).exe.map -o $$@ + $$($(1)_OBJS) $$($(1)_LIBS:%=-l%) $$(LOADLIBES) $$(LDFLAGS) -Wl,-rpath-link,$(USER_LIB_DIR) -Wl,-Map,$(USER_OBJS_DIR)/$(1).exe.map -o $$@ @echo "$(2)/$(1)$(3): \\" >$(USER_OBJS_DIR)/$(1).exe.d @sed -n -e 's|^LOAD \(.*\)$$$$| \1 \&|p' $(USER_OBJS_DIR)/$(1).exe.map|tr '&' '\134' >>$(USER_OBJS_DIR)/$(1).exe.d @echo >>$(USER_OBJS_DIR)/$(1).exe.d @@ -725,10 +724,10 @@ $(1)_shared_libs = $$(patsubst %,$(USER_LIB_DIR)/lib%.$(SOLIB_EXT),$$(filter $$( #$$(warning $(1)_shared_libs = $$($(1)_shared_libs)) $(USER_LIB_DIR)/lib$(1).$(SOLIB_EXT): $$($(1)_shared_libs) $$($(1)_objslo) @$(QUIET_CMD_ECHO) " LINK $$@" - $(Q) $(CC) --shared -Xlinker -soname=lib$(1).$(SOLIB_EXT) -o $$@ $$($(1)_objslo) $$(LOADLIBES) $$($(1)_libs:%=-l%) + $(Q)$(CC) --shared -Xlinker -soname=lib$(1).$(SOLIB_EXT) -o $$@ $$($(1)_objslo) $$(LOADLIBES) $$($(1)_libs:%=-l%) endef --include $(shell find $(USER_BUILD_DIR) -name 'lib*.omkvar') +-include $(shell true; find $(USER_BUILD_DIR) -name 'lib*.omkvar') # `true' is a hack for MinGW #$(warning $(shared_libs)) $(foreach lib,$(shared_libs),$(eval $(call solib_link_template,$(lib)))) @@ -1050,7 +1049,7 @@ $(eval $(call omk_pass_template,clean,$(USER_OBJS_DIR),,always)) $(eval $(call omk_pass_template,install,$(USER_OBJS_DIR),,always)) $(eval $(call omk_pass_template,include-pass,$(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,always)) -check-dir: +check-dir:: @$(call mkdir_def,$(USER_BUILD_DIR)) @$(call mkdir_def,$(KERN_BUILD_DIR)) @$(call mkdir_def,$(USER_INCLUDE_DIR)) @@ -1159,11 +1158,7 @@ ifndef OMIT_KERNEL_PASSES # Also make kernel passes if not disabled default: kernel-lib-pass kernel-pass endif - -# Local Variables: -# mode:makefile -# End: - #OMK@config_h + #OMK:config_h.omk@Makefile.rules.linux # Syntax: $(call BUILD_CONFIG_H_template,,,,) define BUILD_CONFIG_H_template @@ -1234,63 +1229,52 @@ clean-local-config-h: @$(foreach confh,$(config_h_stamp_files) $(kern_config_h_stamp_files),\ if [ -e $(confh) ] ; then rm $(confh) ; fi ; \ ) + #OMK:qt.omk@Makefile.rules.linux +ifneq ($(QT_SUBDIRS)$(QT_PROJECTS),) + +# Usage: $(call qt_project_template,<.pro_file relative to SOURCES_DIR>) +define qt_project_template + +.PHONY: qt-subpass-$(1) clean-qt-$(dir $(1)) + +# FIXME: Handle multiple .pro files correctly +$(LOCAL_BUILD_DIR)/$(dir $(1))Makefile: $(SOURCES_DIR)/$(1) + $(Q)mkdir -p $$(dir $$(@)) && cd $$(dir $$(@)) && \ + $(QTDIR:%=%/bin/)qmake \ + TOP_DIR=$(OUTPUT_DIR) \ + RELATIVE_DIR=$(RELATIVE_PREFIX)$(dir $(1)) \ + $(QTDIR:%=QTDIR=%) CC=$(CC) CXX=$(CXX) \ + LIBS+="-L$(USER_LIB_DIR)" DESTDIR=$(USER_BIN_DIR) \ + INCLUDEPATH+="$(USER_INCLUDE_DIR)" \ + QMAKE_LFLAGS="-Wl,-rpath-link,$(USER_LIB_DIR) $$(QMAKE_LFLAGS)" \ + $(SOURCES_DIR)/$(1) + +# This horrible substitution is here to properly escape +# -Wl,-rpath,$ORIGIN flags. It includes escaping for make, shell, +# qmake and again make and shell run on qmake generated makefile. +QMAKE_LFLAGS = $$(subst $$$$,\\\\\\$$$$\$$$$,$$(LDFLAGS)) +# Hook to binary pass +binary-pass-submakes: qt-subpass-$(1) +qt-subpass-$(1): $(LOCAL_BUILD_DIR)/$(dir $(1))Makefile + $(Q)$(MAKE) SOURCES_DIR=$(SOURCES_DIR)/$(dir $(1)) \ + RELATIVE_DIR=$(RELATIVE_PREFIX)$(dir $(1)) -C $(LOCAL_BUILD_DIR)/$(dir $(1)) || exit 1 ; -# Local Variables: -# mode:makefile -# End: - #OMK@qt -ifneq ($(QT_SUBDIRS),) - -.PHONY: qt-subpass clean-qt distclean-qt - -# Usage: $(call qt_makefile_template,) -define qt_makefile_template -$(SOURCES_DIR)/$(1)/Makefile: $(wildcard $(SOURCES_DIR)/$(1)/*.pro) - cd $(SOURCES_DIR)/$(1); $(QTDIR:%=%/bin/)qmake TOP_DIR=$(OUTPUT_DIR) \ - RELATIVE_DIR=$(RELATIVE_PREFIX)$(1) $(QTDIR:%=QTDIR=%) CC=$(CC) \ - CXX=$(CXX) LIBS+="-L$(USER_LIB_DIR)" INCLUDEPATH+="$(USER_INCLUDE_DIR)" +# Hook to clean pass +clean-local: clean-qt-$(dir $(1)) +clean-qt-$(dir $(1)): $(LOCAL_BUILD_DIR)/$(dir $(1))Makefile + @$(QUIET_CMD_ECHO) " QT CLEAN $(dir $(1))" + $(Q)$(MAKE) SOURCES_DIR=$(SOURCES_DIR)/$(dir $(1)) \ + RELATIVE_DIR=$(RELATIVE_PREFIX)$(dir $(1)) \ + -C $(LOCAL_BUILD_DIR)/$(dir $(1)) clean + $(Q)rm $(LOCAL_BUILD_DIR)/$(dir $(1))Makefile endef -$(foreach dir,$(QT_SUBDIRS), $(eval $(call qt_makefile_template,$(dir)))) -qt-subpass: $(foreach dir,$(QT_SUBDIRS), $(SOURCES_DIR)/$(dir)/Makefile) - $(foreach dir,$(QT_SUBDIRS),\ - $(MAKE) SOURCES_DIR=$(SOURCES_DIR)/$(dir) \ - RELATIVE_DIR=$(RELATIVE_PREFIX)$(dir) -C $(SOURCES_DIR)/$(dir) \ - -f $(SOURCES_DIR)/$(dir)/Makefile || exit 1 ;) +$(foreach pro,$(QT_PROJECTS), $(eval $(call qt_project_template,$(pro)))) +$(foreach pro,$(foreach dir,$(QT_SUBDIRS), $(wildcard $(dir)/*.pro)), $(eval $(call qt_project_template,$(pro)))) -# Hook to binary pass -binary-pass-submakes: qt-subpass - -# Hook to clean pass -clean-local: clean-qt -clean-qt: - +@$(foreach dir, $(QT_SUBDIRS), \ - $(if $(wildcard $(SOURCES_DIR)/$(dir)/Makefile), \ - @$(QUIET_CMD_ECHO) " CLEAN $(dir)"; \ - $(MAKE) SOURCES_DIR=$(SOURCES_DIR)/$(dir) \ - RELATIVE_DIR=$(RELATIVE_PREFIX)$(dir) -C $(SOURCES_DIR)/$(dir) \ - -f $(SOURCES_DIR)/$(dir)/Makefile clean|| exit 1 ;)) - - -# Hook to distclean -distclean: distclean-qt - -# TODO: Add distclean-qt-pass to handle QT_SUBDIRS in the whole -# tree. This way we only distclean toplevel subdirs. -distclean-qt: - +@$(foreach dir, $(QT_SUBDIRS), \ - $(if $(wildcard $(SOURCES_DIR)/$(dir)/Makefile), \ - @$(QUIET_CMD_ECHO) " DISTCLEAN $(dir)"; \ - $(MAKE) SOURCES_DIR=$(SOURCES_DIR)/$(dir) \ - RELATIVE_DIR=$(RELATIVE_PREFIX)$(dir) -C $(SOURCES_DIR)/$(dir) \ - -f $(SOURCES_DIR)/$(dir)/Makefile distclean|| exit 1 ;)) -endif - -# Local Variables: -# mode:makefile -# End: - #OMK@sources-list +endif + #OMK:sources-list.omk@Makefile.rules.linux # Rules that creates the list of files which are used during # compilation. The list reflects conditional compilation depending on # config.omk and other variables. @@ -1303,13 +1287,7 @@ SOURCES_LIST_D := $(LOCAL_BUILD_DIR)/$(SOURCES_LIST_FN).d export SOURCES_LIST SOURCES_LIST_DIR SOURCES_LIST_D endif -ifeq ($(MAKECMDGOALS),sources-list) -NEED_SOURCES_LIST=y -endif -ifeq ($(MAKECMDGOALS),TAGS) -NEED_SOURCES_LIST=y -endif -ifeq ($(MAKECMDGOALS),tags) +ifneq ($(filter sources-list TAGS tags cscope,$(MAKECMDGOALS)),) NEED_SOURCES_LIST=y endif @@ -1375,7 +1353,3 @@ cscope: $(SOURCES_LIST) @$(QUIET_CMD_ECHO) " CSCOPE < $(SOURCES_LIST_FN)" $(Q)sed -e '/^#/d' $(SOURCES_LIST)|cscope -b -i- #FIXME: see doc to -i in cscope(1) - -# Local Variables: -# mode:makefile -# End: diff --git a/omk/rules/linux/kernelcfg2mk b/omk/rules/linux/kernelcfg2mk index c18a497..8459118 100755 --- a/omk/rules/linux/kernelcfg2mk +++ b/omk/rules/linux/kernelcfg2mk @@ -151,9 +151,9 @@ flags: @echo LINUX_CROSS_COMPILE="\$(CROSS_COMPILE)" >>\$(obj)/flags @echo LINUX_KERNELRELEASE="\$(KERNELRELEASE)" >>\$(obj)/flags ifdef KBUILD_CFLAGS - @echo LINUX_CPPFLAGS="\$(KBUILD_CPPFLAGS)" | sed 's#Iinclude#I"\$(LINUXDIR)/include"#g'>>\$(obj)/flags - @echo LINUX_AFLAGS="\$(KBUILD_AFLAGS)" | sed 's#Iinclude#I"\$(OMK_LINUX_SRC)/include"#g'>>\$(obj)/flags - @echo LINUX_CFLAGS="\$(KBUILD_CFLAGS)" | sed 's#Iinclude#I"\$(OMK_LINUX_SRC)/include"#g'>>\$(obj)/flags + @echo LINUX_CPPFLAGS="\$(KBUILD_CPPFLAGS)" | sed 's#-I\(include\|arch\)#-I"\$(LINUXDIR)/\1"#g'>>\$(obj)/flags + @echo LINUX_AFLAGS="\$(KBUILD_AFLAGS)" | sed 's#-I\(include\|arch\)#-I"\$(OMK_LINUX_SRC)/\1"#g'>>\$(obj)/flags + @echo LINUX_CFLAGS="\$(KBUILD_CFLAGS)" | sed 's#-I\(include\|arch\)#-I"\$(OMK_LINUX_SRC)/\1"#g'>>\$(obj)/flags else @echo LINUX_CPPFLAGS="\$(CPPFLAGS)" | sed 's#Iinclude#I"\$(LINUXDIR)/include"#g'>>\$(obj)/flags @echo LINUX_AFLAGS="\$(AFLAGS)" | sed 's#Iinclude#I"\$(OMK_LINUX_SRC)/include"#g'>>\$(obj)/flags -- 2.39.2