* Added the FPCFPMAKE define which by default contains a compiler which

is build to compile for the target the system is running on. So that the
   fpmake files can be compiled for the native system while cross-compiling
 * Re-generated root and packages Makefile

git-svn-id: trunk@17356 -
This commit is contained in:
joost 2011-04-21 11:13:08 +00:00
parent 983c3633cd
commit a0f2ed6a13
4 changed files with 2535 additions and 2405 deletions

View File

@ -1,8 +1,8 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/12/14]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/04/21]
#
default: help
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
BSDs = freebsd netbsd openbsd darwin
UNIXs = linux $(BSDs) solaris qnx haiku
LIMIT83fs = go32v2 os2 emx watcom
@ -107,23 +107,42 @@ FPC=$(PP)
endif
endif
ifndef FPC
DETERMINE_NATIVE_COMPILER=1
else
ifdef CROSSCOMPILE
ifndef FPCFPMAKE
DETERMINE_NATIVE_COMPILER=1
endif
endif
endif
ifdef DETERMINE_NATIVE_COMPILER
FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH))))
ifneq ($(FPCPROG),)
FPCPROG:=$(firstword $(FPCPROG))
ifneq ($(CPU_TARGET),)
FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB)
FPCNATIVE:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB)
else
FPC:=$(shell $(FPCPROG) -PB)
FPCNATIVE:=$(shell $(FPCPROG) -PB)
endif
ifneq ($(findstring Error,$(FPC)),)
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
ifneq ($(findstring Error,$(FPCNATIVE)),)
override FPCNATIVE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
else
ifeq ($(strip $(wildcard $(FPC))),)
FPC:=$(firstword $(FPCPROG))
ifeq ($(strip $(wildcard $(FPCNATIVE))),)
FPCNATIVE:=$(firstword $(FPCPROG))
endif
endif
else
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
override FPCNATIVE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
endif
endif
ifndef FPC
FPC=$(FPCNATIVE)
endif
ifndef FPCFPMAKE
ifdef CROSSOMPILE
FPCFPMAKE=$(FPCNATIVE)
else
FPCFPMAKE=$(FPC)
endif
endif
override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
@ -141,7 +160,7 @@ endif
ifndef FPC_VERSION
FPC_VERSION:=$(word 1,$(FPC_COMPILERINFO))
endif
export FPC FPC_VERSION FPC_COMPILERINFO
export FPC FPCFPMAKE FPC_VERSION FPC_COMPILERINFO
unexport CHECKDEPEND ALLDEPENDENCIES
ifndef CPU_TARGET
ifdef CPU_TARGET_DEFAULT
@ -482,6 +501,9 @@ endif
ifeq ($(FULL_TARGET),powerpc-embedded)
override TARGET_DIRS+=compiler rtl utils packages ide installer
endif
ifeq ($(FULL_TARGET),powerpc-wii)
override TARGET_DIRS+=compiler rtl utils packages ide installer
endif
ifeq ($(FULL_TARGET),sparc-linux)
override TARGET_DIRS+=compiler rtl utils packages ide installer
endif
@ -904,6 +926,11 @@ ifeq ($(OS_TARGET),NativeNT)
SHAREDLIBEXT=.dll
SHORTSUFFIX=nativent
endif
ifeq ($(OS_TARGET),wii)
EXEEXT=.dol
SHAREDLIBEXT=.so
SHORTSUFFIX=wii
endif
else
ifeq ($(OS_TARGET),go32v1)
PPUEXT=.pp1
@ -1733,6 +1760,7 @@ fpc_baseinfo:
@$(ECHO) Full Target.. $(FULL_TARGET)
@$(ECHO) SourceSuffix. $(SOURCESUFFIX)
@$(ECHO) TargetSuffix. $(TARGETSUFFIX)
@$(ECHO) FPC fpmake... $(FPCFPMAKE)
@$(ECHO)
@$(ECHO) == Directory info ==
@$(ECHO)
@ -2116,6 +2144,14 @@ TARGET_DIRS_PACKAGES=1
TARGET_DIRS_IDE=1
TARGET_DIRS_INSTALLER=1
endif
ifeq ($(FULL_TARGET),powerpc-wii)
TARGET_DIRS_COMPILER=1
TARGET_DIRS_RTL=1
TARGET_DIRS_UTILS=1
TARGET_DIRS_PACKAGES=1
TARGET_DIRS_IDE=1
TARGET_DIRS_INSTALLER=1
endif
ifeq ($(FULL_TARGET),sparc-linux)
TARGET_DIRS_COMPILER=1
TARGET_DIRS_RTL=1

View File

@ -1,8 +1,8 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/02/07]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/04/21]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
BSDs = freebsd netbsd openbsd darwin
UNIXs = linux $(BSDs) solaris qnx haiku
LIMIT83fs = go32v2 os2 emx watcom
@ -107,23 +107,42 @@ FPC=$(PP)
endif
endif
ifndef FPC
DETERMINE_NATIVE_COMPILER=1
else
ifdef CROSSCOMPILE
ifndef FPCFPMAKE
DETERMINE_NATIVE_COMPILER=1
endif
endif
endif
ifdef DETERMINE_NATIVE_COMPILER
FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH))))
ifneq ($(FPCPROG),)
FPCPROG:=$(firstword $(FPCPROG))
ifneq ($(CPU_TARGET),)
FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB)
FPCNATIVE:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB)
else
FPC:=$(shell $(FPCPROG) -PB)
FPCNATIVE:=$(shell $(FPCPROG) -PB)
endif
ifneq ($(findstring Error,$(FPC)),)
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
ifneq ($(findstring Error,$(FPCNATIVE)),)
override FPCNATIVE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
else
ifeq ($(strip $(wildcard $(FPC))),)
FPC:=$(firstword $(FPCPROG))
ifeq ($(strip $(wildcard $(FPCNATIVE))),)
FPCNATIVE:=$(firstword $(FPCPROG))
endif
endif
else
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
override FPCNATIVE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
endif
endif
ifndef FPC
FPC=$(FPCNATIVE)
endif
ifndef FPCFPMAKE
ifdef CROSSOMPILE
FPCFPMAKE=$(FPCNATIVE)
else
FPCFPMAKE=$(FPC)
endif
endif
override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
@ -141,7 +160,7 @@ endif
ifndef FPC_VERSION
FPC_VERSION:=$(word 1,$(FPC_COMPILERINFO))
endif
export FPC FPC_VERSION FPC_COMPILERINFO
export FPC FPCFPMAKE FPC_VERSION FPC_COMPILERINFO
unexport CHECKDEPEND ALLDEPENDENCIES
ifndef CPU_TARGET
ifdef CPU_TARGET_DEFAULT
@ -375,6 +394,9 @@ endif
ifeq ($(FULL_TARGET),powerpc-embedded)
override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json fcl-js fcl-process unzip regexpr chm fcl-res libgd symbolic bzip2 hermes
endif
ifeq ($(FULL_TARGET),powerpc-wii)
override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json fcl-js fcl-process unzip regexpr chm fcl-res libgd symbolic bzip2 hermes libogcfpc
endif
ifeq ($(FULL_TARGET),sparc-linux)
override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json fcl-js fcl-process unzip regexpr chm fcl-res libgd symbolic bzip2 hermes fv fcl-web fastcgi fcl-async ibase mysql ncurses unzip zlib oracle dbus odbc postgres sqlite pthreads imagemagick gdbint libpng x11 uuid ldap modplug dts mad gdbm tcl syslog libcurl opengl opencl cairo gtk1 gtk2 librsvg a52 bfd aspell svgalib newt cdrom users iconvenc libxml proj4 fcl-extra zorba imlib utmp fpgtk openal lua oggvorbis xforms fftw pcap ggi sdl openssl gnome1 httpd13 httpd20 httpd22 pxlib numlib gmp libsee ptc graph
endif
@ -798,6 +820,11 @@ ifeq ($(OS_TARGET),NativeNT)
SHAREDLIBEXT=.dll
SHORTSUFFIX=nativent
endif
ifeq ($(OS_TARGET),wii)
EXEEXT=.dol
SHAREDLIBEXT=.so
SHORTSUFFIX=wii
endif
else
ifeq ($(OS_TARGET),go32v1)
PPUEXT=.pp1
@ -1471,6 +1498,7 @@ fpc_baseinfo:
@$(ECHO) Full Target.. $(FULL_TARGET)
@$(ECHO) SourceSuffix. $(SOURCESUFFIX)
@$(ECHO) TargetSuffix. $(TARGETSUFFIX)
@$(ECHO) FPC fpmake... $(FPCFPMAKE)
@$(ECHO)
@$(ECHO) == Directory info ==
@$(ECHO)
@ -3378,6 +3406,32 @@ TARGET_DIRS_SYMBOLIC=1
TARGET_DIRS_BZIP2=1
TARGET_DIRS_HERMES=1
endif
ifeq ($(FULL_TARGET),powerpc-wii)
TARGET_DIRS_HASH=1
TARGET_DIRS_PASJPEG=1
TARGET_DIRS_PASZLIB=1
TARGET_DIRS_FPMKUNIT=1
TARGET_DIRS_FCL-XML=1
TARGET_DIRS_FCL-BASE=1
TARGET_DIRS_FCL-DB=1
TARGET_DIRS_FCL-IMAGE=1
TARGET_DIRS_FCL-NET=1
TARGET_DIRS_FCL-PASSRC=1
TARGET_DIRS_FCL-REGISTRY=1
TARGET_DIRS_FCL-FPCUNIT=1
TARGET_DIRS_FCL-JSON=1
TARGET_DIRS_FCL-JS=1
TARGET_DIRS_FCL-PROCESS=1
TARGET_DIRS_UNZIP=1
TARGET_DIRS_REGEXPR=1
TARGET_DIRS_CHM=1
TARGET_DIRS_FCL-RES=1
TARGET_DIRS_LIBGD=1
TARGET_DIRS_SYMBOLIC=1
TARGET_DIRS_BZIP2=1
TARGET_DIRS_HERMES=1
TARGET_DIRS_LIBOGCFPC=1
endif
ifeq ($(FULL_TARGET),sparc-linux)
TARGET_DIRS_HASH=1
TARGET_DIRS_PASJPEG=1
@ -9440,6 +9494,51 @@ palmunits:
$(MAKE) -C palmunits all
.PHONY: palmunits_all palmunits_debug palmunits_smart palmunits_release palmunits_units palmunits_examples palmunits_shared palmunits_install palmunits_sourceinstall palmunits_exampleinstall palmunits_distinstall palmunits_zipinstall palmunits_zipsourceinstall palmunits_zipexampleinstall palmunits_zipdistinstall palmunits_clean palmunits_distclean palmunits_cleanall palmunits_info palmunits_makefiles palmunits
endif
ifdef TARGET_DIRS_LIBOGCFPC
libogcfpc_all:
$(MAKE) -C libogcfpc all
libogcfpc_debug:
$(MAKE) -C libogcfpc debug
libogcfpc_smart:
$(MAKE) -C libogcfpc smart
libogcfpc_release:
$(MAKE) -C libogcfpc release
libogcfpc_units:
$(MAKE) -C libogcfpc units
libogcfpc_examples:
$(MAKE) -C libogcfpc examples
libogcfpc_shared:
$(MAKE) -C libogcfpc shared
libogcfpc_install:
$(MAKE) -C libogcfpc install
libogcfpc_sourceinstall:
$(MAKE) -C libogcfpc sourceinstall
libogcfpc_exampleinstall:
$(MAKE) -C libogcfpc exampleinstall
libogcfpc_distinstall:
$(MAKE) -C libogcfpc distinstall
libogcfpc_zipinstall:
$(MAKE) -C libogcfpc zipinstall
libogcfpc_zipsourceinstall:
$(MAKE) -C libogcfpc zipsourceinstall
libogcfpc_zipexampleinstall:
$(MAKE) -C libogcfpc zipexampleinstall
libogcfpc_zipdistinstall:
$(MAKE) -C libogcfpc zipdistinstall
libogcfpc_clean:
$(MAKE) -C libogcfpc clean
libogcfpc_distclean:
$(MAKE) -C libogcfpc distclean
libogcfpc_cleanall:
$(MAKE) -C libogcfpc cleanall
libogcfpc_info:
$(MAKE) -C libogcfpc info
libogcfpc_makefiles:
$(MAKE) -C libogcfpc makefiles
libogcfpc:
$(MAKE) -C libogcfpc all
.PHONY: libogcfpc_all libogcfpc_debug libogcfpc_smart libogcfpc_release libogcfpc_units libogcfpc_examples libogcfpc_shared libogcfpc_install libogcfpc_sourceinstall libogcfpc_exampleinstall libogcfpc_distinstall libogcfpc_zipinstall libogcfpc_zipsourceinstall libogcfpc_zipexampleinstall libogcfpc_zipdistinstall libogcfpc_clean libogcfpc_distclean libogcfpc_cleanall libogcfpc_info libogcfpc_makefiles libogcfpc
endif
all: $(addsuffix _all,$(TARGET_DIRS))
debug: $(addsuffix _debug,$(TARGET_DIRS))
smart: $(addsuffix _smart,$(TARGET_DIRS))

File diff suppressed because it is too large Load Diff

View File

@ -160,33 +160,60 @@ FPC=$(PP)
endif
endif
# The compiler to compile for the current system has to be determined
# in case FPC is not defined, or when FPC is defined but a crossinstall
# is performed. (This is to compile fpmake files)
ifndef FPC
DETERMINE_NATIVE_COMPILER=1
else
ifdef CROSSCOMPILE
ifndef FPCFPMAKE
DETERMINE_NATIVE_COMPILER=1
endif
endif
endif
# Try to detect the ppcXXX file to use by using "fpc -PB" option
# to query for the default ppcXXX the fpc executable tries. When
# fpc is not found use ppc386 by default. Also when fpc -PB gives
# an error ppc386 will be used.
ifndef FPC
ifdef DETERMINE_NATIVE_COMPILER
# check if fpc exists
FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH))))
ifneq ($(FPCPROG),)
FPCPROG:=$(firstword $(FPCPROG))
ifneq ($(CPU_TARGET),)
FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB)
FPCNATIVE:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB)
else
FPC:=$(shell $(FPCPROG) -PB)
FPCNATIVE:=$(shell $(FPCPROG) -PB)
endif
# Older fpc executables didn't support it and return
# Error: Illegal processor... If found then fallback to ppc386
ifneq ($(findstring Error,$(FPC)),)
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
ifneq ($(findstring Error,$(FPCNATIVE)),)
override FPCNATIVE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
else
# if the cross compiler is not found, fall back to fpc
ifeq ($(strip $(wildcard $(FPC))),)
FPC:=$(firstword $(FPCPROG))
ifeq ($(strip $(wildcard $(FPCNATIVE))),)
FPCNATIVE:=$(firstword $(FPCPROG))
endif
endif
else
# fpc binary not found, fallback to ppc386
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
override FPCNATIVE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
endif
endif
# If FPC is not set, use the native compiler.
ifndef FPC
FPC=$(FPCNATIVE)
endif
# If FPCFPMAKE is not set and we're cross-compiling, use the native compiler.
ifndef FPCFPMAKE
ifdef CROSSOMPILE
FPCFPMAKE=$(FPCNATIVE)
else
FPCFPMAKE=$(FPC)
endif
endif
@ -215,7 +242,7 @@ ifndef FPC_VERSION
FPC_VERSION:=$(word 1,$(FPC_COMPILERINFO))
endif
export FPC FPC_VERSION FPC_COMPILERINFO
export FPC FPCFPMAKE FPC_VERSION FPC_COMPILERINFO
# CHECKDEPEND should not be exported
# This should limit multiple checks
unexport CHECKDEPEND ALLDEPENDENCIES
@ -2099,6 +2126,7 @@ fpc_baseinfo:
@$(ECHO) Full Target.. $(FULL_TARGET)
@$(ECHO) SourceSuffix. $(SOURCESUFFIX)
@$(ECHO) TargetSuffix. $(TARGETSUFFIX)
@$(ECHO) FPC fpmake... $(FPCFPMAKE)
@$(ECHO)
@$(ECHO) == Directory info ==
@$(ECHO)