* cross compile updates

This commit is contained in:
peter 2004-03-21 19:20:30 +00:00
parent 94ab3f4457
commit da906ff008
2 changed files with 55 additions and 220 deletions

126
Makefile
View File

@ -1,5 +1,5 @@
# #
# Don't edit, this file is generated by FPCMake Version 1.1 [2004/03/20] # Don't edit, this file is generated by FPCMake Version 1.1 [2004/03/21]
# #
default: help default: help
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
@ -208,7 +208,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
endif endif
PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
override PACKAGE_NAME=fpc override PACKAGE_NAME=fpc
override PACKAGE_VERSION=1.9.2 override PACKAGE_VERSION=1.9.4
ifndef inOS2 ifndef inOS2
override FPCDIR:=$(BASEDIR) override FPCDIR:=$(BASEDIR)
export FPCDIR export FPCDIR
@ -229,15 +229,11 @@ endif
ifeq ($(CPU_TARGET),arm) ifeq ($(CPU_TARGET),arm)
PPSUF=arm PPSUF=arm
endif endif
ifneq ($(OS_TARGET),$(OS_SOURCE)) ifdef CROSSCOMPILE
PPPRE=ppcross
else
ifneq ($(CPU_TARGET),$(CPU_SOURCE))
PPPRE=ppcross PPPRE=ppcross
else else
PPPRE=ppc PPPRE=ppc
endif endif
endif
PPNEW=$(BASEDIR)/compiler/$(PPPRE)$(PPSUF)$(SRCEXEEXT) PPNEW=$(BASEDIR)/compiler/$(PPPRE)$(PPSUF)$(SRCEXEEXT)
endif endif
ifneq ($(wildcard install),) ifneq ($(wildcard install),)
@ -254,55 +250,26 @@ ifdef SNAPSHOT
ALLTARGET=all ALLTARGET=all
else else
ifndef ALLTARGET ifndef ALLTARGET
ifeq ($(OS_TARGET),win32) SMARTTARGETS=win32 go32v2 linux freebsd netbsd openbsd
ALLTARGET=smart ifneq ($(findstring $(OS_TARGET),$(SMARTTARGETS)),)
else
ifeq ($(OS_TARGET),go32v2)
ALLTARGET=smart
else
ifeq ($(OS_TARGET),linux)
ALLTARGET=smart
else
ifeq ($(OS_TARGET),freebsd)
ALLTARGET=smart
else
ifeq ($(OS_TARGET),netbsd)
ALLTARGET=smart
else
ifeq ($(OS_TARGET),openbsd)
ALLTARGET=smart ALLTARGET=smart
else else
ALLTARGET=all ALLTARGET=all
endif endif
endif endif
endif endif
endif
endif
endif
endif
endif
ifdef SNAPSHOT ifdef SNAPSHOT
NOSTOP=- NOSTOP=-
else else
NOSTOP= NOSTOP=
endif endif
ifeq ($(OS_TARGET),linux) PKGUNITSPRELONGTARGETS=linux freebsd netbsd openbsd
PKGPRE=units ifneq ($(findstring $(OS_TARGET),$(PKGUNITSPRELONGTARGETS)),)
PKGUNITSPRE=units
else else
ifeq ($(OS_TARGET),freebsd) PKGUNITSPRE=u
PKGPRE=units
else
ifeq ($(OS_TARGET),netbsd)
PKGPRE=units
else
ifeq ($(OS_TARGET),openbsd)
PKGPRE=units
else
PKGPRE=u
endif
endif
endif
endif endif
PKGPRE=
override RELEASE=1 override RELEASE=1
export RELEASE export RELEASE
ifndef DIST_DESTDIR ifndef DIST_DESTDIR
@ -320,25 +287,13 @@ FPCMAKENEW=$(TEMPMAKENEW)
CLEANOPTS=FPC=$(PPNEW) CLEANOPTS=FPC=$(PPNEW)
BUILDOPTS=FPC=$(PPNEW) RELEASE=1 BUILDOPTS=FPC=$(PPNEW) RELEASE=1
INSTALLOPTS=FPC=$(PPNEW) ZIPDESTDIR=$(BASEDIR) FPCMAKE=$(FPCMAKENEW) INSTALLOPTS=FPC=$(PPNEW) ZIPDESTDIR=$(BASEDIR) FPCMAKE=$(FPCMAKENEW)
ifndef CROSSCOMPILE
ifneq ($(wildcard ide),) ifneq ($(wildcard ide),)
ifneq ($(wildcard fv),) ifneq ($(wildcard fv),)
ifeq ($(OS_TARGET),go32v2) IDETARGETS=go32v2 win32 linux freebsd os2 emx
ifneq ($(findstring $(OS_TARGET),$(IDETARGETS)),)
IDE=1 IDE=1
endif endif
ifeq ($(OS_TARGET),win32)
IDE=1
endif
ifeq ($(OS_TARGET),linux)
IDE=1
endif
ifeq ($(OS_TARGET),freebsd)
IDE=1
endif
ifeq ($(OS_TARGET),os2)
IDE=1
endif
ifeq ($(OS_TARGET),emx)
IDE=1
endif endif
endif endif
endif endif
@ -2106,12 +2061,12 @@ ifdef IDE
$(NOSTOP)$(MAKE) ide_$(INSTALLTARGET) $(BUILDOPTS) $(NOSTOP)$(MAKE) ide_$(INSTALLTARGET) $(BUILDOPTS)
endif endif
zipinstall: build-stamp.$(OS_TARGET) zipinstall: build-stamp.$(OS_TARGET)
$(MAKE) fpc_zipinstall ZIPTARGET=installbase ZIPNAME=base$(ZIPSUFFIX) $(INSTALLOPTS) $(MAKE) fpc_zipinstall ZIPTARGET=installbase ZIPNAME=$(PKGPRE)base$(ZIPSUFFIX) $(INSTALLOPTS)
$(MAKE) packages_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGPRE) $(MAKE) packages_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGPRE)$(PKGUNITSPRE)
$(MAKE) fcl_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGPRE) $(MAKE) fcl_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGPRE)$(PKGUNITSPRE)
$(MAKE) utils_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=util$(ZIPSUFFIX) $(MAKE) utils_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=$(PKGPRE)util$(ZIPSUFFIX)
ifdef IDE ifdef IDE
$(NOSTOP)$(MAKE) ide_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=ide$(ZIPSUFFIX) $(NOSTOP)$(MAKE) ide_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=$(PKGPRE)ide$(ZIPSUFFIX)
endif endif
.PHONY: docspdf docs docsrcinstall docsrc .PHONY: docspdf docs docsrcinstall docsrc
DOCSOURCEDIR=$(INSTALL_SOURCEDIR)/../docs DOCSOURCEDIR=$(INSTALL_SOURCEDIR)/../docs
@ -2154,54 +2109,21 @@ sourcezip:
$(MAKE) fpc_zipinstall ZIPTARGET=sourcebase ZIPNAME=basesrc $(MAKE) fpc_zipinstall ZIPTARGET=sourcebase ZIPNAME=basesrc
$(MAKE) compiler_zipsourceinstall $(MAKE) compiler_zipsourceinstall
$(MAKE) rtl_zipsourceinstall $(MAKE) rtl_zipsourceinstall
$(MAKE) packages_zipsourceinstall ZIPPREFIX=$(PKGPRE) $(MAKE) packages_zipsourceinstall ZIPPREFIX=$(PKGUNITSPRE)
$(MAKE) fcl_zipsourceinstall $(MAKE) fcl_zipsourceinstall
$(MAKE) utils_zipsourceinstall $(MAKE) utils_zipsourceinstall
$(MAKE) ide_zipsourceinstall $(MAKE) ide_zipsourceinstall
$(MAKE) installer_zipsourceinstall $(MAKE) installer_zipsourceinstall
BUILDTARGETS=go32v2 win32 linux freebsd netbsd openbsd os2 emx sunos qnx beos
.PHONY: go32v2 win32 linux freebsd os2 emx netbsd openbsd go32v2zip win32zip linuxzip freebsdzip os2zip emxzip netbsdzip openbsdzip .PHONY: go32v2 win32 linux freebsd os2 emx netbsd openbsd go32v2zip win32zip linuxzip freebsdzip os2zip emxzip netbsdzip openbsdzip
go32v2: checkfpcdir $(BUILDTARGETS): checkfpcdir
$(MAKE) install OS_TARGET=go32v2 $(MAKE) install OS_TARGET=$@
win32: checkfpcdir $(addsuffix zip,$(filter-out beos sunos,$(BUILDTARGETS))): checkfpcdir
$(MAKE) install OS_TARGET=win32 $(MAKE) zipinstall OS_TARGET=$(subst zip,,$@)
linux: checkfpcdir
$(MAKE) install OS_TARGET=linux
freebsd: checkfpcdir
$(MAKE) install OS_TARGET=freebsd
netbsd: checkfpcdir
$(MAKE) install OS_TARGET=netbsd
openbsd: checkfpcdir
$(MAKE) install OS_TARGET=openbsd
os2: checkfpcdir
$(MAKE) install OS_TARGET=os2
emx: checkfpcdir
$(MAKE) install OS_TARGET=emx
sunos: checkfpcdir
$(MAKE) install OS_TARGET=sunos
go32v2zip: checkfpcdir
$(MAKE) zipinstall OS_TARGET=go32v2
win32zip: checkfpcdir
$(MAKE) zipinstall OS_TARGET=win32
linuxzip: checkfpcdir
$(MAKE) zipinstall OS_TARGET=linux
freebsdzip : checkfpcdir
$(MAKE) zipinstall OS_TARGET=freebsd
netbsdzip : checkfpcdir
$(MAKE) zipinstall OS_TARGET=netbsd
openbsdzip : checkfpcdir
$(MAKE) zipinstall OS_TARGET=openbsd
beoszip : checkfpcdir beoszip : checkfpcdir
$(MAKE) zipinstall OS_TARGET=beos USEZIP=1 $(MAKE) zipinstall OS_TARGET=beos USEZIP=1
os2zip: checkfpcdir
$(MAKE) zipinstall OS_TARGET=os2
emxzip: checkfpcdir
$(MAKE) zipinstall OS_TARGET=emx
sunoszip: checkfpcdir sunoszip: checkfpcdir
$(MAKE) zipinstall OS_TARGET=sunos TARPROG=gtar $(MAKE) zipinstall OS_TARGET=sunos TARPROG=gtar
qnxzip: checkfpcdir
$(MAKE) zipinstall OS_TARGET=qnx
amigazip: checkfpcdir
$(MAKE) zipinstall OS_TARGET=amiga
.PHONY: renametoshort shortsrc shortbin shortnames .PHONY: renametoshort shortsrc shortbin shortnames
renametoshort: renametoshort:
-mv compiler$(ZIPSUFFIX).zip comp$(ZIPSUFFIX).zip -mv compiler$(ZIPSUFFIX).zip comp$(ZIPSUFFIX).zip

View File

@ -4,7 +4,7 @@
[package] [package]
name=fpc name=fpc
version=1.9.2 version=1.9.4
[target] [target]
dirs=compiler rtl utils fcl fv packages ide installer dirs=compiler rtl utils fcl fv packages ide installer
@ -42,15 +42,11 @@ PPSUF=arm
endif endif
# cross compilers uses full cpu_target, not just ppc-suffix. # cross compilers uses full cpu_target, not just ppc-suffix.
ifneq ($(OS_TARGET),$(OS_SOURCE)) ifdef CROSSCOMPILE
PPPRE=ppcross
else
ifneq ($(CPU_TARGET),$(CPU_SOURCE))
PPPRE=ppcross PPPRE=ppcross
else else
PPPRE=ppc PPPRE=ppc
endif endif
endif
PPNEW=$(BASEDIR)/compiler/$(PPPRE)$(PPSUF)$(SRCEXEEXT) PPNEW=$(BASEDIR)/compiler/$(PPPRE)$(PPSUF)$(SRCEXEEXT)
endif endif
@ -74,33 +70,14 @@ ifdef SNAPSHOT
ALLTARGET=all ALLTARGET=all
else else
ifndef ALLTARGET ifndef ALLTARGET
ifeq ($(OS_TARGET),win32) SMARTTARGETS=win32 go32v2 linux freebsd netbsd openbsd
ALLTARGET=smart ifneq ($(findstring $(OS_TARGET),$(SMARTTARGETS)),)
else
ifeq ($(OS_TARGET),go32v2)
ALLTARGET=smart
else
ifeq ($(OS_TARGET),linux)
ALLTARGET=smart
else
ifeq ($(OS_TARGET),freebsd)
ALLTARGET=smart
else
ifeq ($(OS_TARGET),netbsd)
ALLTARGET=smart
else
ifeq ($(OS_TARGET),openbsd)
ALLTARGET=smart ALLTARGET=smart
else else
ALLTARGET=all ALLTARGET=all
endif endif
endif endif
endif endif
endif
endif
endif
endif
endif
# Stop with an error? # Stop with an error?
ifdef SNAPSHOT ifdef SNAPSHOT
@ -110,24 +87,20 @@ NOSTOP=
endif endif
# Prefix for units # Prefix for units
ifeq ($(OS_TARGET),linux) PKGUNITSPRELONGTARGETS=linux freebsd netbsd openbsd
PKGPRE=units ifneq ($(findstring $(OS_TARGET),$(PKGUNITSPRELONGTARGETS)),)
PKGUNITSPRE=units
else else
ifeq ($(OS_TARGET),freebsd) PKGUNITSPRE=u
PKGPRE=units
else
ifeq ($(OS_TARGET),netbsd)
PKGPRE=units
else
ifeq ($(OS_TARGET),openbsd)
PKGPRE=units
else
PKGPRE=u
endif
endif
endif
endif endif
# Cross compile needs a prefix to not conflict with original packages
#ifdef CROSSCOMPILE
#PKGPRE=$(FULL_TARGET)-
#else
PKGPRE=
#endif
# Always compile for release # Always compile for release
override RELEASE=1 override RELEASE=1
export RELEASE export RELEASE
@ -156,26 +129,14 @@ BUILDOPTS=FPC=$(PPNEW) RELEASE=1
INSTALLOPTS=FPC=$(PPNEW) ZIPDESTDIR=$(BASEDIR) FPCMAKE=$(FPCMAKENEW) INSTALLOPTS=FPC=$(PPNEW) ZIPDESTDIR=$(BASEDIR) FPCMAKE=$(FPCMAKENEW)
# Compile also IDE (check for ide and fv dir) # Compile also IDE (check for ide and fv dir)
# Skipped by default for cross compiles, because it depends on libc
ifndef CROSSCOMPILE
ifneq ($(wildcard ide),) ifneq ($(wildcard ide),)
ifneq ($(wildcard fv),) ifneq ($(wildcard fv),)
ifeq ($(OS_TARGET),go32v2) IDETARGETS=go32v2 win32 linux freebsd os2 emx
ifneq ($(findstring $(OS_TARGET),$(IDETARGETS)),)
IDE=1 IDE=1
endif endif
ifeq ($(OS_TARGET),win32)
IDE=1
endif
ifeq ($(OS_TARGET),linux)
IDE=1
endif
# is now doable too.
ifeq ($(OS_TARGET),freebsd)
IDE=1
endif
ifeq ($(OS_TARGET),os2)
IDE=1
endif
ifeq ($(OS_TARGET),emx)
IDE=1
endif endif
endif endif
endif endif
@ -356,12 +317,12 @@ ifdef IDE
endif endif
zipinstall: build-stamp.$(OS_TARGET) zipinstall: build-stamp.$(OS_TARGET)
$(MAKE) fpc_zipinstall ZIPTARGET=installbase ZIPNAME=base$(ZIPSUFFIX) $(INSTALLOPTS) $(MAKE) fpc_zipinstall ZIPTARGET=installbase ZIPNAME=$(PKGPRE)base$(ZIPSUFFIX) $(INSTALLOPTS)
$(MAKE) packages_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGPRE) $(MAKE) packages_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGPRE)$(PKGUNITSPRE)
$(MAKE) fcl_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGPRE) $(MAKE) fcl_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGPRE)$(PKGUNITSPRE)
$(MAKE) utils_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=util$(ZIPSUFFIX) $(MAKE) utils_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=$(PKGPRE)util$(ZIPSUFFIX)
ifdef IDE ifdef IDE
$(NOSTOP)$(MAKE) ide_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=ide$(ZIPSUFFIX) $(NOSTOP)$(MAKE) ide_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=$(PKGPRE)ide$(ZIPSUFFIX)
endif endif
@ -437,7 +398,7 @@ sourcezip:
$(MAKE) fpc_zipinstall ZIPTARGET=sourcebase ZIPNAME=basesrc $(MAKE) fpc_zipinstall ZIPTARGET=sourcebase ZIPNAME=basesrc
$(MAKE) compiler_zipsourceinstall $(MAKE) compiler_zipsourceinstall
$(MAKE) rtl_zipsourceinstall $(MAKE) rtl_zipsourceinstall
$(MAKE) packages_zipsourceinstall ZIPPREFIX=$(PKGPRE) $(MAKE) packages_zipsourceinstall ZIPPREFIX=$(PKGUNITSPRE)
$(MAKE) fcl_zipsourceinstall $(MAKE) fcl_zipsourceinstall
$(MAKE) utils_zipsourceinstall $(MAKE) utils_zipsourceinstall
$(MAKE) ide_zipsourceinstall $(MAKE) ide_zipsourceinstall
@ -448,70 +409,22 @@ sourcezip:
# OS targets # OS targets
########################################################################## ##########################################################################
BUILDTARGETS=go32v2 win32 linux freebsd netbsd openbsd os2 emx sunos qnx beos
.PHONY: go32v2 win32 linux freebsd os2 emx netbsd openbsd go32v2zip win32zip linuxzip freebsdzip os2zip emxzip netbsdzip openbsdzip .PHONY: go32v2 win32 linux freebsd os2 emx netbsd openbsd go32v2zip win32zip linuxzip freebsdzip os2zip emxzip netbsdzip openbsdzip
go32v2: checkfpcdir $(BUILDTARGETS): checkfpcdir
$(MAKE) install OS_TARGET=go32v2 $(MAKE) install OS_TARGET=$@
win32: checkfpcdir $(addsuffix zip,$(filter-out beos sunos,$(BUILDTARGETS))): checkfpcdir
$(MAKE) install OS_TARGET=win32 $(MAKE) zipinstall OS_TARGET=$(subst zip,,$@)
linux: checkfpcdir
$(MAKE) install OS_TARGET=linux
freebsd: checkfpcdir
$(MAKE) install OS_TARGET=freebsd
netbsd: checkfpcdir
$(MAKE) install OS_TARGET=netbsd
openbsd: checkfpcdir
$(MAKE) install OS_TARGET=openbsd
os2: checkfpcdir
$(MAKE) install OS_TARGET=os2
emx: checkfpcdir
$(MAKE) install OS_TARGET=emx
sunos: checkfpcdir
$(MAKE) install OS_TARGET=sunos
go32v2zip: checkfpcdir
$(MAKE) zipinstall OS_TARGET=go32v2
win32zip: checkfpcdir
$(MAKE) zipinstall OS_TARGET=win32
linuxzip: checkfpcdir
$(MAKE) zipinstall OS_TARGET=linux
freebsdzip : checkfpcdir
$(MAKE) zipinstall OS_TARGET=freebsd
netbsdzip : checkfpcdir
$(MAKE) zipinstall OS_TARGET=netbsd
openbsdzip : checkfpcdir
$(MAKE) zipinstall OS_TARGET=openbsd
beoszip : checkfpcdir beoszip : checkfpcdir
$(MAKE) zipinstall OS_TARGET=beos USEZIP=1 $(MAKE) zipinstall OS_TARGET=beos USEZIP=1
os2zip: checkfpcdir
$(MAKE) zipinstall OS_TARGET=os2
emxzip: checkfpcdir
$(MAKE) zipinstall OS_TARGET=emx
sunoszip: checkfpcdir sunoszip: checkfpcdir
$(MAKE) zipinstall OS_TARGET=sunos TARPROG=gtar $(MAKE) zipinstall OS_TARGET=sunos TARPROG=gtar
qnxzip: checkfpcdir
$(MAKE) zipinstall OS_TARGET=qnx
amigazip: checkfpcdir
$(MAKE) zipinstall OS_TARGET=amiga
########################################################################## ##########################################################################
# Dos, OS/2 Short 8.3 Names # Dos, OS/2 Short 8.3 Names