--- fpc-2.2.2.orig/demo/Makefile +++ fpc-2.2.2/demo/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_DIRS+=text endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_DIRS+=text -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_DIRS+=text endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_DIRS+=text freebsd unix graph lister endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_DIRS+=text -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_DIRS+=text endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_DIRS+=text endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_DIRS+=text -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_DIRS+=text endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=text linux unix graph lister endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_DIRS+=text -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_DIRS+=text endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_DIRS+=text -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_DIRS+=text linux unix graph lister -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_DIRS+=text -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -724,11 +675,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1188,20 +1134,20 @@ TAREXT=.tar.gz endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1333,13 +1279,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif ifdef TARGET_RSTS override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS)) override CLEANRSTFILES+=$(RSTFILES) @@ -1481,12 +1423,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) @@ -1706,9 +1644,6 @@ ifeq ($(FULL_TARGET),i386-beos) TARGET_DIRS_TEXT=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -TARGET_DIRS_TEXT=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) TARGET_DIRS_TEXT=1 endif @@ -1838,9 +1773,6 @@ TARGET_DIRS_GRAPH=1 TARGET_DIRS_LISTER=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_DIRS_TEXT=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) TARGET_DIRS_TEXT=1 endif @@ -1857,9 +1789,6 @@ ifeq ($(FULL_TARGET),arm-palmos) TARGET_DIRS_TEXT=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_DIRS_TEXT=1 -endif ifeq ($(FULL_TARGET),arm-wince) TARGET_DIRS_TEXT=1 endif @@ -1882,25 +1811,9 @@ TARGET_DIRS_GRAPH=1 TARGET_DIRS_LISTER=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_DIRS_TEXT=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) TARGET_DIRS_TEXT=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -TARGET_DIRS_TEXT=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -TARGET_DIRS_TEXT=1 -TARGET_DIRS_LINUX=1 -TARGET_DIRS_UNIX=1 -TARGET_DIRS_GRAPH=1 -TARGET_DIRS_LISTER=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -TARGET_DIRS_TEXT=1 -endif ifdef TARGET_DIRS_TEXT text_all: $(MAKE) -C text all --- fpc-2.2.2.orig/demo/unix/Makefile +++ fpc-2.2.2/demo/unix/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -276,9 +248,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=cgibmp daemon endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=cgibmp daemon -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=cgibmp daemon endif @@ -381,9 +350,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=cgibmp daemon endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=cgibmp daemon -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=cgibmp daemon endif @@ -396,9 +362,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=cgibmp daemon endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=cgibmp daemon -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=cgibmp daemon endif @@ -417,21 +380,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=cgibmp daemon endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=cgibmp daemon -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=cgibmp daemon endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=cgibmp daemon -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=cgibmp daemon -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=cgibmp daemon -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -721,11 +672,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1203,9 +1149,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1308,9 +1251,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1323,9 +1263,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1344,21 +1281,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1386,20 +1311,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1531,13 +1456,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/demo/netwlibc/Makefile +++ fpc-2.2.2/demo/netwlibc/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -551,11 +523,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1033,9 +1000,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1138,9 +1102,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1153,9 +1114,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1174,21 +1132,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1216,20 +1162,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1361,13 +1307,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/demo/graph/Makefile +++ fpc-2.2.2/demo/graph/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -279,9 +251,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars endif @@ -384,9 +353,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars endif @@ -399,9 +365,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars endif @@ -420,21 +383,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_UNITS+=gameunit endif @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=gameunit endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=gameunit -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=gameunit endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=gameunit endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=gameunit -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=gameunit endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=gameunit endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=gameunit -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=gameunit endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=gameunit endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=gameunit -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=gameunit endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=gameunit -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=gameunit -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=gameunit -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -898,11 +828,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1380,9 +1305,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1485,9 +1407,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1500,9 +1419,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1521,21 +1437,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1563,20 +1467,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1708,15 +1612,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/demo/win32/Makefile +++ fpc-2.2.2/demo/win32/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -550,11 +522,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1032,9 +999,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1137,9 +1101,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1152,9 +1113,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1173,21 +1131,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1215,20 +1161,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1360,13 +1306,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/demo/text/Makefile +++ fpc-2.2.2/demo/text/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -276,9 +248,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines endif @@ -381,9 +350,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines endif @@ -396,9 +362,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines endif @@ -417,21 +380,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -721,11 +672,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1203,9 +1149,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1308,9 +1251,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1323,9 +1263,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1344,21 +1281,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1386,20 +1311,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1531,13 +1456,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/demo/freebsd/Makefile +++ fpc-2.2.2/demo/freebsd/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -276,9 +248,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile endif @@ -381,9 +350,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile endif @@ -396,9 +362,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile endif @@ -417,21 +380,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -721,11 +672,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1203,9 +1149,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1308,9 +1251,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1323,9 +1263,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1344,21 +1281,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1386,20 +1311,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1531,13 +1456,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/demo/modex/Makefile +++ fpc-2.2.2/demo/modex/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -550,11 +522,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1032,9 +999,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1137,9 +1101,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1152,9 +1113,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1173,21 +1131,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1215,20 +1161,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1360,13 +1306,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/demo/netware/Makefile +++ fpc-2.2.2/demo/netware/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -550,11 +522,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1032,9 +999,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1137,9 +1101,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1152,9 +1113,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1173,21 +1131,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1215,20 +1161,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1360,13 +1306,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/demo/os2/Makefile +++ fpc-2.2.2/demo/os2/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -550,11 +522,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1032,9 +999,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1137,9 +1101,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1152,9 +1113,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1173,21 +1131,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1215,20 +1161,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1360,13 +1306,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/demo/linux/Makefile +++ fpc-2.2.2/demo/linux/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -279,9 +251,6 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=epoll-pipe endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=epoll-pipe -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -571,11 +540,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1053,9 +1017,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1158,9 +1119,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1173,9 +1131,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1194,21 +1149,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1236,20 +1179,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1381,13 +1324,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/demo/lister/Makefile +++ fpc-2.2.2/demo/lister/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -276,9 +248,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=lister endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=lister -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=lister endif @@ -381,9 +350,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=lister endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=lister -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=lister endif @@ -396,9 +362,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=lister endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=lister -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=lister endif @@ -417,21 +380,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lister endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=lister -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=lister endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=lister -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=lister -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=lister -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_UNITS+=flist endif @@ -450,9 +401,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=flist endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=flist -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=flist endif @@ -555,9 +503,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=flist endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=flist -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=flist endif @@ -570,9 +515,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=flist endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=flist -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=flist endif @@ -591,21 +533,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=flist endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=flist -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=flist endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=flist -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=flist -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=flist -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -895,11 +825,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1377,9 +1302,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1482,9 +1404,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1497,9 +1416,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1518,21 +1434,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1560,20 +1464,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1705,15 +1609,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/demo/morphos/Makefile +++ fpc-2.2.2/demo/morphos/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -550,11 +522,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1032,9 +999,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1137,9 +1101,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1152,9 +1113,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1173,21 +1131,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1215,20 +1161,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1360,13 +1306,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/fpcsrc/Makefile +++ fpc-2.2.2/fpcsrc/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -380,9 +352,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_DIRS+=compiler rtl utils packages ide installer endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_DIRS+=compiler rtl utils packages ide installer -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_DIRS+=compiler rtl utils packages ide installer endif @@ -485,9 +454,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_DIRS+=compiler rtl utils packages ide installer endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_DIRS+=compiler rtl utils packages ide installer -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_DIRS+=compiler rtl utils packages ide installer endif @@ -500,9 +466,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_DIRS+=compiler rtl utils packages ide installer endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_DIRS+=compiler rtl utils packages ide installer -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_DIRS+=compiler rtl utils packages ide installer endif @@ -521,21 +484,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=compiler rtl utils packages ide installer endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_DIRS+=compiler rtl utils packages ide installer -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_DIRS+=compiler rtl utils packages ide installer endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_DIRS+=compiler rtl utils packages ide installer -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_DIRS+=compiler rtl utils packages ide installer -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_DIRS+=compiler rtl utils packages ide installer -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -826,11 +777,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1290,20 +1236,20 @@ TAREXT=.tar.gz endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1435,13 +1381,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif ifdef TARGET_RSTS override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS)) override CLEANRSTFILES+=$(RSTFILES) @@ -1583,12 +1525,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) @@ -1823,14 +1761,6 @@ TARGET_DIRS_IDE=1 TARGET_DIRS_INSTALLER=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -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),i386-netbsd) TARGET_DIRS_COMPILER=1 TARGET_DIRS_RTL=1 @@ -2103,14 +2033,6 @@ TARGET_DIRS_IDE=1 TARGET_DIRS_INSTALLER=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -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),x86_64-win64) TARGET_DIRS_COMPILER=1 TARGET_DIRS_RTL=1 @@ -2143,14 +2065,6 @@ TARGET_DIRS_IDE=1 TARGET_DIRS_INSTALLER=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -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),arm-wince) TARGET_DIRS_COMPILER=1 TARGET_DIRS_RTL=1 @@ -2199,14 +2113,6 @@ TARGET_DIRS_IDE=1 TARGET_DIRS_INSTALLER=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -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),powerpc64-embedded) TARGET_DIRS_COMPILER=1 TARGET_DIRS_RTL=1 @@ -2215,30 +2121,6 @@ TARGET_DIRS_IDE=1 TARGET_DIRS_INSTALLER=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -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),armeb-linux) -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),armeb-embedded) -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 ifdef TARGET_DIRS_COMPILER compiler_all: $(MAKE) -C compiler all --- fpc-2.2.2.orig/fpcsrc/packages/Makefile +++ fpc-2.2.2/fpcsrc/packages/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -276,9 +248,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json fcl-process unzip regexpr chm libgd symbolic fv fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick gdbint libpng x11 gdbm tcl syslog libcurl opengl bfd aspell svgalib imlib utmp fpgtk xforms fftw pcap ggi sdl openssl graph gnome1 gtk1 gtk2 httpd13 httpd20 httpd22 pxlib numlib endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json fcl-process unzip regexpr chm libgd symbolic -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json fcl-process unzip regexpr chm libgd symbolic fv fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick gdbint libpng x11 gdbm tcl syslog libcurl opengl cairo gtk1 gtk2 bfd aspell svgalib imlib utmp fpgtk xforms fftw pcap ggi sdl openssl gnome1 httpd13 httpd20 httpd22 pxlib numlib endif @@ -381,9 +350,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json fcl-process unzip regexpr chm libgd symbolic fv fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick gdbint libpng x11 gdbm tcl syslog libcurl opengl cairo bfd aspell svgalib imlib utmp fpgtk xforms fftw pcap ggi sdl openssl graph gnome1 gtk1 gtk2 httpd13 httpd20 httpd22 pxlib numlib users endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json fcl-process unzip regexpr chm libgd symbolic fv fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick libpng x11 gdbm tcl syslog libcurl opengl cairo gtk1 gtk2 bfd aspell svgalib imlib utmp fpgtk xforms fftw pcap ggi openssl gnome1 httpd13 httpd20 httpd22 numlib -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json fcl-process unzip regexpr chm libgd symbolic fv winunits-base winunits-jedi fcl-web ibase mysql zlib oracle odbc postgres sqlite imagemagick tcl opengl gtk1 gtk2 fpgtk fftw sdl openssl cdrom numlib endif @@ -396,9 +362,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json fcl-process unzip regexpr chm libgd symbolic palmunits endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json fcl-process unzip regexpr chm libgd symbolic fv fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick libpng x11 gdbm tcl syslog libcurl opengl cairo gtk1 gtk2 bfd aspell svgalib imlib utmp fpgtk xforms fftw pcap ggi openssl gnome1 httpd13 httpd20 httpd22 numlib -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json fcl-process unzip regexpr chm libgd symbolic winceunits fcl-web tcl fftw unzip zlib sqlite mysql ibase postgres oracle odbc sdl openssl oggvorbis numlib endif @@ -417,21 +380,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json fcl-process unzip regexpr chm libgd symbolic fv fcl-web 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 cairo gtk1 gtk2 a52 bfd aspell svgalib newt cdrom users imlib utmp fpgtk openal lua oggvorbis xforms fftw pcap ggi sdl openssl gnome1 httpd13 httpd20 httpd22 pxlib numlib graph endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json fcl-process unzip regexpr chm libgd symbolic fv fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick libpng x11 gdbm tcl syslog libcurl opengl cairo gtk1 gtk2 bfd aspell svgalib imlib utmp fpgtk xforms fftw pcap ggi openssl gnome1 httpd13 httpd20 httpd22 numlib -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json fcl-process unzip regexpr chm libgd symbolic endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json fcl-process unzip regexpr chm libgd symbolic -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json fcl-process unzip regexpr chm libgd symbolic fv fcl-web 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 cairo gtk1 gtk2 a52 bfd aspell svgalib newt cdrom users imlib utmp fpgtk openal lua oggvorbis xforms fftw pcap ggi sdl openssl gnome1 httpd13 httpd20 httpd22 pxlib numlib -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json fcl-process unzip regexpr chm libgd symbolic -endif override INSTALL_FPCPACKAGE=y override INSTALL_FPCSUBDIR=packages ifdef REQUIRE_UNITSDIR @@ -723,11 +674,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1187,20 +1133,20 @@ TAREXT=.tar.gz endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1332,13 +1278,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif ifdef TARGET_RSTS override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS)) override CLEANRSTFILES+=$(RSTFILES) @@ -1840,27 +1782,6 @@ TARGET_DIRS_PXLIB=1 TARGET_DIRS_NUMLIB=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -TARGET_DIRS_HASH=1 -TARGET_DIRS_PASJPEG=1 -TARGET_DIRS_PASZLIB=1 -TARGET_DIRS_FPMKUNIT=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-XML=1 -TARGET_DIRS_FCL-FPCUNIT=1 -TARGET_DIRS_FCL-JSON=1 -TARGET_DIRS_FCL-PROCESS=1 -TARGET_DIRS_UNZIP=1 -TARGET_DIRS_REGEXPR=1 -TARGET_DIRS_CHM=1 -TARGET_DIRS_LIBGD=1 -TARGET_DIRS_SYMBOLIC=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) TARGET_DIRS_HASH=1 TARGET_DIRS_PASJPEG=1 @@ -3336,66 +3257,6 @@ TARGET_DIRS_NUMLIB=1 TARGET_DIRS_USERS=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_DIRS_HASH=1 -TARGET_DIRS_PASJPEG=1 -TARGET_DIRS_PASZLIB=1 -TARGET_DIRS_FPMKUNIT=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-XML=1 -TARGET_DIRS_FCL-FPCUNIT=1 -TARGET_DIRS_FCL-JSON=1 -TARGET_DIRS_FCL-PROCESS=1 -TARGET_DIRS_UNZIP=1 -TARGET_DIRS_REGEXPR=1 -TARGET_DIRS_CHM=1 -TARGET_DIRS_LIBGD=1 -TARGET_DIRS_SYMBOLIC=1 -TARGET_DIRS_FV=1 -TARGET_DIRS_FCL-WEB=1 -TARGET_DIRS_FCL-ASYNC=1 -TARGET_DIRS_IBASE=1 -TARGET_DIRS_MYSQL=1 -TARGET_DIRS_NCURSES=1 -TARGET_DIRS_ZLIB=1 -TARGET_DIRS_ORACLE=1 -TARGET_DIRS_ODBC=1 -TARGET_DIRS_POSTGRES=1 -TARGET_DIRS_SQLITE=1 -TARGET_DIRS_PTHREADS=1 -TARGET_DIRS_IMAGEMAGICK=1 -TARGET_DIRS_LIBPNG=1 -TARGET_DIRS_X11=1 -TARGET_DIRS_GDBM=1 -TARGET_DIRS_TCL=1 -TARGET_DIRS_SYSLOG=1 -TARGET_DIRS_LIBCURL=1 -TARGET_DIRS_OPENGL=1 -TARGET_DIRS_CAIRO=1 -TARGET_DIRS_GTK1=1 -TARGET_DIRS_GTK2=1 -TARGET_DIRS_BFD=1 -TARGET_DIRS_ASPELL=1 -TARGET_DIRS_SVGALIB=1 -TARGET_DIRS_IMLIB=1 -TARGET_DIRS_UTMP=1 -TARGET_DIRS_FPGTK=1 -TARGET_DIRS_XFORMS=1 -TARGET_DIRS_FFTW=1 -TARGET_DIRS_PCAP=1 -TARGET_DIRS_GGI=1 -TARGET_DIRS_OPENSSL=1 -TARGET_DIRS_GNOME1=1 -TARGET_DIRS_HTTPD13=1 -TARGET_DIRS_HTTPD20=1 -TARGET_DIRS_HTTPD22=1 -TARGET_DIRS_NUMLIB=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) TARGET_DIRS_HASH=1 TARGET_DIRS_PASJPEG=1 @@ -3560,66 +3421,6 @@ TARGET_DIRS_SYMBOLIC=1 TARGET_DIRS_PALMUNITS=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_DIRS_HASH=1 -TARGET_DIRS_PASJPEG=1 -TARGET_DIRS_PASZLIB=1 -TARGET_DIRS_FPMKUNIT=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-XML=1 -TARGET_DIRS_FCL-FPCUNIT=1 -TARGET_DIRS_FCL-JSON=1 -TARGET_DIRS_FCL-PROCESS=1 -TARGET_DIRS_UNZIP=1 -TARGET_DIRS_REGEXPR=1 -TARGET_DIRS_CHM=1 -TARGET_DIRS_LIBGD=1 -TARGET_DIRS_SYMBOLIC=1 -TARGET_DIRS_FV=1 -TARGET_DIRS_FCL-WEB=1 -TARGET_DIRS_FCL-ASYNC=1 -TARGET_DIRS_IBASE=1 -TARGET_DIRS_MYSQL=1 -TARGET_DIRS_NCURSES=1 -TARGET_DIRS_ZLIB=1 -TARGET_DIRS_ORACLE=1 -TARGET_DIRS_ODBC=1 -TARGET_DIRS_POSTGRES=1 -TARGET_DIRS_SQLITE=1 -TARGET_DIRS_PTHREADS=1 -TARGET_DIRS_IMAGEMAGICK=1 -TARGET_DIRS_LIBPNG=1 -TARGET_DIRS_X11=1 -TARGET_DIRS_GDBM=1 -TARGET_DIRS_TCL=1 -TARGET_DIRS_SYSLOG=1 -TARGET_DIRS_LIBCURL=1 -TARGET_DIRS_OPENGL=1 -TARGET_DIRS_CAIRO=1 -TARGET_DIRS_GTK1=1 -TARGET_DIRS_GTK2=1 -TARGET_DIRS_BFD=1 -TARGET_DIRS_ASPELL=1 -TARGET_DIRS_SVGALIB=1 -TARGET_DIRS_IMLIB=1 -TARGET_DIRS_UTMP=1 -TARGET_DIRS_FPGTK=1 -TARGET_DIRS_XFORMS=1 -TARGET_DIRS_FFTW=1 -TARGET_DIRS_PCAP=1 -TARGET_DIRS_GGI=1 -TARGET_DIRS_OPENSSL=1 -TARGET_DIRS_GNOME1=1 -TARGET_DIRS_HTTPD13=1 -TARGET_DIRS_HTTPD20=1 -TARGET_DIRS_HTTPD22=1 -TARGET_DIRS_NUMLIB=1 -endif ifeq ($(FULL_TARGET),arm-wince) TARGET_DIRS_HASH=1 TARGET_DIRS_PASJPEG=1 @@ -3819,66 +3620,6 @@ TARGET_DIRS_NUMLIB=1 TARGET_DIRS_GRAPH=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_DIRS_HASH=1 -TARGET_DIRS_PASJPEG=1 -TARGET_DIRS_PASZLIB=1 -TARGET_DIRS_FPMKUNIT=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-XML=1 -TARGET_DIRS_FCL-FPCUNIT=1 -TARGET_DIRS_FCL-JSON=1 -TARGET_DIRS_FCL-PROCESS=1 -TARGET_DIRS_UNZIP=1 -TARGET_DIRS_REGEXPR=1 -TARGET_DIRS_CHM=1 -TARGET_DIRS_LIBGD=1 -TARGET_DIRS_SYMBOLIC=1 -TARGET_DIRS_FV=1 -TARGET_DIRS_FCL-WEB=1 -TARGET_DIRS_FCL-ASYNC=1 -TARGET_DIRS_IBASE=1 -TARGET_DIRS_MYSQL=1 -TARGET_DIRS_NCURSES=1 -TARGET_DIRS_ZLIB=1 -TARGET_DIRS_ORACLE=1 -TARGET_DIRS_ODBC=1 -TARGET_DIRS_POSTGRES=1 -TARGET_DIRS_SQLITE=1 -TARGET_DIRS_PTHREADS=1 -TARGET_DIRS_IMAGEMAGICK=1 -TARGET_DIRS_LIBPNG=1 -TARGET_DIRS_X11=1 -TARGET_DIRS_GDBM=1 -TARGET_DIRS_TCL=1 -TARGET_DIRS_SYSLOG=1 -TARGET_DIRS_LIBCURL=1 -TARGET_DIRS_OPENGL=1 -TARGET_DIRS_CAIRO=1 -TARGET_DIRS_GTK1=1 -TARGET_DIRS_GTK2=1 -TARGET_DIRS_BFD=1 -TARGET_DIRS_ASPELL=1 -TARGET_DIRS_SVGALIB=1 -TARGET_DIRS_IMLIB=1 -TARGET_DIRS_UTMP=1 -TARGET_DIRS_FPGTK=1 -TARGET_DIRS_XFORMS=1 -TARGET_DIRS_FFTW=1 -TARGET_DIRS_PCAP=1 -TARGET_DIRS_GGI=1 -TARGET_DIRS_OPENSSL=1 -TARGET_DIRS_GNOME1=1 -TARGET_DIRS_HTTPD13=1 -TARGET_DIRS_HTTPD20=1 -TARGET_DIRS_HTTPD22=1 -TARGET_DIRS_NUMLIB=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) TARGET_DIRS_HASH=1 TARGET_DIRS_PASJPEG=1 @@ -3900,125 +3641,6 @@ TARGET_DIRS_LIBGD=1 TARGET_DIRS_SYMBOLIC=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -TARGET_DIRS_HASH=1 -TARGET_DIRS_PASJPEG=1 -TARGET_DIRS_PASZLIB=1 -TARGET_DIRS_FPMKUNIT=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-XML=1 -TARGET_DIRS_FCL-FPCUNIT=1 -TARGET_DIRS_FCL-JSON=1 -TARGET_DIRS_FCL-PROCESS=1 -TARGET_DIRS_UNZIP=1 -TARGET_DIRS_REGEXPR=1 -TARGET_DIRS_CHM=1 -TARGET_DIRS_LIBGD=1 -TARGET_DIRS_SYMBOLIC=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -TARGET_DIRS_HASH=1 -TARGET_DIRS_PASJPEG=1 -TARGET_DIRS_PASZLIB=1 -TARGET_DIRS_FPMKUNIT=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-XML=1 -TARGET_DIRS_FCL-FPCUNIT=1 -TARGET_DIRS_FCL-JSON=1 -TARGET_DIRS_FCL-PROCESS=1 -TARGET_DIRS_UNZIP=1 -TARGET_DIRS_REGEXPR=1 -TARGET_DIRS_CHM=1 -TARGET_DIRS_LIBGD=1 -TARGET_DIRS_SYMBOLIC=1 -TARGET_DIRS_FV=1 -TARGET_DIRS_FCL-WEB=1 -TARGET_DIRS_FCL-ASYNC=1 -TARGET_DIRS_IBASE=1 -TARGET_DIRS_MYSQL=1 -TARGET_DIRS_NCURSES=1 -TARGET_DIRS_UNZIP=1 -TARGET_DIRS_ZLIB=1 -TARGET_DIRS_ORACLE=1 -TARGET_DIRS_DBUS=1 -TARGET_DIRS_ODBC=1 -TARGET_DIRS_POSTGRES=1 -TARGET_DIRS_SQLITE=1 -TARGET_DIRS_PTHREADS=1 -TARGET_DIRS_IMAGEMAGICK=1 -TARGET_DIRS_GDBINT=1 -TARGET_DIRS_LIBPNG=1 -TARGET_DIRS_X11=1 -TARGET_DIRS_UUID=1 -TARGET_DIRS_LDAP=1 -TARGET_DIRS_MODPLUG=1 -TARGET_DIRS_DTS=1 -TARGET_DIRS_MAD=1 -TARGET_DIRS_GDBM=1 -TARGET_DIRS_TCL=1 -TARGET_DIRS_SYSLOG=1 -TARGET_DIRS_LIBCURL=1 -TARGET_DIRS_OPENGL=1 -TARGET_DIRS_CAIRO=1 -TARGET_DIRS_GTK1=1 -TARGET_DIRS_GTK2=1 -TARGET_DIRS_A52=1 -TARGET_DIRS_BFD=1 -TARGET_DIRS_ASPELL=1 -TARGET_DIRS_SVGALIB=1 -TARGET_DIRS_NEWT=1 -TARGET_DIRS_CDROM=1 -TARGET_DIRS_USERS=1 -TARGET_DIRS_IMLIB=1 -TARGET_DIRS_UTMP=1 -TARGET_DIRS_FPGTK=1 -TARGET_DIRS_OPENAL=1 -TARGET_DIRS_LUA=1 -TARGET_DIRS_OGGVORBIS=1 -TARGET_DIRS_XFORMS=1 -TARGET_DIRS_FFTW=1 -TARGET_DIRS_PCAP=1 -TARGET_DIRS_GGI=1 -TARGET_DIRS_SDL=1 -TARGET_DIRS_OPENSSL=1 -TARGET_DIRS_GNOME1=1 -TARGET_DIRS_HTTPD13=1 -TARGET_DIRS_HTTPD20=1 -TARGET_DIRS_HTTPD22=1 -TARGET_DIRS_PXLIB=1 -TARGET_DIRS_NUMLIB=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -TARGET_DIRS_HASH=1 -TARGET_DIRS_PASJPEG=1 -TARGET_DIRS_PASZLIB=1 -TARGET_DIRS_FPMKUNIT=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-XML=1 -TARGET_DIRS_FCL-FPCUNIT=1 -TARGET_DIRS_FCL-JSON=1 -TARGET_DIRS_FCL-PROCESS=1 -TARGET_DIRS_UNZIP=1 -TARGET_DIRS_REGEXPR=1 -TARGET_DIRS_CHM=1 -TARGET_DIRS_LIBGD=1 -TARGET_DIRS_SYMBOLIC=1 -endif ifdef TARGET_DIRS_HASH hash_all: $(MAKE) -C hash all --- fpc-2.2.2.orig/fpcsrc/packages/utmp/Makefile +++ fpc-2.2.2/fpcsrc/packages/utmp/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=utmp endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=utmp -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=utmp endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=utmp endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=utmp -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=utmp endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=utmp endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=utmp -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=utmp endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=utmp endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=utmp -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=utmp endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=utmp -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=utmp -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=utmp -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=testutmp endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLES+=testutmp endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=testutmp -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLES+=testutmp endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLES+=testutmp endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=testutmp -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLES+=testutmp endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLES+=testutmp endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=testutmp -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLES+=testutmp endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLES+=testutmp endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=testutmp -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLES+=testutmp endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=testutmp -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=testutmp -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=testutmp -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1246,11 +1134,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1728,9 +1611,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1833,9 +1713,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1848,9 +1725,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1869,21 +1743,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1911,20 +1773,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2056,15 +1918,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2305,12 +2163,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/winunits-base/Makefile +++ fpc-2.2.2/fpcsrc/packages/winunits-base/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=buildwinutilsbase endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=buildwinutilsbase -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=buildwinutilsbase endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=buildwinutilsbase endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=buildwinutilsbase -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=buildwinutilsbase endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=buildwinutilsbase endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=buildwinutilsbase -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=buildwinutilsbase endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=buildwinutilsbase endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=buildwinutilsbase -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=buildwinutilsbase endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=buildwinutilsbase -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=buildwinutilsbase -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=buildwinutilsbase -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp wininet endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp wininet endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp wininet -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp wininet endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp wininet endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp wininet -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp wininet endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp wininet endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp wininet -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp wininet endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp wininet endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp wininet -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp wininet endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp wininet -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp wininet -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp wininet -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=jwawintype comconst endif @@ -626,9 +556,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=jwawintype comconst endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=jwawintype comconst -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=jwawintype comconst endif @@ -731,9 +658,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=jwawintype comconst endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=jwawintype comconst -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=jwawintype comconst endif @@ -746,9 +670,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=jwawintype comconst endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=jwawintype comconst -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=jwawintype comconst endif @@ -767,21 +688,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=jwawintype comconst endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=jwawintype comconst -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=jwawintype comconst endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=jwawintype comconst -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=jwawintype comconst -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=jwawintype comconst -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=examples endif @@ -800,9 +709,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLES+=examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLES+=examples endif @@ -905,9 +811,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLES+=examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLES+=examples endif @@ -920,9 +823,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLES+=examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=examples -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLES+=examples endif @@ -941,21 +841,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLES+=examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLES+=examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=examples -endif override INSTALL_BUILDUNIT=buildwinutilsbase override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) @@ -976,9 +864,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-Ur endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-Ur -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-Ur endif @@ -1081,9 +966,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-Ur endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-Ur -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-Ur endif @@ -1096,9 +978,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-Ur endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-Ur -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-Ur endif @@ -1117,21 +996,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-Ur endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-Ur -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-Ur endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-Ur -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-Ur -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-Ur -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -1150,9 +1017,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src endif @@ -1255,9 +1119,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src endif @@ -1270,9 +1131,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src endif @@ -1291,21 +1149,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1595,11 +1441,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -2077,9 +1918,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -2182,9 +2020,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -2197,9 +2032,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -2218,21 +2050,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2260,20 +2080,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2405,15 +2225,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2654,12 +2470,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/univint/Makefile +++ fpc-2.2.2/fpcsrc/packages/univint/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=MacOSAll MacOS endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=MacOSAll MacOS -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=MacOSAll MacOS endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=MacOSAll MacOS endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=MacOSAll MacOS -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=MacOSAll MacOS endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=MacOSAll MacOS endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=MacOSAll MacOS -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=MacOSAll MacOS endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=MacOSAll MacOS endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=MacOSAll MacOS -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=MacOSAll MacOS endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=MacOSAll MacOS -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=MacOSAll MacOS -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=MacOSAll MacOS -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AVLTree AXErrors AXUIElement AXValue Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AuthSession Authorization AuthorizationDB AuthorizationTags CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFFTPStream CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetServices CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGImage CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindowLevels CMApplication CMCalibrator CMDeviceIntegration CMICCProfile CMMComponent CMPRComponent CMScriptingPlugin CMTypes CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker Components ConditionalMacros ControlDefinitions Controls CoreFoundation CoreGraphics DHCPClientPreferences DateTimeUtils Debugging Devices Dialogs Dictionary Displays Drag DrawSprocket DriverFamilyMatching DriverGestalt DriverSynchronization Endian Events FileTypesAndCreators Files FindByContent Finder FinderRegistry FixMath Folders FontSync Fonts GXTypes GestaltEqu HFSVolumes HIArchive HIGeometry HIObject HIObjectCore HIShape HITextUtils HITheme HIToolbar HIToolbox HIView HTMLRendering IBCarbonRuntime ICAApplication ICACamera ICADevice Icons ImageCodec ImageCompression InternetConfig IntlResources Keyboards KeychainCore KeychainHI LanguageAnalysis LaunchServices Lists LowMem MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat Multiprocessing NSL NSLCore NameRegistry Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMCore PMDefinitions Palettes Pasteboard PictUtils Power Printing Processes QDOffscreen QDPictToCGContext QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes Scrap Script Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TypeSelect URLAccess USB UTCUtils UTType UnicodeConverter UnicodeUtilities Video WorldScript fenv fp vBLAS vDSP UTCoreTypes xattr FontPanel CoreAudioTypes AXNotificationConstants AudioHardware AXRoleConstants TranslationServices AXActionConstants HIMovieView CGImageDestination AXValueConstants AXAttributeConstants AXTextAttributedString CGImageProperties CGImageSource UniversalAccess HostTime GPCStrings CGDisplayFades CGLTypes CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns ObjCRuntime endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AVLTree AXErrors AXUIElement AXValue Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AuthSession Authorization AuthorizationDB AuthorizationTags CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFFTPStream CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetServices CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGImage CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindowLevels CMApplication CMCalibrator CMDeviceIntegration CMICCProfile CMMComponent CMPRComponent CMScriptingPlugin CMTypes CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker Components ConditionalMacros ControlDefinitions Controls CoreFoundation CoreGraphics DHCPClientPreferences DateTimeUtils Debugging Devices Dialogs Dictionary Displays Drag DrawSprocket DriverFamilyMatching DriverGestalt DriverSynchronization Endian Events FileTypesAndCreators Files FindByContent Finder FinderRegistry FixMath Folders FontSync Fonts GXTypes GestaltEqu HFSVolumes HIArchive HIGeometry HIObject HIObjectCore HIShape HITextUtils HITheme HIToolbar HIToolbox HIView HTMLRendering IBCarbonRuntime ICAApplication ICACamera ICADevice Icons ImageCodec ImageCompression InternetConfig IntlResources Keyboards KeychainCore KeychainHI LanguageAnalysis LaunchServices Lists LowMem MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat Multiprocessing NSL NSLCore NameRegistry Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMCore PMDefinitions Palettes Pasteboard PictUtils Power Printing Processes QDOffscreen QDPictToCGContext QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes Scrap Script Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TypeSelect URLAccess USB UTCUtils UTType UnicodeConverter UnicodeUtilities Video WorldScript fenv fp vBLAS vDSP UTCoreTypes xattr FontPanel CoreAudioTypes AXNotificationConstants AudioHardware AXRoleConstants TranslationServices AXActionConstants HIMovieView CGImageDestination AXValueConstants AXAttributeConstants AXTextAttributedString CGImageProperties CGImageSource UniversalAccess HostTime GPCStrings CGDisplayFades CGLTypes CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns ObjCRuntime endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AVLTree AXErrors AXUIElement AXValue Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AuthSession Authorization AuthorizationDB AuthorizationTags CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFFTPStream CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetServices CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGImage CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindowLevels CMApplication CMCalibrator CMDeviceIntegration CMICCProfile CMMComponent CMPRComponent CMScriptingPlugin CMTypes CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker Components ConditionalMacros ControlDefinitions Controls CoreFoundation CoreGraphics DHCPClientPreferences DateTimeUtils Debugging Devices Dialogs Dictionary Displays Drag DrawSprocket DriverFamilyMatching DriverGestalt DriverSynchronization Endian Events FileTypesAndCreators Files FindByContent Finder FinderRegistry FixMath Folders FontSync Fonts GXTypes GestaltEqu HFSVolumes HIArchive HIGeometry HIObject HIObjectCore HIShape HITextUtils HITheme HIToolbar HIToolbox HIView HTMLRendering IBCarbonRuntime ICAApplication ICACamera ICADevice Icons ImageCodec ImageCompression InternetConfig IntlResources Keyboards KeychainCore KeychainHI LanguageAnalysis LaunchServices Lists LowMem MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat Multiprocessing NSL NSLCore NameRegistry Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMCore PMDefinitions Palettes Pasteboard PictUtils Power Printing Processes QDOffscreen QDPictToCGContext QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes Scrap Script Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TypeSelect URLAccess USB UTCUtils UTType UnicodeConverter UnicodeUtilities Video WorldScript fenv fp vBLAS vDSP UTCoreTypes xattr FontPanel CoreAudioTypes AXNotificationConstants AudioHardware AXRoleConstants TranslationServices AXActionConstants HIMovieView CGImageDestination AXValueConstants AXAttributeConstants AXTextAttributedString CGImageProperties CGImageSource UniversalAccess HostTime GPCStrings CGDisplayFades CGLTypes CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns ObjCRuntime -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AVLTree AXErrors AXUIElement AXValue Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AuthSession Authorization AuthorizationDB AuthorizationTags CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFFTPStream CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetServices CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGImage CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindowLevels CMApplication CMCalibrator CMDeviceIntegration CMICCProfile CMMComponent CMPRComponent CMScriptingPlugin CMTypes CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker Components ConditionalMacros ControlDefinitions Controls CoreFoundation CoreGraphics DHCPClientPreferences DateTimeUtils Debugging Devices Dialogs Dictionary Displays Drag DrawSprocket DriverFamilyMatching DriverGestalt DriverSynchronization Endian Events FileTypesAndCreators Files FindByContent Finder FinderRegistry FixMath Folders FontSync Fonts GXTypes GestaltEqu HFSVolumes HIArchive HIGeometry HIObject HIObjectCore HIShape HITextUtils HITheme HIToolbar HIToolbox HIView HTMLRendering IBCarbonRuntime ICAApplication ICACamera ICADevice Icons ImageCodec ImageCompression InternetConfig IntlResources Keyboards KeychainCore KeychainHI LanguageAnalysis LaunchServices Lists LowMem MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat Multiprocessing NSL NSLCore NameRegistry Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMCore PMDefinitions Palettes Pasteboard PictUtils Power Printing Processes QDOffscreen QDPictToCGContext QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes Scrap Script Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TypeSelect URLAccess USB UTCUtils UTType UnicodeConverter UnicodeUtilities Video WorldScript fenv fp vBLAS vDSP UTCoreTypes xattr FontPanel CoreAudioTypes AXNotificationConstants AudioHardware AXRoleConstants TranslationServices AXActionConstants HIMovieView CGImageDestination AXValueConstants AXAttributeConstants AXTextAttributedString CGImageProperties CGImageSource UniversalAccess HostTime GPCStrings CGDisplayFades CGLTypes CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns ObjCRuntime endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AVLTree AXErrors AXUIElement AXValue Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AuthSession Authorization AuthorizationDB AuthorizationTags CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFFTPStream CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetServices CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGImage CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindowLevels CMApplication CMCalibrator CMDeviceIntegration CMICCProfile CMMComponent CMPRComponent CMScriptingPlugin CMTypes CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker Components ConditionalMacros ControlDefinitions Controls CoreFoundation CoreGraphics DHCPClientPreferences DateTimeUtils Debugging Devices Dialogs Dictionary Displays Drag DrawSprocket DriverFamilyMatching DriverGestalt DriverSynchronization Endian Events FileTypesAndCreators Files FindByContent Finder FinderRegistry FixMath Folders FontSync Fonts GXTypes GestaltEqu HFSVolumes HIArchive HIGeometry HIObject HIObjectCore HIShape HITextUtils HITheme HIToolbar HIToolbox HIView HTMLRendering IBCarbonRuntime ICAApplication ICACamera ICADevice Icons ImageCodec ImageCompression InternetConfig IntlResources Keyboards KeychainCore KeychainHI LanguageAnalysis LaunchServices Lists LowMem MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat Multiprocessing NSL NSLCore NameRegistry Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMCore PMDefinitions Palettes Pasteboard PictUtils Power Printing Processes QDOffscreen QDPictToCGContext QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes Scrap Script Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TypeSelect URLAccess USB UTCUtils UTType UnicodeConverter UnicodeUtilities Video WorldScript fenv fp vBLAS vDSP UTCoreTypes xattr FontPanel CoreAudioTypes AXNotificationConstants AudioHardware AXRoleConstants TranslationServices AXActionConstants HIMovieView CGImageDestination AXValueConstants AXAttributeConstants AXTextAttributedString CGImageProperties CGImageSource UniversalAccess HostTime GPCStrings CGDisplayFades CGLTypes CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns ObjCRuntime endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AVLTree AXErrors AXUIElement AXValue Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AuthSession Authorization AuthorizationDB AuthorizationTags CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFFTPStream CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetServices CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGImage CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindowLevels CMApplication CMCalibrator CMDeviceIntegration CMICCProfile CMMComponent CMPRComponent CMScriptingPlugin CMTypes CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker Components ConditionalMacros ControlDefinitions Controls CoreFoundation CoreGraphics DHCPClientPreferences DateTimeUtils Debugging Devices Dialogs Dictionary Displays Drag DrawSprocket DriverFamilyMatching DriverGestalt DriverSynchronization Endian Events FileTypesAndCreators Files FindByContent Finder FinderRegistry FixMath Folders FontSync Fonts GXTypes GestaltEqu HFSVolumes HIArchive HIGeometry HIObject HIObjectCore HIShape HITextUtils HITheme HIToolbar HIToolbox HIView HTMLRendering IBCarbonRuntime ICAApplication ICACamera ICADevice Icons ImageCodec ImageCompression InternetConfig IntlResources Keyboards KeychainCore KeychainHI LanguageAnalysis LaunchServices Lists LowMem MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat Multiprocessing NSL NSLCore NameRegistry Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMCore PMDefinitions Palettes Pasteboard PictUtils Power Printing Processes QDOffscreen QDPictToCGContext QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes Scrap Script Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TypeSelect URLAccess USB UTCUtils UTType UnicodeConverter UnicodeUtilities Video WorldScript fenv fp vBLAS vDSP UTCoreTypes xattr FontPanel CoreAudioTypes AXNotificationConstants AudioHardware AXRoleConstants TranslationServices AXActionConstants HIMovieView CGImageDestination AXValueConstants AXAttributeConstants AXTextAttributedString CGImageProperties CGImageSource UniversalAccess HostTime GPCStrings CGDisplayFades CGLTypes CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns ObjCRuntime -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AVLTree AXErrors AXUIElement AXValue Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AuthSession Authorization AuthorizationDB AuthorizationTags CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFFTPStream CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetServices CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGImage CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindowLevels CMApplication CMCalibrator CMDeviceIntegration CMICCProfile CMMComponent CMPRComponent CMScriptingPlugin CMTypes CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker Components ConditionalMacros ControlDefinitions Controls CoreFoundation CoreGraphics DHCPClientPreferences DateTimeUtils Debugging Devices Dialogs Dictionary Displays Drag DrawSprocket DriverFamilyMatching DriverGestalt DriverSynchronization Endian Events FileTypesAndCreators Files FindByContent Finder FinderRegistry FixMath Folders FontSync Fonts GXTypes GestaltEqu HFSVolumes HIArchive HIGeometry HIObject HIObjectCore HIShape HITextUtils HITheme HIToolbar HIToolbox HIView HTMLRendering IBCarbonRuntime ICAApplication ICACamera ICADevice Icons ImageCodec ImageCompression InternetConfig IntlResources Keyboards KeychainCore KeychainHI LanguageAnalysis LaunchServices Lists LowMem MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat Multiprocessing NSL NSLCore NameRegistry Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMCore PMDefinitions Palettes Pasteboard PictUtils Power Printing Processes QDOffscreen QDPictToCGContext QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes Scrap Script Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TypeSelect URLAccess USB UTCUtils UTType UnicodeConverter UnicodeUtilities Video WorldScript fenv fp vBLAS vDSP UTCoreTypes xattr FontPanel CoreAudioTypes AXNotificationConstants AudioHardware AXRoleConstants TranslationServices AXActionConstants HIMovieView CGImageDestination AXValueConstants AXAttributeConstants AXTextAttributedString CGImageProperties CGImageSource UniversalAccess HostTime GPCStrings CGDisplayFades CGLTypes CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns ObjCRuntime endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AVLTree AXErrors AXUIElement AXValue Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AuthSession Authorization AuthorizationDB AuthorizationTags CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFFTPStream CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetServices CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGImage CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindowLevels CMApplication CMCalibrator CMDeviceIntegration CMICCProfile CMMComponent CMPRComponent CMScriptingPlugin CMTypes CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker Components ConditionalMacros ControlDefinitions Controls CoreFoundation CoreGraphics DHCPClientPreferences DateTimeUtils Debugging Devices Dialogs Dictionary Displays Drag DrawSprocket DriverFamilyMatching DriverGestalt DriverSynchronization Endian Events FileTypesAndCreators Files FindByContent Finder FinderRegistry FixMath Folders FontSync Fonts GXTypes GestaltEqu HFSVolumes HIArchive HIGeometry HIObject HIObjectCore HIShape HITextUtils HITheme HIToolbar HIToolbox HIView HTMLRendering IBCarbonRuntime ICAApplication ICACamera ICADevice Icons ImageCodec ImageCompression InternetConfig IntlResources Keyboards KeychainCore KeychainHI LanguageAnalysis LaunchServices Lists LowMem MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat Multiprocessing NSL NSLCore NameRegistry Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMCore PMDefinitions Palettes Pasteboard PictUtils Power Printing Processes QDOffscreen QDPictToCGContext QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes Scrap Script Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TypeSelect URLAccess USB UTCUtils UTType UnicodeConverter UnicodeUtilities Video WorldScript fenv fp vBLAS vDSP UTCoreTypes xattr FontPanel CoreAudioTypes AXNotificationConstants AudioHardware AXRoleConstants TranslationServices AXActionConstants HIMovieView CGImageDestination AXValueConstants AXAttributeConstants AXTextAttributedString CGImageProperties CGImageSource UniversalAccess HostTime GPCStrings CGDisplayFades CGLTypes CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns ObjCRuntime endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AVLTree AXErrors AXUIElement AXValue Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AuthSession Authorization AuthorizationDB AuthorizationTags CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFFTPStream CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetServices CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGImage CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindowLevels CMApplication CMCalibrator CMDeviceIntegration CMICCProfile CMMComponent CMPRComponent CMScriptingPlugin CMTypes CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker Components ConditionalMacros ControlDefinitions Controls CoreFoundation CoreGraphics DHCPClientPreferences DateTimeUtils Debugging Devices Dialogs Dictionary Displays Drag DrawSprocket DriverFamilyMatching DriverGestalt DriverSynchronization Endian Events FileTypesAndCreators Files FindByContent Finder FinderRegistry FixMath Folders FontSync Fonts GXTypes GestaltEqu HFSVolumes HIArchive HIGeometry HIObject HIObjectCore HIShape HITextUtils HITheme HIToolbar HIToolbox HIView HTMLRendering IBCarbonRuntime ICAApplication ICACamera ICADevice Icons ImageCodec ImageCompression InternetConfig IntlResources Keyboards KeychainCore KeychainHI LanguageAnalysis LaunchServices Lists LowMem MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat Multiprocessing NSL NSLCore NameRegistry Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMCore PMDefinitions Palettes Pasteboard PictUtils Power Printing Processes QDOffscreen QDPictToCGContext QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes Scrap Script Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TypeSelect URLAccess USB UTCUtils UTType UnicodeConverter UnicodeUtilities Video WorldScript fenv fp vBLAS vDSP UTCoreTypes xattr FontPanel CoreAudioTypes AXNotificationConstants AudioHardware AXRoleConstants TranslationServices AXActionConstants HIMovieView CGImageDestination AXValueConstants AXAttributeConstants AXTextAttributedString CGImageProperties CGImageSource UniversalAccess HostTime GPCStrings CGDisplayFades CGLTypes CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns ObjCRuntime -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AVLTree AXErrors AXUIElement AXValue Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AuthSession Authorization AuthorizationDB AuthorizationTags CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFFTPStream CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetServices CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGImage CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindowLevels CMApplication CMCalibrator CMDeviceIntegration CMICCProfile CMMComponent CMPRComponent CMScriptingPlugin CMTypes CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker Components ConditionalMacros ControlDefinitions Controls CoreFoundation CoreGraphics DHCPClientPreferences DateTimeUtils Debugging Devices Dialogs Dictionary Displays Drag DrawSprocket DriverFamilyMatching DriverGestalt DriverSynchronization Endian Events FileTypesAndCreators Files FindByContent Finder FinderRegistry FixMath Folders FontSync Fonts GXTypes GestaltEqu HFSVolumes HIArchive HIGeometry HIObject HIObjectCore HIShape HITextUtils HITheme HIToolbar HIToolbox HIView HTMLRendering IBCarbonRuntime ICAApplication ICACamera ICADevice Icons ImageCodec ImageCompression InternetConfig IntlResources Keyboards KeychainCore KeychainHI LanguageAnalysis LaunchServices Lists LowMem MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat Multiprocessing NSL NSLCore NameRegistry Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMCore PMDefinitions Palettes Pasteboard PictUtils Power Printing Processes QDOffscreen QDPictToCGContext QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes Scrap Script Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TypeSelect URLAccess USB UTCUtils UTType UnicodeConverter UnicodeUtilities Video WorldScript fenv fp vBLAS vDSP UTCoreTypes xattr FontPanel CoreAudioTypes AXNotificationConstants AudioHardware AXRoleConstants TranslationServices AXActionConstants HIMovieView CGImageDestination AXValueConstants AXAttributeConstants AXTextAttributedString CGImageProperties CGImageSource UniversalAccess HostTime GPCStrings CGDisplayFades CGLTypes CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns ObjCRuntime endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AVLTree AXErrors AXUIElement AXValue Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AuthSession Authorization AuthorizationDB AuthorizationTags CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFFTPStream CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetServices CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGImage CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindowLevels CMApplication CMCalibrator CMDeviceIntegration CMICCProfile CMMComponent CMPRComponent CMScriptingPlugin CMTypes CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker Components ConditionalMacros ControlDefinitions Controls CoreFoundation CoreGraphics DHCPClientPreferences DateTimeUtils Debugging Devices Dialogs Dictionary Displays Drag DrawSprocket DriverFamilyMatching DriverGestalt DriverSynchronization Endian Events FileTypesAndCreators Files FindByContent Finder FinderRegistry FixMath Folders FontSync Fonts GXTypes GestaltEqu HFSVolumes HIArchive HIGeometry HIObject HIObjectCore HIShape HITextUtils HITheme HIToolbar HIToolbox HIView HTMLRendering IBCarbonRuntime ICAApplication ICACamera ICADevice Icons ImageCodec ImageCompression InternetConfig IntlResources Keyboards KeychainCore KeychainHI LanguageAnalysis LaunchServices Lists LowMem MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat Multiprocessing NSL NSLCore NameRegistry Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMCore PMDefinitions Palettes Pasteboard PictUtils Power Printing Processes QDOffscreen QDPictToCGContext QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes Scrap Script Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TypeSelect URLAccess USB UTCUtils UTType UnicodeConverter UnicodeUtilities Video WorldScript fenv fp vBLAS vDSP UTCoreTypes xattr FontPanel CoreAudioTypes AXNotificationConstants AudioHardware AXRoleConstants TranslationServices AXActionConstants HIMovieView CGImageDestination AXValueConstants AXAttributeConstants AXTextAttributedString CGImageProperties CGImageSource UniversalAccess HostTime GPCStrings CGDisplayFades CGLTypes CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns ObjCRuntime endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AVLTree AXErrors AXUIElement AXValue Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AuthSession Authorization AuthorizationDB AuthorizationTags CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFFTPStream CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetServices CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGImage CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindowLevels CMApplication CMCalibrator CMDeviceIntegration CMICCProfile CMMComponent CMPRComponent CMScriptingPlugin CMTypes CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker Components ConditionalMacros ControlDefinitions Controls CoreFoundation CoreGraphics DHCPClientPreferences DateTimeUtils Debugging Devices Dialogs Dictionary Displays Drag DrawSprocket DriverFamilyMatching DriverGestalt DriverSynchronization Endian Events FileTypesAndCreators Files FindByContent Finder FinderRegistry FixMath Folders FontSync Fonts GXTypes GestaltEqu HFSVolumes HIArchive HIGeometry HIObject HIObjectCore HIShape HITextUtils HITheme HIToolbar HIToolbox HIView HTMLRendering IBCarbonRuntime ICAApplication ICACamera ICADevice Icons ImageCodec ImageCompression InternetConfig IntlResources Keyboards KeychainCore KeychainHI LanguageAnalysis LaunchServices Lists LowMem MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat Multiprocessing NSL NSLCore NameRegistry Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMCore PMDefinitions Palettes Pasteboard PictUtils Power Printing Processes QDOffscreen QDPictToCGContext QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes Scrap Script Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TypeSelect URLAccess USB UTCUtils UTType UnicodeConverter UnicodeUtilities Video WorldScript fenv fp vBLAS vDSP UTCoreTypes xattr FontPanel CoreAudioTypes AXNotificationConstants AudioHardware AXRoleConstants TranslationServices AXActionConstants HIMovieView CGImageDestination AXValueConstants AXAttributeConstants AXTextAttributedString CGImageProperties CGImageSource UniversalAccess HostTime GPCStrings CGDisplayFades CGLTypes CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns ObjCRuntime -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AVLTree AXErrors AXUIElement AXValue Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AuthSession Authorization AuthorizationDB AuthorizationTags CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFFTPStream CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetServices CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGImage CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindowLevels CMApplication CMCalibrator CMDeviceIntegration CMICCProfile CMMComponent CMPRComponent CMScriptingPlugin CMTypes CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker Components ConditionalMacros ControlDefinitions Controls CoreFoundation CoreGraphics DHCPClientPreferences DateTimeUtils Debugging Devices Dialogs Dictionary Displays Drag DrawSprocket DriverFamilyMatching DriverGestalt DriverSynchronization Endian Events FileTypesAndCreators Files FindByContent Finder FinderRegistry FixMath Folders FontSync Fonts GXTypes GestaltEqu HFSVolumes HIArchive HIGeometry HIObject HIObjectCore HIShape HITextUtils HITheme HIToolbar HIToolbox HIView HTMLRendering IBCarbonRuntime ICAApplication ICACamera ICADevice Icons ImageCodec ImageCompression InternetConfig IntlResources Keyboards KeychainCore KeychainHI LanguageAnalysis LaunchServices Lists LowMem MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat Multiprocessing NSL NSLCore NameRegistry Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMCore PMDefinitions Palettes Pasteboard PictUtils Power Printing Processes QDOffscreen QDPictToCGContext QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes Scrap Script Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TypeSelect URLAccess USB UTCUtils UTType UnicodeConverter UnicodeUtilities Video WorldScript fenv fp vBLAS vDSP UTCoreTypes xattr FontPanel CoreAudioTypes AXNotificationConstants AudioHardware AXRoleConstants TranslationServices AXActionConstants HIMovieView CGImageDestination AXValueConstants AXAttributeConstants AXTextAttributedString CGImageProperties CGImageSource UniversalAccess HostTime GPCStrings CGDisplayFades CGLTypes CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns ObjCRuntime endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AVLTree AXErrors AXUIElement AXValue Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AuthSession Authorization AuthorizationDB AuthorizationTags CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFFTPStream CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetServices CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGImage CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindowLevels CMApplication CMCalibrator CMDeviceIntegration CMICCProfile CMMComponent CMPRComponent CMScriptingPlugin CMTypes CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker Components ConditionalMacros ControlDefinitions Controls CoreFoundation CoreGraphics DHCPClientPreferences DateTimeUtils Debugging Devices Dialogs Dictionary Displays Drag DrawSprocket DriverFamilyMatching DriverGestalt DriverSynchronization Endian Events FileTypesAndCreators Files FindByContent Finder FinderRegistry FixMath Folders FontSync Fonts GXTypes GestaltEqu HFSVolumes HIArchive HIGeometry HIObject HIObjectCore HIShape HITextUtils HITheme HIToolbar HIToolbox HIView HTMLRendering IBCarbonRuntime ICAApplication ICACamera ICADevice Icons ImageCodec ImageCompression InternetConfig IntlResources Keyboards KeychainCore KeychainHI LanguageAnalysis LaunchServices Lists LowMem MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat Multiprocessing NSL NSLCore NameRegistry Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMCore PMDefinitions Palettes Pasteboard PictUtils Power Printing Processes QDOffscreen QDPictToCGContext QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes Scrap Script Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TypeSelect URLAccess USB UTCUtils UTType UnicodeConverter UnicodeUtilities Video WorldScript fenv fp vBLAS vDSP UTCoreTypes xattr FontPanel CoreAudioTypes AXNotificationConstants AudioHardware AXRoleConstants TranslationServices AXActionConstants HIMovieView CGImageDestination AXValueConstants AXAttributeConstants AXTextAttributedString CGImageProperties CGImageSource UniversalAccess HostTime GPCStrings CGDisplayFades CGLTypes CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns ObjCRuntime -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AVLTree AXErrors AXUIElement AXValue Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AuthSession Authorization AuthorizationDB AuthorizationTags CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFFTPStream CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetServices CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGImage CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindowLevels CMApplication CMCalibrator CMDeviceIntegration CMICCProfile CMMComponent CMPRComponent CMScriptingPlugin CMTypes CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker Components ConditionalMacros ControlDefinitions Controls CoreFoundation CoreGraphics DHCPClientPreferences DateTimeUtils Debugging Devices Dialogs Dictionary Displays Drag DrawSprocket DriverFamilyMatching DriverGestalt DriverSynchronization Endian Events FileTypesAndCreators Files FindByContent Finder FinderRegistry FixMath Folders FontSync Fonts GXTypes GestaltEqu HFSVolumes HIArchive HIGeometry HIObject HIObjectCore HIShape HITextUtils HITheme HIToolbar HIToolbox HIView HTMLRendering IBCarbonRuntime ICAApplication ICACamera ICADevice Icons ImageCodec ImageCompression InternetConfig IntlResources Keyboards KeychainCore KeychainHI LanguageAnalysis LaunchServices Lists LowMem MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat Multiprocessing NSL NSLCore NameRegistry Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMCore PMDefinitions Palettes Pasteboard PictUtils Power Printing Processes QDOffscreen QDPictToCGContext QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes Scrap Script Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TypeSelect URLAccess USB UTCUtils UTType UnicodeConverter UnicodeUtilities Video WorldScript fenv fp vBLAS vDSP UTCoreTypes xattr FontPanel CoreAudioTypes AXNotificationConstants AudioHardware AXRoleConstants TranslationServices AXActionConstants HIMovieView CGImageDestination AXValueConstants AXAttributeConstants AXTextAttributedString CGImageProperties CGImageSource UniversalAccess HostTime GPCStrings CGDisplayFades CGLTypes CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns ObjCRuntime -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AVLTree AXErrors AXUIElement AXValue Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AuthSession Authorization AuthorizationDB AuthorizationTags CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFFTPStream CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetServices CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGImage CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindowLevels CMApplication CMCalibrator CMDeviceIntegration CMICCProfile CMMComponent CMPRComponent CMScriptingPlugin CMTypes CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker Components ConditionalMacros ControlDefinitions Controls CoreFoundation CoreGraphics DHCPClientPreferences DateTimeUtils Debugging Devices Dialogs Dictionary Displays Drag DrawSprocket DriverFamilyMatching DriverGestalt DriverSynchronization Endian Events FileTypesAndCreators Files FindByContent Finder FinderRegistry FixMath Folders FontSync Fonts GXTypes GestaltEqu HFSVolumes HIArchive HIGeometry HIObject HIObjectCore HIShape HITextUtils HITheme HIToolbar HIToolbox HIView HTMLRendering IBCarbonRuntime ICAApplication ICACamera ICADevice Icons ImageCodec ImageCompression InternetConfig IntlResources Keyboards KeychainCore KeychainHI LanguageAnalysis LaunchServices Lists LowMem MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat Multiprocessing NSL NSLCore NameRegistry Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMCore PMDefinitions Palettes Pasteboard PictUtils Power Printing Processes QDOffscreen QDPictToCGContext QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes Scrap Script Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TypeSelect URLAccess USB UTCUtils UTType UnicodeConverter UnicodeUtilities Video WorldScript fenv fp vBLAS vDSP UTCoreTypes xattr FontPanel CoreAudioTypes AXNotificationConstants AudioHardware AXRoleConstants TranslationServices AXActionConstants HIMovieView CGImageDestination AXValueConstants AXAttributeConstants AXTextAttributedString CGImageProperties CGImageSource UniversalAccess HostTime GPCStrings CGDisplayFades CGLTypes CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns ObjCRuntime -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -626,9 +556,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLEDIRS+=examples endif @@ -731,9 +658,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLEDIRS+=examples endif @@ -746,9 +670,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLEDIRS+=examples endif @@ -767,21 +688,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif override INSTALL_BUILDUNIT=MacOS override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) @@ -802,9 +711,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -907,9 +813,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -922,9 +825,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -943,21 +843,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -976,9 +864,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -1081,9 +966,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -1096,9 +978,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -1117,21 +996,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1421,11 +1288,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1903,9 +1765,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -2008,9 +1867,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -2023,9 +1879,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -2044,21 +1897,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2086,20 +1927,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2231,15 +2072,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2480,12 +2317,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) @@ -2690,9 +2523,6 @@ ifeq ($(FULL_TARGET),i386-beos) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2795,9 +2625,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2810,9 +2637,6 @@ ifeq ($(FULL_TARGET),arm-palmos) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),arm-wince) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2831,21 +2655,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all --- fpc-2.2.2.orig/fpcsrc/packages/univint/examples/Makefile +++ fpc-2.2.2/fpcsrc/packages/univint/examples/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -276,9 +248,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=controldemo endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=controldemo -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=controldemo endif @@ -381,9 +350,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=controldemo endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=controldemo -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=controldemo endif @@ -396,9 +362,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=controldemo endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=controldemo -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=controldemo endif @@ -417,21 +380,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=controldemo endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=controldemo -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=controldemo endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=controldemo -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=controldemo -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=controldemo -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=controldemo endif @@ -450,9 +401,6 @@ ifeq ($(FULL_TARGET),i386-beos) override CLEAN_UNITS+=controldemo endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=controldemo -endif ifeq ($(FULL_TARGET),i386-netbsd) override CLEAN_UNITS+=controldemo endif @@ -555,9 +503,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override CLEAN_UNITS+=controldemo endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=controldemo -endif ifeq ($(FULL_TARGET),x86_64-win64) override CLEAN_UNITS+=controldemo endif @@ -570,9 +515,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override CLEAN_UNITS+=controldemo endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=controldemo -endif ifeq ($(FULL_TARGET),arm-wince) override CLEAN_UNITS+=controldemo endif @@ -591,21 +533,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=controldemo endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=controldemo -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override CLEAN_UNITS+=controldemo endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=controldemo -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=controldemo -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=controldemo -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -896,11 +826,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1384,10 +1309,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_UNIVINT=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_UNIVINT=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_UNIVINT=1 @@ -1524,10 +1445,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_UNIVINT=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_UNIVINT=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_UNIVINT=1 @@ -1544,10 +1461,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_UNIVINT=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_UNIVINT=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_UNIVINT=1 @@ -1572,26 +1485,10 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_UNIVINT=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_UNIVINT=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_UNIVINT=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_UNIVINT=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_UNIVINT=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_UNIVINT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1645,20 +1542,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1790,13 +1687,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/fpcsrc/packages/fcl-db/Makefile +++ fpc-2.2.2/fpcsrc/packages/fcl-db/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/dbase src/sqlite src/paradox src/export src/datadict src/codegen endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/dbase src/sqlite src/paradox endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/dbase src/sqlite src/paradox src/export src/datadict src/codegen endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/dbase src/sqlite -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/dbase src/export src/datadict src/codegen endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/dbase src/sqlite -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/dbase src/sqlite src/export src/datadict src/codegen endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/dbase src/sqlite src/paradox src/export src/datadict src/codegen endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/dbase src/sqlite -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/dbase src/sqlite src/paradox src/export src/datadict src/codegen -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-S2h endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-S2h endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-S2h endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2h -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -929,11 +859,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1441,9 +1366,6 @@ REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_PXLIB=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_IBASE=1 @@ -1650,15 +1572,6 @@ REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_PXLIB=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_WINUNITS-BASE=1 REQUIRE_PACKAGES_WINUNITS-JEDI=1 @@ -1684,15 +1597,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_IBASE=1 @@ -1724,34 +1628,9 @@ REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_PXLIB=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_FCL-BASE=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_FCL-BASE),) @@ -2013,20 +1892,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2164,13 +2043,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif ifdef TARGET_RSTS override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS)) override CLEANRSTFILES+=$(RSTFILES) @@ -2312,12 +2187,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) @@ -2564,12 +2435,6 @@ TARGET_DIRS_SRC/DATADICT=1 TARGET_DIRS_SRC/CODEGEN=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) TARGET_DIRS_SRC/SDF=1 TARGET_DIRS_SRC/MEMDS=1 @@ -2841,14 +2706,6 @@ TARGET_DIRS_SRC/DATADICT=1 TARGET_DIRS_SRC/CODEGEN=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) TARGET_DIRS_SRC/SDF=1 TARGET_DIRS_SRC/MEMDS=1 @@ -2883,14 +2740,6 @@ TARGET_DIRS_SRC/SQLDB=1 TARGET_DIRS_SRC/BASE=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -endif ifeq ($(FULL_TARGET),arm-wince) TARGET_DIRS_SRC/SDF=1 TARGET_DIRS_SRC/MEMDS=1 @@ -2938,44 +2787,12 @@ TARGET_DIRS_SRC/DATADICT=1 TARGET_DIRS_SRC/CODEGEN=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) TARGET_DIRS_SRC/SDF=1 TARGET_DIRS_SRC/MEMDS=1 TARGET_DIRS_SRC/SQLDB=1 TARGET_DIRS_SRC/BASE=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -TARGET_DIRS_SRC/PARADOX=1 -TARGET_DIRS_SRC/EXPORT=1 -TARGET_DIRS_SRC/DATADICT=1 -TARGET_DIRS_SRC/CODEGEN=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -endif ifdef TARGET_DIRS_SRC/SDF src/sdf_all: $(MAKE) -C src/sdf all --- fpc-2.2.2.orig/fpcsrc/packages/fcl-db/src/codegen/Makefile +++ fpc-2.2.2/fpcsrc/packages/fcl-db/src/codegen/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=fpddcodegen fpcgcreatedbf fpcgdbcoll fpcgsqlconst fpcgtiopf endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=fpddcodegen fpcgcreatedbf fpcgdbcoll fpcgsqlconst fpcgtiopf -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=fpddcodegen fpcgcreatedbf fpcgdbcoll fpcgsqlconst fpcgtiopf endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=fpddcodegen fpcgcreatedbf fpcgdbcoll fpcgsqlconst fpcgtiopf endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=fpddcodegen fpcgcreatedbf fpcgdbcoll fpcgsqlconst fpcgtiopf -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=fpddcodegen fpcgcreatedbf fpcgdbcoll fpcgsqlconst fpcgtiopf endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=fpddcodegen fpcgcreatedbf fpcgdbcoll fpcgsqlconst fpcgtiopf endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=fpddcodegen fpcgcreatedbf fpcgdbcoll fpcgsqlconst fpcgtiopf -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=fpddcodegen fpcgcreatedbf fpcgdbcoll fpcgsqlconst fpcgtiopf endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=fpddcodegen fpcgcreatedbf fpcgdbcoll fpcgsqlconst fpcgtiopf endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=fpddcodegen fpcgcreatedbf fpcgdbcoll fpcgsqlconst fpcgtiopf -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=fpddcodegen fpcgcreatedbf fpcgdbcoll fpcgsqlconst fpcgtiopf endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=fpddcodegen fpcgcreatedbf fpcgdbcoll fpcgsqlconst fpcgtiopf -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=fpddcodegen fpcgcreatedbf fpcgdbcoll fpcgsqlconst fpcgtiopf -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=fpddcodegen fpcgcreatedbf fpcgdbcoll fpcgsqlconst fpcgtiopf -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-S2h endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-S2h endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-S2h endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2h -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -898,11 +828,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1388,10 +1313,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1528,10 +1449,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_WINUNITS-BASE=1 @@ -1550,10 +1467,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1578,26 +1491,10 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1703,20 +1600,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1848,15 +1745,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/packages/fcl-db/src/sqldb/Makefile +++ fpc-2.2.2/fpcsrc/packages/fcl-db/src/sqldb/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -317,30 +289,18 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_DIRS+=interbase postgres mysql odbc oracle sqlite endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_DIRS+=interbase postgres mysql odbc oracle sqlite -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_DIRS+=interbase odbc mysql sqlite endif ifeq ($(FULL_TARGET),arm-linux) override TARGET_DIRS+=interbase postgres mysql odbc oracle sqlite endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_DIRS+=interbase postgres mysql odbc oracle sqlite -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_DIRS+=interbase postgres mysql odbc oracle sqlite endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=interbase postgres mysql odbc oracle sqlite endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_DIRS+=interbase postgres mysql odbc oracle sqlite -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_DIRS+=interbase postgres mysql odbc oracle sqlite -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_UNITS+=sqldb endif @@ -359,9 +319,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=sqldb endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=sqldb -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=sqldb endif @@ -464,9 +421,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=sqldb endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=sqldb -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=sqldb endif @@ -479,9 +433,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=sqldb endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=sqldb -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=sqldb endif @@ -500,21 +451,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=sqldb endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=sqldb -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=sqldb endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=sqldb -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=sqldb -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=sqldb -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=sqldb endif @@ -533,9 +472,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=sqldb endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=sqldb -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=sqldb endif @@ -638,9 +574,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=sqldb endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=sqldb -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=sqldb endif @@ -653,9 +586,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=sqldb endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=sqldb -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=sqldb endif @@ -674,21 +604,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=sqldb endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=sqldb -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=sqldb endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=sqldb -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=sqldb -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=sqldb -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2 @@ -708,9 +626,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-S2 endif @@ -813,9 +728,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-S2 endif @@ -828,9 +740,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-S2 endif @@ -849,21 +758,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2 -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1184,11 +1081,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1690,9 +1582,6 @@ REQUIRE_PACKAGES_ORACLE=1 REQUIRE_PACKAGES_SQLITE=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_IBASE=1 @@ -1885,15 +1774,6 @@ REQUIRE_PACKAGES_ORACLE=1 REQUIRE_PACKAGES_SQLITE=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_IBASE=1 @@ -1916,15 +1796,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_IBASE=1 @@ -1955,33 +1826,9 @@ REQUIRE_PACKAGES_ORACLE=1 REQUIRE_PACKAGES_SQLITE=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2165,20 +2012,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2316,15 +2163,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2805,14 +2648,6 @@ TARGET_DIRS_ORACLE=1 TARGET_DIRS_SQLITE=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_DIRS_INTERBASE=1 -TARGET_DIRS_POSTGRES=1 -TARGET_DIRS_MYSQL=1 -TARGET_DIRS_ODBC=1 -TARGET_DIRS_ORACLE=1 -TARGET_DIRS_SQLITE=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) TARGET_DIRS_INTERBASE=1 TARGET_DIRS_ODBC=1 @@ -2827,14 +2662,6 @@ TARGET_DIRS_ORACLE=1 TARGET_DIRS_SQLITE=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_DIRS_INTERBASE=1 -TARGET_DIRS_POSTGRES=1 -TARGET_DIRS_MYSQL=1 -TARGET_DIRS_ODBC=1 -TARGET_DIRS_ORACLE=1 -TARGET_DIRS_SQLITE=1 -endif ifeq ($(FULL_TARGET),arm-wince) TARGET_DIRS_INTERBASE=1 TARGET_DIRS_POSTGRES=1 @@ -2851,22 +2678,6 @@ TARGET_DIRS_ORACLE=1 TARGET_DIRS_SQLITE=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_DIRS_INTERBASE=1 -TARGET_DIRS_POSTGRES=1 -TARGET_DIRS_MYSQL=1 -TARGET_DIRS_ODBC=1 -TARGET_DIRS_ORACLE=1 -TARGET_DIRS_SQLITE=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -TARGET_DIRS_INTERBASE=1 -TARGET_DIRS_POSTGRES=1 -TARGET_DIRS_MYSQL=1 -TARGET_DIRS_ODBC=1 -TARGET_DIRS_ORACLE=1 -TARGET_DIRS_SQLITE=1 -endif ifdef TARGET_DIRS_INTERBASE interbase_all: $(MAKE) -C interbase all --- fpc-2.2.2.orig/fpcsrc/packages/fcl-db/src/sqldb/odbc/Makefile +++ fpc-2.2.2/fpcsrc/packages/fcl-db/src/sqldb/odbc/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=odbcconn endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=odbcconn -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=odbcconn endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=odbcconn endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=odbcconn -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=odbcconn endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=odbcconn endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=odbcconn -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=odbcconn endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=odbcconn endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=odbcconn -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=odbcconn endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=odbcconn -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=odbcconn -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=odbcconn -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2 @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-S2 endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-S2 endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-S2 endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2 -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -929,11 +859,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1417,10 +1342,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ODBC=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_ODBC=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ODBC=1 @@ -1557,10 +1478,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ODBC=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_ODBC=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ODBC=1 @@ -1577,10 +1494,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ODBC=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_ODBC=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ODBC=1 @@ -1605,26 +1518,10 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ODBC=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_ODBC=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ODBC=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_ODBC=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_ODBC=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_ODBC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1678,20 +1575,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1829,15 +1726,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/packages/fcl-db/src/sqldb/postgres/Makefile +++ fpc-2.2.2/fpcsrc/packages/fcl-db/src/sqldb/postgres/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=pqconnection endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=pqconnection -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=pqconnection endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=pqconnection endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=pqconnection -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=pqconnection endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=pqconnection endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=pqconnection -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=pqconnection endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=pqconnection endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=pqconnection -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=pqconnection endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=pqconnection -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=pqconnection -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=pqconnection -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=pqconnection endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=pqconnection endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=pqconnection -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=pqconnection endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=pqconnection endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=pqconnection -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=pqconnection endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=pqconnection endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=pqconnection -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=pqconnection endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=pqconnection endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=pqconnection -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=pqconnection endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=pqconnection -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=pqconnection -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=pqconnection -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2 @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-S2 endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-S2 endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-S2 endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2 -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1103,11 +1012,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1591,10 +1495,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_POSTGRES=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_POSTGRES=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_POSTGRES=1 @@ -1731,10 +1631,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_POSTGRES=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_POSTGRES=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_POSTGRES=1 @@ -1751,10 +1647,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_POSTGRES=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_POSTGRES=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_POSTGRES=1 @@ -1779,26 +1671,10 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_POSTGRES=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_POSTGRES=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_POSTGRES=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_POSTGRES=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_POSTGRES=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_POSTGRES=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1852,20 +1728,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2003,15 +1879,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/packages/fcl-db/src/sqldb/sqlite/Makefile +++ fpc-2.2.2/fpcsrc/packages/fcl-db/src/sqldb/sqlite/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=sqlite3conn endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=sqlite3conn -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=sqlite3conn endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=sqlite3conn endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=sqlite3conn -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=sqlite3conn endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=sqlite3conn endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=sqlite3conn -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=sqlite3conn endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=sqlite3conn endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=sqlite3conn -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=sqlite3conn endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=sqlite3conn -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=sqlite3conn -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=sqlite3conn -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2 @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-S2 endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-S2 endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-S2 endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2 -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -898,11 +828,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1386,10 +1311,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_SQLITE=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_SQLITE=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_SQLITE=1 @@ -1526,10 +1447,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_SQLITE=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_SQLITE=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_SQLITE=1 @@ -1546,10 +1463,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_SQLITE=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_SQLITE=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_SQLITE=1 @@ -1574,26 +1487,10 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_SQLITE=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_SQLITE=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_SQLITE=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_SQLITE=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_SQLITE=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_SQLITE=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1647,20 +1544,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1792,15 +1689,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/packages/fcl-db/src/sqldb/interbase/Makefile +++ fpc-2.2.2/fpcsrc/packages/fcl-db/src/sqldb/interbase/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=ibconnection endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=ibconnection -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=ibconnection endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=ibconnection endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=ibconnection -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=ibconnection endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=ibconnection endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=ibconnection -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=ibconnection endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=ibconnection endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=ibconnection -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=ibconnection endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=ibconnection -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=ibconnection -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=ibconnection -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2 @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-S2 endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-S2 endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-S2 endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2 -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -929,11 +859,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1417,10 +1342,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_IBASE=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_IBASE=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_IBASE=1 @@ -1557,10 +1478,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_IBASE=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_IBASE=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_IBASE=1 @@ -1577,10 +1494,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_IBASE=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_IBASE=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_IBASE=1 @@ -1605,26 +1518,10 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_IBASE=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_IBASE=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_IBASE=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_IBASE=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_IBASE=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_IBASE=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1678,20 +1575,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1829,15 +1726,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/packages/fcl-db/src/sqldb/oracle/Makefile +++ fpc-2.2.2/fpcsrc/packages/fcl-db/src/sqldb/oracle/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=oracleconnection endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=oracleconnection -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=oracleconnection endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=oracleconnection endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=oracleconnection -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=oracleconnection endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=oracleconnection endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=oracleconnection -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=oracleconnection endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=oracleconnection endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=oracleconnection -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=oracleconnection endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=oracleconnection -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2 @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-S2 endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-S2 endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-S2 endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2 -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -929,11 +859,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1417,10 +1342,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ORACLE=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_ORACLE=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ORACLE=1 @@ -1557,10 +1478,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ORACLE=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_ORACLE=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ORACLE=1 @@ -1577,10 +1494,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ORACLE=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_ORACLE=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ORACLE=1 @@ -1605,26 +1518,10 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ORACLE=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_ORACLE=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ORACLE=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_ORACLE=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1678,20 +1575,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1829,15 +1726,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/packages/fcl-db/src/sqldb/mysql/Makefile +++ fpc-2.2.2/fpcsrc/packages/fcl-db/src/sqldb/mysql/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2 @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-S2 endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-S2 endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-S2 endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2 -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -929,11 +859,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1417,10 +1342,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_MYSQL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_MYSQL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_MYSQL=1 @@ -1557,10 +1478,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_MYSQL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_MYSQL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_MYSQL=1 @@ -1577,10 +1494,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_MYSQL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_MYSQL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_MYSQL=1 @@ -1605,26 +1518,10 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_MYSQL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_MYSQL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_MYSQL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_MYSQL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_MYSQL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_MYSQL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1678,20 +1575,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1829,15 +1726,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/packages/fcl-db/src/memds/Makefile +++ fpc-2.2.2/fpcsrc/packages/fcl-db/src/memds/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=memds endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=memds -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=memds endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=memds endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=memds -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=memds endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=memds endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=memds -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=memds endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=memds endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=memds -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=memds endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=memds -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=memds -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=memds -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=memds endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=memds endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=memds -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=memds endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=memds endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=memds -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=memds endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=memds endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=memds -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=memds endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=memds endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=memds -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=memds endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=memds -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=memds -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=memds -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=testpop testopen testld testcp endif @@ -626,9 +556,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLES+=testpop testopen testld testcp endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=testpop testopen testld testcp -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLES+=testpop testopen testld testcp endif @@ -731,9 +658,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLES+=testpop testopen testld testcp endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=testpop testopen testld testcp -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLES+=testpop testopen testld testcp endif @@ -746,9 +670,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLES+=testpop testopen testld testcp endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=testpop testopen testld testcp -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLES+=testpop testopen testld testcp endif @@ -767,21 +688,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLES+=testpop testopen testld testcp endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=testpop testopen testld testcp -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLES+=testpop testopen testld testcp endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=testpop testopen testld testcp -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=testpop testopen testld testcp -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=testpop testopen testld testcp -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1072,11 +981,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1554,9 +1458,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1659,9 +1560,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1674,9 +1572,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1695,21 +1590,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1737,20 +1620,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1882,15 +1765,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/packages/fcl-db/src/sqlite/Makefile +++ fpc-2.2.2/fpcsrc/packages/fcl-db/src/sqlite/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=customsqliteds sqliteds sqlite3ds endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=customsqliteds sqliteds sqlite3ds -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=customsqliteds sqliteds sqlite3ds endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=customsqliteds sqliteds sqlite3ds endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=customsqliteds sqliteds sqlite3ds -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=customsqliteds sqliteds sqlite3ds endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=customsqliteds sqliteds sqlite3ds endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=customsqliteds sqliteds sqlite3ds -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=customsqliteds sqliteds sqlite3ds endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=customsqliteds sqliteds sqlite3ds endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=customsqliteds sqliteds sqlite3ds -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=customsqliteds sqliteds sqlite3ds endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=customsqliteds sqliteds sqlite3ds -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=customsqliteds sqliteds sqlite3ds -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=customsqliteds sqliteds sqlite3ds -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -724,11 +675,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1212,10 +1158,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_SQLITE=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_SQLITE=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_SQLITE=1 @@ -1352,10 +1294,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_SQLITE=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_SQLITE=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_SQLITE=1 @@ -1372,10 +1310,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_SQLITE=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_SQLITE=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_SQLITE=1 @@ -1400,26 +1334,10 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_SQLITE=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_SQLITE=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_SQLITE=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_SQLITE=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_SQLITE=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_SQLITE=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1473,20 +1391,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1618,15 +1536,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/packages/fcl-db/src/dbase/Makefile +++ fpc-2.2.2/fpcsrc/packages/fcl-db/src/dbase/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -286,9 +258,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=dbf endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=dbf -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=dbf endif @@ -391,9 +360,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=dbf endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=dbf -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=dbf endif @@ -406,9 +372,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=dbf endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=dbf -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=dbf endif @@ -427,21 +390,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=dbf endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=dbf -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=dbf endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=dbf -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=dbf -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=dbf -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=testdbf endif @@ -460,9 +411,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLES+=testdbf endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=testdbf -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLES+=testdbf endif @@ -565,9 +513,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLES+=testdbf endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=testdbf -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLES+=testdbf endif @@ -580,9 +525,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLES+=testdbf endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=testdbf -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLES+=testdbf endif @@ -601,21 +543,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLES+=testdbf endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=testdbf -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLES+=testdbf endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=testdbf -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=testdbf -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=testdbf -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif @@ -634,9 +564,6 @@ ifeq ($(FULL_TARGET),i386-beos) override CLEAN_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str -endif ifeq ($(FULL_TARGET),i386-netbsd) override CLEAN_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif @@ -739,9 +666,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override CLEAN_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str -endif ifeq ($(FULL_TARGET),x86_64-win64) override CLEAN_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif @@ -754,9 +678,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override CLEAN_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str -endif ifeq ($(FULL_TARGET),arm-wince) override CLEAN_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif @@ -775,21 +696,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override CLEAN_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str -endif ifeq ($(FULL_TARGET),i386-linux) override INSTALL_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif @@ -808,9 +717,6 @@ ifeq ($(FULL_TARGET),i386-beos) override INSTALL_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif -ifeq ($(FULL_TARGET),i386-haiku) -override INSTALL_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str -endif ifeq ($(FULL_TARGET),i386-netbsd) override INSTALL_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif @@ -913,9 +819,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override INSTALL_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override INSTALL_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str -endif ifeq ($(FULL_TARGET),x86_64-win64) override INSTALL_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif @@ -928,9 +831,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override INSTALL_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif -ifeq ($(FULL_TARGET),arm-darwin) -override INSTALL_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str -endif ifeq ($(FULL_TARGET),arm-wince) override INSTALL_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif @@ -949,21 +849,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override INSTALL_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override INSTALL_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override INSTALL_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif -ifeq ($(FULL_TARGET),avr-embedded) -override INSTALL_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str -endif -ifeq ($(FULL_TARGET),armeb-linux) -override INSTALL_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override INSTALL_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2 -Sh @@ -983,9 +871,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-S2 -Sh endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2 -Sh -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-S2 -Sh endif @@ -1088,9 +973,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-S2 -Sh endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2 -Sh -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-S2 -Sh endif @@ -1103,9 +985,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-S2 -Sh endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2 -Sh -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-S2 -Sh endif @@ -1124,21 +1003,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-S2 -Sh endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2 -Sh -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-S2 -Sh endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2 -Sh -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2 -Sh -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2 -Sh -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1428,11 +1295,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1910,9 +1772,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -2015,9 +1874,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -2030,9 +1886,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -2051,21 +1904,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2093,20 +1934,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2238,15 +2079,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/packages/fcl-db/src/sdf/Makefile +++ fpc-2.2.2/fpcsrc/packages/fcl-db/src/sdf/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=sdfdata endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=sdfdata -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=sdfdata endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=sdfdata endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=sdfdata -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=sdfdata endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=sdfdata endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=sdfdata -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=sdfdata endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=sdfdata endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=sdfdata -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=sdfdata endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=sdfdata -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=sdfdata -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=sdfdata -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=testsdf testfix endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLES+=testsdf testfix endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=testsdf testfix -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLES+=testsdf testfix endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLES+=testsdf testfix endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=testsdf testfix -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLES+=testsdf testfix endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLES+=testsdf testfix endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=testsdf testfix -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLES+=testsdf testfix endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLES+=testsdf testfix endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=testsdf testfix -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLES+=testsdf testfix endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=testsdf testfix -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=testsdf testfix -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=testsdf testfix -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -898,11 +828,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1380,9 +1305,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1485,9 +1407,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1500,9 +1419,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1521,21 +1437,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1563,20 +1467,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1708,15 +1612,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/packages/fcl-db/src/export/Makefile +++ fpc-2.2.2/fpcsrc/packages/fcl-db/src/export/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-S2h endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-S2h endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-S2h endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2h -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1072,11 +981,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1562,10 +1466,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1702,10 +1602,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_WINUNITS-BASE=1 @@ -1724,10 +1620,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1752,26 +1644,10 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1877,20 +1753,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2022,15 +1898,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/packages/fcl-db/src/datadict/Makefile +++ fpc-2.2.2/fpcsrc/packages/fcl-db/src/datadict/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=fpdatadict fpdddbf fpddsqldb endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=fpdatadict fpdddbf fpddsqldb -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=fpdatadict fpdddbf fpddsqldb fpddfb fpddmysql40 fpddmysql41 fpddmysql50 fpddodbc fpddpq fpddoracle fpddsqlite3 fpddregstd endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=fpdatadict fpdddbf fpddsqldb fpddfb fpddmysql40 fpddmysql41 fpddmysql50 fpddodbc fpddpq fpddoracle fpddsqlite3 fpddregstd endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=fpdatadict fpdddbf fpddsqldb fpddfb fpddmysql40 fpddmysql41 fpddmysql50 fpddodbc fpddpq fpddoracle fpddsqlite3 fpddregstd -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=fpdatadict fpdddbf fpddsqldb fpddodbc fpddsqlite3 endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=fpdatadict fpdddbf fpddsqldb endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=fpdatadict fpdddbf fpddsqldb fpddfb fpddmysql40 fpddmysql41 fpddmysql50 fpddodbc fpddpq fpddoracle fpddsqlite3 fpddregstd -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=fpdatadict fpdddbf fpddsqldb fpddsqlite3 endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=fpdatadict fpdddbf fpddsqldb fpddfb fpddmysql40 fpddmysql41 fpddmysql50 fpddodbc fpddpq fpddoracle fpddsqlite3 fpddregstd endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=fpdatadict fpdddbf fpddsqldb fpddfb fpddmysql40 fpddmysql41 fpddmysql50 fpddodbc fpddpq fpddoracle fpddsqlite3 fpddregstd -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=fpdatadict fpdddbf fpddsqldb endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=fpdatadict fpdddbf fpddsqldb -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=fpdatadict fpdddbf fpddsqldb fpddfb fpddmysql40 fpddmysql41 fpddmysql50 fpddodbc fpddpq fpddoracle fpddsqlite3 fpddregstd -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=fpdatadict fpdddbf fpddsqldb -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=fpdatadict fpddfb fpddsqldb fpddfb fpddmysql40 fpddmysql41 fpddmysql50 fpddodbc fpddpq fpddoracle fpddsqlite3 fpddregstd endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=fpdatadict fpddfb fpddsqldb endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=fpdatadict fpddfb fpddsqldb -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=fpdatadict fpddfb fpddsqldb fpddfb fpddmysql40 fpddmysql41 fpddmysql50 fpddodbc fpddpq fpddoracle fpddsqlite3 fpddregstd endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=fpdatadict fpddfb fpddsqldb fpddfb fpddmysql40 fpddmysql41 fpddmysql50 fpddodbc fpddpq fpddoracle fpddsqlite3 fpddregstd endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=fpdatadict fpddfb fpddsqldb fpddfb fpddmysql40 fpddmysql41 fpddmysql50 fpddodbc fpddpq fpddoracle fpddsqlite3 fpddregstd -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=fpdatadict fpddfb fpddsqldb fpddfb fpddpq fpddodbc fpddsqlite3 endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=fpdatadict fpddfb fpddsqldb endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=fpdatadict fpddfb fpddsqldb fpddfb fpddmysql40 fpddmysql41 fpddmysql50 fpddodbc fpddpq fpddoracle fpddsqlite3 fpddregstd -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=fpdatadict fpddfb fpddsqldb fpddfb fpddpq fpddsqlite3 endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=fpdatadict fpddfb fpddsqldb fpddfb fpddmysql40 fpddmysql41 fpddmysql50 fpddodbc fpddpq fpddoracle fpddsqlite3 fpddregstd endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=fpdatadict fpddfb fpddsqldb fpddfb fpddmysql40 fpddmysql41 fpddmysql50 fpddodbc fpddpq fpddoracle fpddsqlite3 fpddregstd -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=fpdatadict fpddfb fpddsqldb endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=fpdatadict fpddfb fpddsqldb -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=fpdatadict fpddfb fpddsqldb fpddfb fpddmysql40 fpddmysql41 fpddmysql50 fpddodbc fpddpq fpddoracle fpddsqlite3 fpddregstd -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=fpdatadict fpddfb fpddsqldb -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-S2h endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-S2h endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-S2h endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2h -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1103,11 +1012,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1611,10 +1515,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1841,16 +1741,6 @@ REQUIRE_PACKAGES_ODBC=1 REQUIRE_PACKAGES_POSTGRES=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_POSTGRES=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_WINUNITS-BASE=1 @@ -1877,16 +1767,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_POSTGRES=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1923,38 +1803,10 @@ REQUIRE_PACKAGES_ODBC=1 REQUIRE_PACKAGES_POSTGRES=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_POSTGRES=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_POSTGRES=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2216,20 +2068,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2367,15 +2219,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/packages/fcl-db/src/base/Makefile +++ fpc-2.2.2/fpcsrc/packages/fcl-db/src/base/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset dbcoll endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset dbcoll -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset dbcoll endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset dbcoll endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset dbcoll -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset dbcoll endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset dbcoll endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset dbcoll -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset dbcoll endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset dbcoll endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset dbcoll -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset dbcoll endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset dbcoll -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset dbcoll -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset dbcoll -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=dbwhtml dbconst dbcoll endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=dbwhtml dbconst dbcoll endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=dbwhtml dbconst dbcoll -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=dbwhtml dbconst dbcoll endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=dbwhtml dbconst dbcoll endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=dbwhtml dbconst dbcoll -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=dbwhtml dbconst dbcoll endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=dbwhtml dbconst dbcoll endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=dbwhtml dbconst dbcoll -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=dbwhtml dbconst dbcoll endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=dbwhtml dbconst dbcoll endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=dbwhtml dbconst dbcoll -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=dbwhtml dbconst dbcoll endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=dbwhtml dbconst dbcoll -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=dbwhtml dbconst dbcoll -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=dbwhtml dbconst dbcoll -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-S2h endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-S2h endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-S2h endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITDIR+=../dbase endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_UNITDIR+=../dbase endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_UNITDIR+=../dbase -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_UNITDIR+=../dbase endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_UNITDIR+=../dbase endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_UNITDIR+=../dbase -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_UNITDIR+=../dbase endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_UNITDIR+=../dbase endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_UNITDIR+=../dbase -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_UNITDIR+=../dbase endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITDIR+=../dbase endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_UNITDIR+=../dbase -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_UNITDIR+=../dbase endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_UNITDIR+=../dbase -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_UNITDIR+=../dbase -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_UNITDIR+=../dbase -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1246,11 +1134,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1736,10 +1619,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1876,10 +1755,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_WINUNITS-BASE=1 @@ -1898,10 +1773,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1926,26 +1797,10 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2051,20 +1906,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2196,15 +2051,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/packages/fcl-db/src/paradox/Makefile +++ fpc-2.2.2/fpcsrc/packages/fcl-db/src/paradox/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=paradox endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=paradox -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=paradox endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=paradox endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=paradox -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=paradox endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=paradox endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=paradox -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=paradox endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=paradox endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=paradox -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=paradox endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=paradox -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=paradox -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=paradox -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=paradox endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=paradox endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=paradox -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=paradox endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=paradox endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=paradox -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=paradox endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=paradox endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=paradox -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=paradox endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=paradox endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=paradox -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=paradox endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=paradox -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=paradox -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=paradox -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -898,11 +828,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1386,10 +1311,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PXLIB=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PXLIB=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PXLIB=1 @@ -1526,10 +1447,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PXLIB=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PXLIB=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PXLIB=1 @@ -1546,10 +1463,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PXLIB=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PXLIB=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PXLIB=1 @@ -1574,26 +1487,10 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PXLIB=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PXLIB=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PXLIB=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PXLIB=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PXLIB=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PXLIB=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1647,20 +1544,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1792,15 +1689,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/packages/fcl-async/Makefile +++ fpc-2.2.2/fpcsrc/packages/fcl-async/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=libasync fpasync endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=libasync fpasync -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=libasync fpasync endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=libasync fpasync endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=libasync fpasync -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=libasync fpasync endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=libasync fpasync endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=libasync fpasync -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=libasync fpasync endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=libasync fpasync endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=libasync fpasync -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=libasync fpasync endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=libasync fpasync -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=libasync fpasync -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=libasync fpasync -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src src/unix @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src src/unix endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src src/unix endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src src/unix endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src src/unix -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src src/unix -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src src/unix endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src src/unix -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src src/unix -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src src/unix endif @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src src/unix endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src src/unix endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src src/unix endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src src/unix -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src src/unix -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src src/unix endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src src/unix -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src src/unix -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1072,11 +981,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1554,9 +1458,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1659,9 +1560,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1674,9 +1572,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1695,21 +1590,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1737,20 +1620,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1882,15 +1765,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2113,12 +1992,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/unzip/Makefile +++ fpc-2.2.2/fpcsrc/packages/unzip/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=ziptypes unzip endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=ziptypes unzip -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=ziptypes unzip endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=ziptypes unzip endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=ziptypes unzip -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=ziptypes unzip endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=ziptypes unzip endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=ziptypes unzip -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=ziptypes unzip endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=ziptypes unzip endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=ziptypes unzip -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=ziptypes unzip endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=ziptypes unzip -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=ziptypes unzip -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=ziptypes unzip -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1072,11 +981,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1554,9 +1458,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1659,9 +1560,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1674,9 +1572,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1695,21 +1590,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1737,20 +1620,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1882,15 +1765,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2113,12 +1992,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/fcl-json/Makefile +++ fpc-2.2.2/fpcsrc/packages/fcl-json/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-S2h endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-S2h endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-S2h endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1246,11 +1134,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1736,10 +1619,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1876,10 +1755,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_WINUNITS-BASE=1 @@ -1898,10 +1773,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1926,26 +1797,10 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2051,20 +1906,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2196,15 +2051,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2427,12 +2278,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/xforms/Makefile +++ fpc-2.2.2/fpcsrc/packages/xforms/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=fd2pascal endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=fd2pascal -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=fd2pascal endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=fd2pascal endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=fd2pascal -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=fd2pascal endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=fd2pascal endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=fd2pascal -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=fd2pascal endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=fd2pascal endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=fd2pascal -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=fd2pascal endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=fd2pascal -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=fd2pascal -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=fd2pascal -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_UNITS+=xforms endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=xforms endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=xforms -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=xforms endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=xforms endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=xforms -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=xforms endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=xforms endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=xforms -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=xforms endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=xforms endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=xforms -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=xforms endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=xforms -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=xforms -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=xforms -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -626,9 +556,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLEDIRS+=examples endif @@ -731,9 +658,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLEDIRS+=examples endif @@ -746,9 +670,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLEDIRS+=examples endif @@ -767,21 +688,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -975,9 +863,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests examples endif @@ -1080,9 +965,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests examples endif @@ -1095,9 +977,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests examples endif @@ -1116,21 +995,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1453,11 +1320,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1941,10 +1803,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 @@ -2081,10 +1939,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 @@ -2101,10 +1955,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 @@ -2129,26 +1979,10 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2202,20 +2036,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2353,15 +2187,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2619,12 +2449,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) @@ -2829,9 +2655,6 @@ ifeq ($(FULL_TARGET),i386-beos) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2934,9 +2757,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2949,9 +2769,6 @@ ifeq ($(FULL_TARGET),arm-palmos) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),arm-wince) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2970,21 +2787,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all --- fpc-2.2.2.orig/fpcsrc/packages/xforms/examples/Makefile +++ fpc-2.2.2/fpcsrc/packages/xforms/examples/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -276,9 +248,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=pushme yesno pushbutton touchbutton minput inputall choice butttypes colsel colsel1 buttonall chartall positioner secretinput cursor fdial ldial ndial invslider sliderall borderwidth boxtype xyplotover arrowbutton browserop browserall chartstrip colbrowser counter fbrowse1 fbrowse flclock fonts goodies lalign ll longlabel menu objinactive objpos newbutton multilabel objreturn endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=pushme yesno pushbutton touchbutton minput inputall choice butttypes colsel colsel1 buttonall chartall positioner secretinput cursor fdial ldial ndial invslider sliderall borderwidth boxtype xyplotover arrowbutton browserop browserall chartstrip colbrowser counter fbrowse1 fbrowse flclock fonts goodies lalign ll longlabel menu objinactive objpos newbutton multilabel objreturn -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=pushme yesno pushbutton touchbutton minput inputall choice butttypes colsel colsel1 buttonall chartall positioner secretinput cursor fdial ldial ndial invslider sliderall borderwidth boxtype xyplotover arrowbutton browserop browserall chartstrip colbrowser counter fbrowse1 fbrowse flclock fonts goodies lalign ll longlabel menu objinactive objpos newbutton multilabel objreturn endif @@ -381,9 +350,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=pushme yesno pushbutton touchbutton minput inputall choice butttypes colsel colsel1 buttonall chartall positioner secretinput cursor fdial ldial ndial invslider sliderall borderwidth boxtype xyplotover arrowbutton browserop browserall chartstrip colbrowser counter fbrowse1 fbrowse flclock fonts goodies lalign ll longlabel menu objinactive objpos newbutton multilabel objreturn endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=pushme yesno pushbutton touchbutton minput inputall choice butttypes colsel colsel1 buttonall chartall positioner secretinput cursor fdial ldial ndial invslider sliderall borderwidth boxtype xyplotover arrowbutton browserop browserall chartstrip colbrowser counter fbrowse1 fbrowse flclock fonts goodies lalign ll longlabel menu objinactive objpos newbutton multilabel objreturn -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=pushme yesno pushbutton touchbutton minput inputall choice butttypes colsel colsel1 buttonall chartall positioner secretinput cursor fdial ldial ndial invslider sliderall borderwidth boxtype xyplotover arrowbutton browserop browserall chartstrip colbrowser counter fbrowse1 fbrowse flclock fonts goodies lalign ll longlabel menu objinactive objpos newbutton multilabel objreturn endif @@ -396,9 +362,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=pushme yesno pushbutton touchbutton minput inputall choice butttypes colsel colsel1 buttonall chartall positioner secretinput cursor fdial ldial ndial invslider sliderall borderwidth boxtype xyplotover arrowbutton browserop browserall chartstrip colbrowser counter fbrowse1 fbrowse flclock fonts goodies lalign ll longlabel menu objinactive objpos newbutton multilabel objreturn endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=pushme yesno pushbutton touchbutton minput inputall choice butttypes colsel colsel1 buttonall chartall positioner secretinput cursor fdial ldial ndial invslider sliderall borderwidth boxtype xyplotover arrowbutton browserop browserall chartstrip colbrowser counter fbrowse1 fbrowse flclock fonts goodies lalign ll longlabel menu objinactive objpos newbutton multilabel objreturn -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=pushme yesno pushbutton touchbutton minput inputall choice butttypes colsel colsel1 buttonall chartall positioner secretinput cursor fdial ldial ndial invslider sliderall borderwidth boxtype xyplotover arrowbutton browserop browserall chartstrip colbrowser counter fbrowse1 fbrowse flclock fonts goodies lalign ll longlabel menu objinactive objpos newbutton multilabel objreturn endif @@ -417,21 +380,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=pushme yesno pushbutton touchbutton minput inputall choice butttypes colsel colsel1 buttonall chartall positioner secretinput cursor fdial ldial ndial invslider sliderall borderwidth boxtype xyplotover arrowbutton browserop browserall chartstrip colbrowser counter fbrowse1 fbrowse flclock fonts goodies lalign ll longlabel menu objinactive objpos newbutton multilabel objreturn endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=pushme yesno pushbutton touchbutton minput inputall choice butttypes colsel colsel1 buttonall chartall positioner secretinput cursor fdial ldial ndial invslider sliderall borderwidth boxtype xyplotover arrowbutton browserop browserall chartstrip colbrowser counter fbrowse1 fbrowse flclock fonts goodies lalign ll longlabel menu objinactive objpos newbutton multilabel objreturn -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=pushme yesno pushbutton touchbutton minput inputall choice butttypes colsel colsel1 buttonall chartall positioner secretinput cursor fdial ldial ndial invslider sliderall borderwidth boxtype xyplotover arrowbutton browserop browserall chartstrip colbrowser counter fbrowse1 fbrowse flclock fonts goodies lalign ll longlabel menu objinactive objpos newbutton multilabel objreturn endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=pushme yesno pushbutton touchbutton minput inputall choice butttypes colsel colsel1 buttonall chartall positioner secretinput cursor fdial ldial ndial invslider sliderall borderwidth boxtype xyplotover arrowbutton browserop browserall chartstrip colbrowser counter fbrowse1 fbrowse flclock fonts goodies lalign ll longlabel menu objinactive objpos newbutton multilabel objreturn -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=pushme yesno pushbutton touchbutton minput inputall choice butttypes colsel colsel1 buttonall chartall positioner secretinput cursor fdial ldial ndial invslider sliderall borderwidth boxtype xyplotover arrowbutton browserop browserall chartstrip colbrowser counter fbrowse1 fbrowse flclock fonts goodies lalign ll longlabel menu objinactive objpos newbutton multilabel objreturn -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=pushme yesno pushbutton touchbutton minput inputall choice butttypes colsel colsel1 buttonall chartall positioner secretinput cursor fdial ldial ndial invslider sliderall borderwidth boxtype xyplotover arrowbutton browserop browserall chartstrip colbrowser counter fbrowse1 fbrowse flclock fonts goodies lalign ll longlabel menu objinactive objpos newbutton multilabel objreturn -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -753,11 +704,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1247,11 +1193,6 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_XFORMS=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_XFORMS=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 @@ -1422,11 +1363,6 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_XFORMS=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_XFORMS=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 @@ -1447,11 +1383,6 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_XFORMS=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_XFORMS=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 @@ -1482,31 +1413,11 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_XFORMS=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_XFORMS=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_XFORMS=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_XFORMS=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_XFORMS=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_XFORMS=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1586,20 +1497,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1737,13 +1648,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/fpcsrc/packages/fpgtk/Makefile +++ fpc-2.2.2/fpcsrc/packages/fpgtk/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=fpglib fpgtk fpgtkext endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=fpglib fpgtk fpgtkext -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=fpglib fpgtk fpgtkext endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=fpglib fpgtk fpgtkext endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=fpglib fpgtk fpgtkext -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=fpglib fpgtk fpgtkext endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=fpglib fpgtk fpgtkext endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=fpglib fpgtk fpgtkext -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=fpglib fpgtk fpgtkext endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=fpglib fpgtk fpgtkext endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=fpglib fpgtk fpgtkext -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=fpglib fpgtk fpgtkext endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=fpglib fpgtk fpgtkext -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=fpglib fpgtk fpgtkext -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=fpglib fpgtk fpgtkext -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=fpgtk fpgtkext endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=fpgtk fpgtkext endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=fpgtk fpgtkext -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=fpgtk fpgtkext endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=fpgtk fpgtkext endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=fpgtk fpgtkext -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=fpgtk fpgtkext endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=fpgtk fpgtkext endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=fpgtk fpgtkext -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=fpgtk fpgtkext endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=fpgtk fpgtkext endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=fpgtk fpgtkext -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=fpgtk fpgtkext endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=fpgtk fpgtkext -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=fpgtk fpgtkext -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=fpgtk fpgtkext -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1277,11 +1165,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1781,12 +1664,6 @@ REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -2005,13 +1882,6 @@ REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_WINUNITS-BASE=1 @@ -2039,13 +1909,6 @@ REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -2083,38 +1946,12 @@ REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2298,20 +2135,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2449,15 +2286,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2680,12 +2513,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/tcl/Makefile +++ fpc-2.2.2/fpcsrc/packages/tcl/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=tcl80 endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=tcl80 -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=tcl80 endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=tcl80 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=tcl80 -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=tcl80 endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=tcl80 endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=tcl80 -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=tcl80 endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=tcl80 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=tcl80 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=tcl80 endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=tcl80 -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=tcl_demo endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLES+=tcl_demo endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=tcl_demo -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLES+=tcl_demo endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLES+=tcl_demo endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=tcl_demo -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLES+=tcl_demo endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLES+=tcl_demo endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=tcl_demo -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLES+=tcl_demo endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLES+=tcl_demo endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=tcl_demo -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLES+=tcl_demo endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=tcl_demo -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1279,11 +1167,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1769,10 +1652,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1909,10 +1788,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_WINUNITS-BASE=1 @@ -1931,10 +1806,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1959,26 +1830,10 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2084,20 +1939,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2235,15 +2090,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2484,12 +2335,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/hash/Makefile +++ fpc-2.2.2/fpcsrc/packages/hash/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=md5 crc ntlm uuid endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=md5 crc ntlm uuid -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=md5 crc ntlm uuid endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=md5 crc ntlm uuid endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=md5 crc ntlm uuid -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=md5 crc ntlm uuid endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=md5 crc ntlm uuid endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=md5 crc ntlm uuid -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=md5 crc ntlm uuid endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=md5 crc ntlm uuid unixcrypt endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=md5 crc ntlm uuid -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=md5 crc ntlm uuid endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=md5 crc ntlm uuid -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=md5 crc ntlm uuid unixcrypt -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=md5 crc ntlm uuid -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=mdtest endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLES+=mdtest endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=mdtest -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLES+=mdtest endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLES+=mdtest endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=mdtest -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLES+=mdtest endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLES+=mdtest endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=mdtest -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLES+=mdtest endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLES+=mdtest endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=mdtest -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLES+=mdtest endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=mdtest -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=mdtest -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=mdtest -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1072,11 +981,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1554,9 +1458,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1659,9 +1560,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1674,9 +1572,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1695,21 +1590,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1737,20 +1620,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1882,15 +1765,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2131,12 +2010,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/numlib/Makefile +++ fpc-2.2.2/fpcsrc/packages/numlib/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=typ omv dsl mdt det eig eigh1 eigh2 int inv iom ipf ode roo sle spe spl numlib endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=typ omv dsl mdt det eig eigh1 eigh2 int inv iom ipf ode roo sle spe spl numlib -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=typ omv dsl mdt det eig eigh1 eigh2 int inv iom ipf ode roo sle spe spl numlib endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=typ omv dsl mdt det eig eigh1 eigh2 int inv iom ipf ode roo sle spe spl numlib endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=typ omv dsl mdt det eig eigh1 eigh2 int inv iom ipf ode roo sle spe spl numlib -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=typ omv dsl mdt det eig eigh1 eigh2 int inv iom ipf ode roo sle spe spl numlib endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=typ omv dsl mdt det eig eigh1 eigh2 int inv iom ipf ode roo sle spe spl numlib endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=typ omv dsl mdt det eig eigh1 eigh2 int inv iom ipf ode roo sle spe spl numlib -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=typ omv dsl mdt det eig eigh1 eigh2 int inv iom ipf ode roo sle spe spl numlib endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=typ omv dsl mdt det eig eigh1 eigh2 int inv iom ipf ode roo sle spe spl numlib endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=typ omv dsl mdt det eig eigh1 eigh2 int inv iom ipf ode roo sle spe spl numlib -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=typ omv dsl mdt det eig eigh1 eigh2 int inv iom ipf ode roo sle spe spl numlib endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=typ omv dsl mdt det eig eigh1 eigh2 int inv iom ipf ode roo sle spe spl numlib -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=typ omv dsl mdt det eig eigh1 eigh2 int inv iom ipf ode roo sle spe spl numlib -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=typ omv dsl mdt det eig eigh1 eigh2 int inv iom ipf ode roo sle spe spl numlib -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests examples endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests examples endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests examples endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1072,11 +981,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1554,9 +1458,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1659,9 +1560,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1674,9 +1572,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1695,21 +1590,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1737,20 +1620,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1882,15 +1765,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2113,12 +1992,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/graph/Makefile +++ fpc-2.2.2/fpcsrc/packages/graph/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -330,9 +302,6 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=$(GRAPH_UNIT) $(GGIGRAPH_UNIT) endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=$(GRAPH_UNIT) $(GGIGRAPH_UNIT) -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT) endif @@ -351,9 +320,6 @@ ifeq ($(FULL_TARGET),i386-beos) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT) endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT) -endif ifeq ($(FULL_TARGET),i386-netbsd) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT) endif @@ -456,9 +422,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT) -endif ifeq ($(FULL_TARGET),x86_64-win64) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT) endif @@ -471,9 +434,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT) endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT) -endif ifeq ($(FULL_TARGET),arm-wince) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT) endif @@ -492,21 +452,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT) endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT) -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2 @@ -526,9 +474,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-S2 endif @@ -631,9 +576,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-S2 endif @@ -646,9 +588,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-S2 endif @@ -667,21 +606,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc src/unix endif @@ -700,9 +627,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc src/unix endif @@ -805,9 +729,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc src/unix endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc src/unix -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc endif @@ -820,9 +741,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc src/unix -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc endif @@ -841,21 +759,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc src/unix endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc src/unix -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc src/unix -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples endif @@ -874,9 +780,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples endif @@ -979,9 +882,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples endif @@ -994,9 +894,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples endif @@ -1015,21 +912,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples -endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1352,11 +1237,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1843,9 +1723,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1963,9 +1840,6 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_SDL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1978,9 +1852,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1999,21 +1870,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2119,20 +1978,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2270,15 +2129,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2501,12 +2356,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/dbus/Makefile +++ fpc-2.2.2/fpcsrc/packages/dbus/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=dbus endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=dbus -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=dbus endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=dbus endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=dbus -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=dbus endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=dbus endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=dbus -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=dbus endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=dbus endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=dbus -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=dbus endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=dbus -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLEDIRS+=examples endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLEDIRS+=examples endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLEDIRS+=examples endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests examples endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests examples endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests examples endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1277,11 +1165,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1759,9 +1642,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1864,9 +1744,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1879,9 +1756,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1900,21 +1774,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1942,20 +1804,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2093,15 +1955,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2342,12 +2200,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) @@ -2552,9 +2406,6 @@ ifeq ($(FULL_TARGET),i386-beos) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2657,9 +2508,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2672,9 +2520,6 @@ ifeq ($(FULL_TARGET),arm-palmos) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),arm-wince) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2693,21 +2538,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all --- fpc-2.2.2.orig/fpcsrc/packages/dbus/examples/Makefile +++ fpc-2.2.2/fpcsrc/packages/dbus/examples/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -276,9 +248,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=busexample endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=busexample -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=busexample endif @@ -381,9 +350,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=busexample endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=busexample -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=busexample endif @@ -396,9 +362,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=busexample endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=busexample -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=busexample endif @@ -417,21 +380,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=busexample endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=busexample -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=busexample endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=busexample -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=busexample -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=busexample -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -753,11 +704,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1241,10 +1187,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_DBUS=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_DBUS=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_DBUS=1 @@ -1381,10 +1323,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_DBUS=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_DBUS=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_DBUS=1 @@ -1401,10 +1339,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_DBUS=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_DBUS=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_DBUS=1 @@ -1429,26 +1363,10 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_DBUS=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_DBUS=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_DBUS=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_DBUS=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_DBUS=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_DBUS=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1502,20 +1420,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1653,13 +1571,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/fpcsrc/packages/odbc/Makefile +++ fpc-2.2.2/fpcsrc/packages/odbc/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=odbcsql odbcsqldyn endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=odbcsql odbcsqldyn -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=odbcsql odbcsqldyn endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=odbcsql odbcsqldyn endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=odbcsql odbcsqldyn -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=odbcsql odbcsqldyn endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=odbcsql odbcsqldyn endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=odbcsql odbcsqldyn -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=odbcsql odbcsqldyn endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=odbcsql odbcsqldyn endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=odbcsql odbcsqldyn -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=odbcsql odbcsqldyn endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=odbcsql odbcsqldyn -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=odbcsql odbcsqldyn -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=odbcsql odbcsqldyn -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=testodbc endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLES+=testodbc endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=testodbc -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLES+=testodbc endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLES+=testodbc endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=testodbc -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLES+=testodbc endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLES+=testodbc endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=testodbc -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLES+=testodbc endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLES+=testodbc endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=testodbc -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLES+=testodbc endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=testodbc -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=testodbc -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=testodbc -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests examples endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests examples endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests examples endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1279,11 +1167,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1761,9 +1644,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1866,9 +1746,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1881,9 +1758,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1902,21 +1776,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1944,20 +1806,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2095,15 +1957,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2344,12 +2202,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/ldap/Makefile +++ fpc-2.2.2/fpcsrc/packages/ldap/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=lber ldap endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=lber ldap -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=lber ldap endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=lber ldap endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=lber ldap -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=lber ldap endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=lber ldap endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=lber ldap -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=lber ldap endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=lber ldap endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=lber ldap -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=lber ldap endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=lber ldap -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=lber ldap -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=lber ldap -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1072,11 +981,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1560,10 +1464,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 @@ -1700,10 +1600,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 @@ -1720,10 +1616,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 @@ -1748,26 +1640,10 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1821,20 +1697,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1966,15 +1842,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2197,12 +2069,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/postgres/Makefile +++ fpc-2.2.2/fpcsrc/packages/postgres/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=dllist dllistdyn postgres postgres3 postgres3dyn endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=dllist dllistdyn postgres postgres3 postgres3dyn -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=dllist dllistdyn postgres postgres3 postgres3dyn endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=dllist dllistdyn postgres postgres3 postgres3dyn endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=dllist dllistdyn postgres postgres3 postgres3dyn -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=dllist dllistdyn postgres postgres3 postgres3dyn endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=dllist dllistdyn postgres postgres3 postgres3dyn endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=dllist dllistdyn postgres postgres3 postgres3dyn -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=dllist dllistdyn postgres postgres3 postgres3dyn endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=dllist dllistdyn postgres postgres3 postgres3dyn endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=dllist dllistdyn postgres postgres3 postgres3dyn -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=dllist dllistdyn postgres postgres3 postgres3dyn endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=dllist dllistdyn postgres postgres3 postgres3dyn -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=dllist dllistdyn postgres postgres3 postgres3dyn -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=dllist dllistdyn postgres postgres3 postgres3dyn -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=testpg1 testpg2 endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLES+=testpg1 testpg2 endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=testpg1 testpg2 -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLES+=testpg1 testpg2 endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLES+=testpg1 testpg2 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=testpg1 testpg2 -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLES+=testpg1 testpg2 endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLES+=testpg1 testpg2 endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=testpg1 testpg2 -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLES+=testpg1 testpg2 endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLES+=testpg1 testpg2 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=testpg1 testpg2 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLES+=testpg1 testpg2 endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=testpg1 testpg2 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=testpg1 testpg2 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=testpg1 testpg2 -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests examples endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests examples endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests examples endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1279,11 +1167,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1761,9 +1644,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1866,9 +1746,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1881,9 +1758,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1902,21 +1776,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1944,20 +1806,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2095,15 +1957,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2344,12 +2202,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/oggvorbis/Makefile +++ fpc-2.2.2/fpcsrc/packages/oggvorbis/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=ogg vorbis endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=ogg vorbis -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=ogg vorbis endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=ogg vorbis endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=ogg vorbis -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=ogg vorbis endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=ogg vorbis endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=ogg vorbis -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=ogg vorbis endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=ogg vorbis endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=ogg vorbis -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=ogg vorbis endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=ogg vorbis -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=ogg vorbis -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=ogg vorbis -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1072,11 +981,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1554,9 +1458,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1659,9 +1560,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1674,9 +1572,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1695,21 +1590,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1737,20 +1620,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1882,15 +1765,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2113,12 +1992,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/pxlib/Makefile +++ fpc-2.2.2/fpcsrc/packages/pxlib/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -314,24 +286,12 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=pxlib endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=pxlib -endif ifeq ($(FULL_TARGET),arm-linux) override TARGET_UNITS+=pxlib endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=pxlib -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=pxlib endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=pxlib -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=pxlib -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=ppxview endif @@ -386,24 +346,12 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLES+=ppxview endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=ppxview -endif ifeq ($(FULL_TARGET),arm-linux) override TARGET_EXAMPLES+=ppxview endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=ppxview -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLES+=ppxview endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=ppxview -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=ppxview -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src @@ -423,9 +371,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src endif @@ -528,9 +473,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src endif @@ -543,9 +485,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src endif @@ -564,21 +503,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -868,11 +795,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1350,9 +1272,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1455,9 +1374,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1470,9 +1386,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1491,21 +1404,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1533,20 +1434,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1678,15 +1579,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -1927,12 +1824,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/fv/Makefile +++ fpc-2.2.2/fpcsrc/packages/fv/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=buildfv endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=buildfv -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=buildfv endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=buildfv endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=buildfv -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=buildfv endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=buildfv endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=buildfv -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=buildfv endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=buildfv endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=buildfv -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=buildfv endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=buildfv -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=buildfv -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=buildfv -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=app colortxt dialogs drivers editors fvcommon fvconsts gadgets histlist inplong memory menus msgbox statuses stddlg tabs time validate views sysmsg asciitab timeddlg outline endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_IMPLICITUNITS+=app colortxt dialogs drivers editors fvcommon fvconsts gadgets histlist inplong memory menus msgbox statuses stddlg tabs time validate views sysmsg asciitab timeddlg outline endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_IMPLICITUNITS+=app colortxt dialogs drivers editors fvcommon fvconsts gadgets histlist inplong memory menus msgbox statuses stddlg tabs time validate views sysmsg asciitab timeddlg outline -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_IMPLICITUNITS+=app colortxt dialogs drivers editors fvcommon fvconsts gadgets histlist inplong memory menus msgbox statuses stddlg tabs time validate views sysmsg asciitab timeddlg outline endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_IMPLICITUNITS+=app colortxt dialogs drivers editors fvcommon fvconsts gadgets histlist inplong memory menus msgbox statuses stddlg tabs time validate views sysmsg asciitab timeddlg outline endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_IMPLICITUNITS+=app colortxt dialogs drivers editors fvcommon fvconsts gadgets histlist inplong memory menus msgbox statuses stddlg tabs time validate views sysmsg asciitab timeddlg outline -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_IMPLICITUNITS+=app colortxt dialogs drivers editors fvcommon fvconsts gadgets histlist inplong memory menus msgbox statuses stddlg tabs time validate views sysmsg asciitab timeddlg outline endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_IMPLICITUNITS+=app colortxt dialogs drivers editors fvcommon fvconsts gadgets histlist inplong memory menus msgbox statuses stddlg tabs time validate views sysmsg asciitab timeddlg outline endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_IMPLICITUNITS+=app colortxt dialogs drivers editors fvcommon fvconsts gadgets histlist inplong memory menus msgbox statuses stddlg tabs time validate views sysmsg asciitab timeddlg outline -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_IMPLICITUNITS+=app colortxt dialogs drivers editors fvcommon fvconsts gadgets histlist inplong memory menus msgbox statuses stddlg tabs time validate views sysmsg asciitab timeddlg outline endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_IMPLICITUNITS+=app colortxt dialogs drivers editors fvcommon fvconsts gadgets histlist inplong memory menus msgbox statuses stddlg tabs time validate views sysmsg asciitab timeddlg outline endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_IMPLICITUNITS+=app colortxt dialogs drivers editors fvcommon fvconsts gadgets histlist inplong memory menus msgbox statuses stddlg tabs time validate views sysmsg asciitab timeddlg outline -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_IMPLICITUNITS+=app colortxt dialogs drivers editors fvcommon fvconsts gadgets histlist inplong memory menus msgbox statuses stddlg tabs time validate views sysmsg asciitab timeddlg outline endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_IMPLICITUNITS+=app colortxt dialogs drivers editors fvcommon fvconsts gadgets histlist inplong memory menus msgbox statuses stddlg tabs time validate views sysmsg asciitab timeddlg outline -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_IMPLICITUNITS+=app colortxt dialogs drivers editors fvcommon fvconsts gadgets histlist inplong memory menus msgbox statuses stddlg tabs time validate views sysmsg asciitab timeddlg outline -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_IMPLICITUNITS+=app colortxt dialogs drivers editors fvcommon fvconsts gadgets histlist inplong memory menus msgbox statuses stddlg tabs time validate views sysmsg asciitab timeddlg outline -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=app dialogs editors msgbox stddlg endif @@ -626,9 +556,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=app dialogs editors msgbox stddlg endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=app dialogs editors msgbox stddlg -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=app dialogs editors msgbox stddlg endif @@ -731,9 +658,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=app dialogs editors msgbox stddlg endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=app dialogs editors msgbox stddlg -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=app dialogs editors msgbox stddlg endif @@ -746,9 +670,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=app dialogs editors msgbox stddlg endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=app dialogs editors msgbox stddlg -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=app dialogs editors msgbox stddlg endif @@ -767,21 +688,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=app dialogs editors msgbox stddlg endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=app dialogs editors msgbox stddlg -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=app dialogs editors msgbox stddlg endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=app dialogs editors msgbox stddlg -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=app dialogs editors msgbox stddlg -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=app dialogs editors msgbox stddlg -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -800,9 +709,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLEDIRS+=examples endif @@ -905,9 +811,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLEDIRS+=examples endif @@ -920,9 +823,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLEDIRS+=examples endif @@ -941,21 +841,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif override INSTALL_BUILDUNIT=buildfv override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) @@ -976,9 +864,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src endif @@ -1081,9 +966,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src endif @@ -1096,9 +978,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src endif @@ -1117,21 +996,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1421,11 +1288,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1903,9 +1765,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -2008,9 +1867,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -2023,9 +1879,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -2044,21 +1897,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2086,20 +1927,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2231,15 +2072,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2480,12 +2317,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) @@ -2690,9 +2523,6 @@ ifeq ($(FULL_TARGET),i386-beos) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2795,9 +2625,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2810,9 +2637,6 @@ ifeq ($(FULL_TARGET),arm-palmos) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),arm-wince) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2831,21 +2655,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all --- fpc-2.2.2.orig/fpcsrc/packages/fv/examples/Makefile +++ fpc-2.2.2/fpcsrc/packages/fv/examples/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -276,9 +248,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=testapp endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=testapp -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=testapp endif @@ -381,9 +350,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=testapp endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=testapp -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=testapp endif @@ -396,9 +362,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=testapp endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=testapp -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=testapp endif @@ -417,21 +380,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=testapp endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=testapp -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=testapp endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=testapp -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=testapp -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=testapp -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -721,11 +672,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1209,10 +1155,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FV=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FV=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FV=1 @@ -1349,10 +1291,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FV=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FV=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FV=1 @@ -1369,10 +1307,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FV=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FV=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FV=1 @@ -1397,26 +1331,10 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FV=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FV=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FV=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FV=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FV=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FV=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1470,20 +1388,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1615,13 +1533,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/fpcsrc/packages/chm/Makefile +++ fpc-2.2.2/fpcsrc/packages/chm/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=chmcmd chmls endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=chmcmd chmls -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=chmcmd chmls endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=chmcmd chmls endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=chmcmd chmls -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=chmcmd chmls endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=chmcmd chmls endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=chmcmd chmls -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=chmcmd chmls endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=chmcmd chmls endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=chmcmd chmls -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=chmcmd chmls endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=chmcmd chmls -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1246,11 +1134,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1742,11 +1625,6 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1917,11 +1795,6 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_WINUNITS-BASE=1 @@ -1944,11 +1817,6 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1979,31 +1847,11 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2135,20 +1983,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2280,15 +2128,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2528,12 +2372,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/openssl/Makefile +++ fpc-2.2.2/fpcsrc/packages/openssl/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=openssl endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=openssl -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=openssl endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=openssl endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=openssl -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=openssl endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=openssl endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=openssl -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=openssl endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=openssl endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=openssl -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=openssl endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=openssl -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=openssl -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=openssl -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests examples endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests examples endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests examples endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1072,11 +981,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1554,9 +1458,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1659,9 +1560,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1674,9 +1572,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1695,21 +1590,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1737,20 +1620,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1882,15 +1765,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2113,12 +1992,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/amunits/Makefile +++ fpc-2.2.2/fpcsrc/packages/amunits/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests endif @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1072,11 +981,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1554,9 +1458,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1659,9 +1560,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1674,9 +1572,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1695,21 +1590,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1737,20 +1620,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1882,15 +1765,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2113,12 +1992,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/fcl-web/Makefile +++ fpc-2.2.2/fpcsrc/packages/fcl-web/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform cgiapp ezcgi endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform cgiapp ezcgi -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform cgiapp ezcgi endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform cgiapp ezcgi endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform cgiapp ezcgi -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform cgiapp ezcgi endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform cgiapp ezcgi endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform cgiapp ezcgi -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform cgiapp ezcgi endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform cgiapp ezcgi endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform cgiapp ezcgi -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform cgiapp ezcgi endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform cgiapp ezcgi -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform cgiapp ezcgi -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform cgiapp ezcgi -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=fpcgi fphtml fpweb websession cgiapp endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=fpcgi fphtml fpweb websession cgiapp endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=fpcgi fphtml fpweb websession cgiapp -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=fpcgi fphtml fpweb websession cgiapp endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=fpcgi fphtml fpweb websession cgiapp endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=fpcgi fphtml fpweb websession cgiapp -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=fpcgi fphtml fpweb websession cgiapp endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=fpcgi fphtml fpweb websession cgiapp endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=fpcgi fphtml fpweb websession cgiapp -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=fpcgi fphtml fpweb websession cgiapp endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=fpcgi fphtml fpweb websession cgiapp endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=fpcgi fphtml fpweb websession cgiapp -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=fpcgi fphtml fpweb websession cgiapp endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=fpcgi fphtml fpweb websession cgiapp -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=fpcgi fphtml fpweb websession cgiapp -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=fpcgi fphtml fpweb websession cgiapp -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-S2h endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-S2h endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-S2h endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1277,11 +1165,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1813,13 +1696,6 @@ REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_PXLIB=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -2162,19 +2038,6 @@ REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_PXLIB=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_WINUNITS-BASE=1 @@ -2216,19 +2079,6 @@ REQUIRE_PACKAGES_FCL-DB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -2284,19 +2134,6 @@ REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_PXLIB=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -2304,34 +2141,6 @@ REQUIRE_PACKAGES_FCL-DB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2697,20 +2506,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2848,15 +2657,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -3079,12 +2884,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/mad/Makefile +++ fpc-2.2.2/fpcsrc/packages/mad/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=mad endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=mad -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=mad endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=mad endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=mad -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=mad endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=mad endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=mad -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=mad endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=mad endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=mad -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=mad endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=mad -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=mad -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=mad -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1072,11 +981,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1554,9 +1458,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1659,9 +1560,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1674,9 +1572,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1695,21 +1590,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1737,20 +1620,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1882,15 +1765,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2113,12 +1992,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/svgalib/Makefile +++ fpc-2.2.2/fpcsrc/packages/svgalib/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=svgalib vgamouse endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=svgalib vgamouse -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=svgalib vgamouse endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=svgalib vgamouse endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=svgalib vgamouse -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=svgalib vgamouse endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=svgalib vgamouse endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=svgalib vgamouse -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=svgalib vgamouse endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=svgalib vgamouse endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=svgalib vgamouse -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=svgalib vgamouse endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=svgalib vgamouse -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=testvga vgatest endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLES+=testvga vgatest endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=testvga vgatest -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLES+=testvga vgatest endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLES+=testvga vgatest endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=testvga vgatest -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLES+=testvga vgatest endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLES+=testvga vgatest endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=testvga vgatest -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLES+=testvga vgatest endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLES+=testvga vgatest endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=testvga vgatest -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLES+=testvga vgatest endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=testvga vgatest -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=testvga vgatest -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=testvga vgatest -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests examples endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests examples endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests examples endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1277,11 +1165,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1759,9 +1642,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1864,9 +1744,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1879,9 +1756,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1900,21 +1774,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1942,20 +1804,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2093,15 +1955,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2342,12 +2200,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/libpng/Makefile +++ fpc-2.2.2/fpcsrc/packages/libpng/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=png endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=png -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=png endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=png endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=png -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=png endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=png endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=png -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=png endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=png endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=png -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=png endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=png -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=png -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=png -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1105,11 +1014,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1593,10 +1497,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ZLIB=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_ZLIB=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ZLIB=1 @@ -1733,10 +1633,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ZLIB=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_ZLIB=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ZLIB=1 @@ -1753,10 +1649,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ZLIB=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_ZLIB=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ZLIB=1 @@ -1781,26 +1673,10 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ZLIB=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_ZLIB=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ZLIB=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_ZLIB=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_ZLIB=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_ZLIB=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1854,20 +1730,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2005,15 +1881,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2236,12 +2108,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/fcl-net/Makefile +++ fpc-2.2.2/fpcsrc/packages/fcl-net/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -314,24 +286,12 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=mkxmlrpc endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=mkxmlrpc -endif ifeq ($(FULL_TARGET),arm-linux) override TARGET_PROGRAMS+=mkxmlrpc endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=mkxmlrpc -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=mkxmlrpc endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=mkxmlrpc -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=mkxmlrpc -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_UNITS+=servlets netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc endif @@ -350,9 +310,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=servlets netdb resolve ssockets endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=servlets -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=servlets netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc endif @@ -455,9 +412,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=servlets netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=servlets netdb resolve ssockets -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=servlets resolve ssockets endif @@ -470,9 +424,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=servlets endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=servlets netdb resolve ssockets -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=servlets resolve ssockets endif @@ -491,21 +442,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=servlets netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=servlets netdb resolve ssockets -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=servlets endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=servlets -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=servlets netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=servlets -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=fpsock httpsvlt mkxmlrpc endif @@ -554,24 +493,12 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=fpsock httpsvlt mkxmlrpc endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=fpsock httpsvlt mkxmlrpc -endif ifeq ($(FULL_TARGET),arm-linux) override TARGET_RSTS+=fpsock httpsvlt mkxmlrpc endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=fpsock httpsvlt mkxmlrpc -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=fpsock httpsvlt mkxmlrpc endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=fpsock httpsvlt mkxmlrpc -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=fpsock httpsvlt mkxmlrpc -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -591,9 +518,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-S2h endif @@ -696,9 +620,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-S2h endif @@ -711,9 +632,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-S2h endif @@ -732,21 +650,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix endif @@ -765,9 +671,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix endif @@ -870,9 +773,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/win endif @@ -885,9 +785,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/win endif @@ -906,21 +803,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif @@ -939,9 +824,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif @@ -1044,9 +926,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif @@ -1059,9 +938,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif @@ -1080,21 +956,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1384,11 +1248,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1892,13 +1751,6 @@ REQUIRE_PACKAGES_FCL-PASSRC=1 REQUIRE_PACKAGES_FCL-ASYNC=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-ASYNC=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -2137,13 +1989,6 @@ REQUIRE_PACKAGES_FCL-PASSRC=1 REQUIRE_PACKAGES_FCL-ASYNC=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-ASYNC=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_WINUNITS-BASE=1 @@ -2174,13 +2019,6 @@ REQUIRE_PACKAGES_FCL-PASSRC=1 REQUIRE_PACKAGES_FCL-ASYNC=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-ASYNC=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -2223,13 +2061,6 @@ REQUIRE_PACKAGES_FCL-PASSRC=1 REQUIRE_PACKAGES_FCL-ASYNC=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-ASYNC=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -2237,27 +2068,6 @@ REQUIRE_PACKAGES_FCL-PASSRC=1 REQUIRE_PACKAGES_FCL-ASYNC=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-ASYNC=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-ASYNC=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-ASYNC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2441,20 +2251,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2586,15 +2396,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2834,12 +2640,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/sqlite/Makefile +++ fpc-2.2.2/fpcsrc/packages/sqlite/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests examples endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests examples endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests examples endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1074,11 +983,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1556,9 +1460,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1661,9 +1562,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1676,9 +1574,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1697,21 +1592,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1739,20 +1622,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1884,15 +1767,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2115,12 +1994,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/pasjpeg/Makefile +++ fpc-2.2.2/fpcsrc/packages/pasjpeg/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=buildpasjpeg endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=buildpasjpeg -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=buildpasjpeg endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=buildpasjpeg endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=buildpasjpeg -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=buildpasjpeg endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=buildpasjpeg endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=buildpasjpeg -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=buildpasjpeg endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=buildpasjpeg endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=buildpasjpeg -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=buildpasjpeg endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=buildpasjpeg -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=buildpasjpeg -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=buildpasjpeg -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom endif @@ -626,9 +556,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom endif @@ -731,9 +658,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom endif @@ -746,9 +670,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom endif @@ -767,21 +688,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1246,11 +1134,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1728,9 +1611,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1833,9 +1713,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1848,9 +1725,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1869,21 +1743,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1911,20 +1773,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2056,15 +1918,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2305,12 +2163,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/fcl-image/Makefile +++ fpc-2.2.2/fpcsrc/packages/fcl-image/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=fpimgcmn fpimage pngcomn fpreadpng fpwritepng fpreadxpm fpwritexpm clipping fpcanvas pixtools fppixlcanv fpimgcanv pscanvas fpwritebmp fpreadbmp bmpcomn fpreadpnm fpwritepnm fpreadjpeg fpwritejpeg pcxcomn fpreadpcx fpwritepcx targacmn fpreadtga fpwritetga ellipses fpcolhash fpditherer fpquantizer extinterpolation endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=fpimgcmn fpimage pngcomn fpreadpng fpwritepng fpreadxpm fpwritexpm clipping fpcanvas pixtools fppixlcanv fpimgcanv pscanvas fpwritebmp fpreadbmp bmpcomn fpreadpnm fpwritepnm fpreadjpeg fpwritejpeg pcxcomn fpreadpcx fpwritepcx targacmn fpreadtga fpwritetga ellipses fpcolhash fpditherer fpquantizer extinterpolation -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=fpimgcmn fpimage pngcomn fpreadpng fpwritepng fpreadxpm fpwritexpm clipping fpcanvas pixtools fppixlcanv fpimgcanv pscanvas fpwritebmp fpreadbmp bmpcomn fpreadpnm fpwritepnm fpreadjpeg fpwritejpeg pcxcomn fpreadpcx fpwritepcx targacmn fpreadtga fpwritetga ellipses fpcolhash fpditherer fpquantizer extinterpolation endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=fpimgcmn fpimage pngcomn fpreadpng fpwritepng fpreadxpm fpwritexpm clipping fpcanvas pixtools fppixlcanv fpimgcanv pscanvas fpwritebmp fpreadbmp bmpcomn fpreadpnm fpwritepnm fpreadjpeg fpwritejpeg pcxcomn fpreadpcx fpwritepcx targacmn fpreadtga fpwritetga ellipses fpcolhash fpditherer fpquantizer extinterpolation freetypeh freetype ftfont endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=fpimgcmn fpimage pngcomn fpreadpng fpwritepng fpreadxpm fpwritexpm clipping fpcanvas pixtools fppixlcanv fpimgcanv pscanvas fpwritebmp fpreadbmp bmpcomn fpreadpnm fpwritepnm fpreadjpeg fpwritejpeg pcxcomn fpreadpcx fpwritepcx targacmn fpreadtga fpwritetga ellipses fpcolhash fpditherer fpquantizer extinterpolation freetypeh freetype ftfont -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=fpimgcmn fpimage pngcomn fpreadpng fpwritepng fpreadxpm fpwritexpm clipping fpcanvas pixtools fppixlcanv fpimgcanv pscanvas fpwritebmp fpreadbmp bmpcomn fpreadpnm fpwritepnm fpreadjpeg fpwritejpeg pcxcomn fpreadpcx fpwritepcx targacmn fpreadtga fpwritetga ellipses fpcolhash fpditherer fpquantizer extinterpolation endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=fpimgcmn fpimage pngcomn fpreadpng fpwritepng fpreadxpm fpwritexpm clipping fpcanvas pixtools fppixlcanv fpimgcanv pscanvas fpwritebmp fpreadbmp bmpcomn fpreadpnm fpwritepnm fpreadjpeg fpwritejpeg pcxcomn fpreadpcx fpwritepcx targacmn fpreadtga fpwritetga ellipses fpcolhash fpditherer fpquantizer extinterpolation endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=fpimgcmn fpimage pngcomn fpreadpng fpwritepng fpreadxpm fpwritexpm clipping fpcanvas pixtools fppixlcanv fpimgcanv pscanvas fpwritebmp fpreadbmp bmpcomn fpreadpnm fpwritepnm fpreadjpeg fpwritejpeg pcxcomn fpreadpcx fpwritepcx targacmn fpreadtga fpwritetga ellipses fpcolhash fpditherer fpquantizer extinterpolation freetypeh freetype ftfont -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=fpimgcmn fpimage pngcomn fpreadpng fpwritepng fpreadxpm fpwritexpm clipping fpcanvas pixtools fppixlcanv fpimgcanv pscanvas fpwritebmp fpreadbmp bmpcomn fpreadpnm fpwritepnm fpreadjpeg fpwritejpeg pcxcomn fpreadpcx fpwritepcx targacmn fpreadtga fpwritetga ellipses fpcolhash fpditherer fpquantizer extinterpolation endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=fpimgcmn fpimage pngcomn fpreadpng fpwritepng fpreadxpm fpwritexpm clipping fpcanvas pixtools fppixlcanv fpimgcanv pscanvas fpwritebmp fpreadbmp bmpcomn fpreadpnm fpwritepnm fpreadjpeg fpwritejpeg pcxcomn fpreadpcx fpwritepcx targacmn fpreadtga fpwritetga ellipses fpcolhash fpditherer fpquantizer extinterpolation freetypeh freetype ftfont endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=fpimgcmn fpimage pngcomn fpreadpng fpwritepng fpreadxpm fpwritexpm clipping fpcanvas pixtools fppixlcanv fpimgcanv pscanvas fpwritebmp fpreadbmp bmpcomn fpreadpnm fpwritepnm fpreadjpeg fpwritejpeg pcxcomn fpreadpcx fpwritepcx targacmn fpreadtga fpwritetga ellipses fpcolhash fpditherer fpquantizer extinterpolation freetypeh freetype ftfont -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=fpimgcmn fpimage pngcomn fpreadpng fpwritepng fpreadxpm fpwritexpm clipping fpcanvas pixtools fppixlcanv fpimgcanv pscanvas fpwritebmp fpreadbmp bmpcomn fpreadpnm fpwritepnm fpreadjpeg fpwritejpeg pcxcomn fpreadpcx fpwritepcx targacmn fpreadtga fpwritetga ellipses fpcolhash fpditherer fpquantizer extinterpolation endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=fpimgcmn fpimage pngcomn fpreadpng fpwritepng fpreadxpm fpwritexpm clipping fpcanvas pixtools fppixlcanv fpimgcanv pscanvas fpwritebmp fpreadbmp bmpcomn fpreadpnm fpwritepnm fpreadjpeg fpwritejpeg pcxcomn fpreadpcx fpwritepcx targacmn fpreadtga fpwritetga ellipses fpcolhash fpditherer fpquantizer extinterpolation -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=fpimgcmn fpimage pngcomn fpreadpng fpwritepng fpreadxpm fpwritexpm clipping fpcanvas pixtools fppixlcanv fpimgcanv pscanvas fpwritebmp fpreadbmp bmpcomn fpreadpnm fpwritepnm fpreadjpeg fpwritejpeg pcxcomn fpreadpcx fpwritepcx targacmn fpreadtga fpwritetga ellipses fpcolhash fpditherer fpquantizer extinterpolation freetypeh freetype ftfont -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=fpimgcmn fpimage pngcomn fpreadpng fpwritepng fpreadxpm fpwritexpm clipping fpcanvas pixtools fppixlcanv fpimgcanv pscanvas fpwritebmp fpreadbmp bmpcomn fpreadpnm fpwritepnm fpreadjpeg fpwritejpeg pcxcomn fpreadpcx fpwritepcx targacmn fpreadtga fpwritetga ellipses fpcolhash fpditherer fpquantizer extinterpolation -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=pscanvas endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=pscanvas endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=pscanvas -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=pscanvas endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=pscanvas endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=pscanvas -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=pscanvas endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=pscanvas endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=pscanvas -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=pscanvas endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=pscanvas endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=pscanvas -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=pscanvas endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=pscanvas -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=pscanvas -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=pscanvas -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=imgconv endif @@ -626,9 +556,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLES+=imgconv endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=imgconv -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLES+=imgconv endif @@ -731,9 +658,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLES+=imgconv endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=imgconv -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLES+=imgconv endif @@ -746,9 +670,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLES+=imgconv endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=imgconv -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLES+=imgconv endif @@ -767,21 +688,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLES+=imgconv endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=imgconv -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLES+=imgconv endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=imgconv -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=imgconv -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=imgconv -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-S2h endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-S2h endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-S2h endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -975,9 +863,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src endif @@ -1080,9 +965,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src endif @@ -1095,9 +977,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src endif @@ -1116,21 +995,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1420,11 +1287,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1928,13 +1790,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASJPEG=1 @@ -2173,13 +2028,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASJPEG=1 @@ -2210,13 +2058,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASJPEG=1 @@ -2259,13 +2100,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASJPEG=1 @@ -2273,27 +2107,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2477,20 +2290,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2622,15 +2435,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2871,12 +2680,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/pthreads/Makefile +++ fpc-2.2.2/fpcsrc/packages/pthreads/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=pthreads endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=pthreads -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=pthreads endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=pthreads endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=pthreads -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=pthreads endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=pthreads endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=pthreads -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=pthreads endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=pthreads endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=pthreads -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=pthreads endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=pthreads -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=pthreads -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=pthreads -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1072,11 +981,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1554,9 +1458,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1659,9 +1560,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1674,9 +1572,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1695,21 +1590,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1737,20 +1620,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1882,15 +1765,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2113,12 +1992,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/sdl/Makefile +++ fpc-2.2.2/fpcsrc/packages/sdl/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1103,11 +1012,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1597,11 +1501,6 @@ REQUIRE_PACKAGES_PTHREADS=1 REQUIRE_PACKAGES_X11=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PTHREADS=1 @@ -1772,11 +1671,6 @@ REQUIRE_PACKAGES_PTHREADS=1 REQUIRE_PACKAGES_X11=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PTHREADS=1 @@ -1797,11 +1691,6 @@ REQUIRE_PACKAGES_PTHREADS=1 REQUIRE_PACKAGES_X11=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PTHREADS=1 @@ -1832,31 +1721,11 @@ REQUIRE_PACKAGES_PTHREADS=1 REQUIRE_PACKAGES_X11=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PTHREADS=1 REQUIRE_PACKAGES_X11=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1936,20 +1805,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2087,15 +1956,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2318,12 +2183,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/gtk2/Makefile +++ fpc-2.2.2/fpcsrc/packages/gtk2/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -283,9 +255,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=src/buildgtk2 endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=src/buildgtk2 -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=src/buildgtk2 endif @@ -388,9 +357,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=src/buildgtk2 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=src/buildgtk2 -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=src/buildgtk2 endif @@ -403,9 +369,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=src/buildgtk2 endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=src/buildgtk2 -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=src/buildgtk2 endif @@ -424,21 +387,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=src/buildgtk2 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=src/buildgtk2 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=src/buildgtk2 endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=src/buildgtk2 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=src/buildgtk2 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=src/buildgtk2 -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=glib2 gtkhtml atk pango gdk2pixbuf gdk2 gtk2 libglade2 gtkglext gdkglext $(GDK2X) endif @@ -457,9 +408,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_IMPLICITUNITS+=glib2 gtkhtml atk pango gdk2pixbuf gdk2 gtk2 libglade2 gtkglext gdkglext $(GDK2X) endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_IMPLICITUNITS+=glib2 gtkhtml atk pango gdk2pixbuf gdk2 gtk2 libglade2 gtkglext gdkglext $(GDK2X) -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_IMPLICITUNITS+=glib2 gtkhtml atk pango gdk2pixbuf gdk2 gtk2 libglade2 gtkglext gdkglext $(GDK2X) endif @@ -562,9 +510,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_IMPLICITUNITS+=glib2 gtkhtml atk pango gdk2pixbuf gdk2 gtk2 libglade2 gtkglext gdkglext $(GDK2X) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_IMPLICITUNITS+=glib2 gtkhtml atk pango gdk2pixbuf gdk2 gtk2 libglade2 gtkglext gdkglext $(GDK2X) -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_IMPLICITUNITS+=glib2 gtkhtml atk pango gdk2pixbuf gdk2 gtk2 libglade2 gtkglext gdkglext $(GDK2X) endif @@ -577,9 +522,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_IMPLICITUNITS+=glib2 gtkhtml atk pango gdk2pixbuf gdk2 gtk2 libglade2 gtkglext gdkglext $(GDK2X) endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_IMPLICITUNITS+=glib2 gtkhtml atk pango gdk2pixbuf gdk2 gtk2 libglade2 gtkglext gdkglext $(GDK2X) -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_IMPLICITUNITS+=glib2 gtkhtml atk pango gdk2pixbuf gdk2 gtk2 libglade2 gtkglext gdkglext $(GDK2X) endif @@ -598,21 +540,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_IMPLICITUNITS+=glib2 gtkhtml atk pango gdk2pixbuf gdk2 gtk2 libglade2 gtkglext gdkglext $(GDK2X) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_IMPLICITUNITS+=glib2 gtkhtml atk pango gdk2pixbuf gdk2 gtk2 libglade2 gtkglext gdkglext $(GDK2X) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_IMPLICITUNITS+=glib2 gtkhtml atk pango gdk2pixbuf gdk2 gtk2 libglade2 gtkglext gdkglext $(GDK2X) endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_IMPLICITUNITS+=glib2 gtkhtml atk pango gdk2pixbuf gdk2 gtk2 libglade2 gtkglext gdkglext $(GDK2X) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_IMPLICITUNITS+=glib2 gtkhtml atk pango gdk2pixbuf gdk2 gtk2 libglade2 gtkglext gdkglext $(GDK2X) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_IMPLICITUNITS+=glib2 gtkhtml atk pango gdk2pixbuf gdk2 gtk2 libglade2 gtkglext gdkglext $(GDK2X) -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -631,9 +561,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLEDIRS+=examples endif @@ -736,9 +663,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLEDIRS+=examples endif @@ -751,9 +675,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLEDIRS+=examples endif @@ -772,21 +693,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif override INSTALL_BUILDUNIT=buildgtk2 override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) @@ -807,9 +716,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=$(GTK2X11INCLUDE) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=$(GTK2X11INCLUDE) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=$(GTK2X11INCLUDE) endif @@ -912,9 +818,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=$(GTK2X11INCLUDE) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=$(GTK2X11INCLUDE) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=$(GTK2X11INCLUDE) endif @@ -927,9 +830,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=$(GTK2X11INCLUDE) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=$(GTK2X11INCLUDE) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=$(GTK2X11INCLUDE) endif @@ -948,21 +848,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=$(GTK2X11INCLUDE) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=$(GTK2X11INCLUDE) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=$(GTK2X11INCLUDE) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=$(GTK2X11INCLUDE) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=$(GTK2X11INCLUDE) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=$(GTK2X11INCLUDE) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITDIR+=src src/glib src/atk src/pango src/gtk+/gdk-pixbuf src/gtk+/gdk src/gtk+/gtk src/libglade src/gtkglext src/gtkhtml src/$(GTK2X11) endif @@ -981,9 +869,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_UNITDIR+=src src/glib src/atk src/pango src/gtk+/gdk-pixbuf src/gtk+/gdk src/gtk+/gtk src/libglade src/gtkglext src/gtkhtml src/$(GTK2X11) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_UNITDIR+=src src/glib src/atk src/pango src/gtk+/gdk-pixbuf src/gtk+/gdk src/gtk+/gtk src/libglade src/gtkglext src/gtkhtml src/$(GTK2X11) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_UNITDIR+=src src/glib src/atk src/pango src/gtk+/gdk-pixbuf src/gtk+/gdk src/gtk+/gtk src/libglade src/gtkglext src/gtkhtml src/$(GTK2X11) endif @@ -1086,9 +971,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_UNITDIR+=src src/glib src/atk src/pango src/gtk+/gdk-pixbuf src/gtk+/gdk src/gtk+/gtk src/libglade src/gtkglext src/gtkhtml src/$(GTK2X11) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_UNITDIR+=src src/glib src/atk src/pango src/gtk+/gdk-pixbuf src/gtk+/gdk src/gtk+/gtk src/libglade src/gtkglext src/gtkhtml src/$(GTK2X11) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_UNITDIR+=src src/glib src/atk src/pango src/gtk+/gdk-pixbuf src/gtk+/gdk src/gtk+/gtk src/libglade src/gtkglext src/gtkhtml src/$(GTK2X11) endif @@ -1101,9 +983,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_UNITDIR+=src src/glib src/atk src/pango src/gtk+/gdk-pixbuf src/gtk+/gdk src/gtk+/gtk src/libglade src/gtkglext src/gtkhtml src/$(GTK2X11) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_UNITDIR+=src src/glib src/atk src/pango src/gtk+/gdk-pixbuf src/gtk+/gdk src/gtk+/gtk src/libglade src/gtkglext src/gtkhtml src/$(GTK2X11) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_UNITDIR+=src src/glib src/atk src/pango src/gtk+/gdk-pixbuf src/gtk+/gdk src/gtk+/gtk src/libglade src/gtkglext src/gtkhtml src/$(GTK2X11) endif @@ -1122,21 +1001,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITDIR+=src src/glib src/atk src/pango src/gtk+/gdk-pixbuf src/gtk+/gdk src/gtk+/gtk src/libglade src/gtkglext src/gtkhtml src/$(GTK2X11) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_UNITDIR+=src src/glib src/atk src/pango src/gtk+/gdk-pixbuf src/gtk+/gdk src/gtk+/gtk src/libglade src/gtkglext src/gtkhtml src/$(GTK2X11) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_UNITDIR+=src src/glib src/atk src/pango src/gtk+/gdk-pixbuf src/gtk+/gdk src/gtk+/gtk src/libglade src/gtkglext src/gtkhtml src/$(GTK2X11) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_UNITDIR+=src src/glib src/atk src/pango src/gtk+/gdk-pixbuf src/gtk+/gdk src/gtk+/gtk src/libglade src/gtkglext src/gtkhtml src/$(GTK2X11) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_UNITDIR+=src src/glib src/atk src/pango src/gtk+/gdk-pixbuf src/gtk+/gdk src/gtk+/gtk src/libglade src/gtkglext src/gtkhtml src/$(GTK2X11) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_UNITDIR+=src src/glib src/atk src/pango src/gtk+/gdk-pixbuf src/gtk+/gdk src/gtk+/gtk src/libglade src/gtkglext src/gtkhtml src/$(GTK2X11) -endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1459,11 +1326,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1944,9 +1806,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 @@ -2065,10 +1924,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -2082,10 +1937,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -2105,23 +1956,9 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2175,20 +2012,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2326,15 +2163,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2575,12 +2408,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) @@ -2785,9 +2614,6 @@ ifeq ($(FULL_TARGET),i386-beos) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2890,9 +2716,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2905,9 +2728,6 @@ ifeq ($(FULL_TARGET),arm-palmos) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),arm-wince) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2926,21 +2746,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all --- fpc-2.2.2.orig/fpcsrc/packages/gtk2/examples/Makefile +++ fpc-2.2.2/fpcsrc/packages/gtk2/examples/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -276,9 +248,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_DIRS+=helloworld helloworld2 gtk_demo gettingstarted plugins scribble_simple gtkglext endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_DIRS+=helloworld helloworld2 gtk_demo gettingstarted plugins scribble_simple gtkglext -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_DIRS+=helloworld helloworld2 gtk_demo gettingstarted plugins scribble_simple gtkglext endif @@ -381,9 +350,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_DIRS+=helloworld helloworld2 gtk_demo gettingstarted plugins scribble_simple gtkglext endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_DIRS+=helloworld helloworld2 gtk_demo gettingstarted plugins scribble_simple gtkglext -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_DIRS+=helloworld helloworld2 gtk_demo gettingstarted plugins scribble_simple gtkglext endif @@ -396,9 +362,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_DIRS+=helloworld helloworld2 gtk_demo gettingstarted plugins scribble_simple gtkglext endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_DIRS+=helloworld helloworld2 gtk_demo gettingstarted plugins scribble_simple gtkglext -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_DIRS+=helloworld helloworld2 gtk_demo gettingstarted plugins scribble_simple gtkglext endif @@ -417,21 +380,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=helloworld helloworld2 gtk_demo gettingstarted plugins scribble_simple gtkglext endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_DIRS+=helloworld helloworld2 gtk_demo gettingstarted plugins scribble_simple gtkglext -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_DIRS+=helloworld helloworld2 gtk_demo gettingstarted plugins scribble_simple gtkglext endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_DIRS+=helloworld helloworld2 gtk_demo gettingstarted plugins scribble_simple gtkglext -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_DIRS+=helloworld helloworld2 gtk_demo gettingstarted plugins scribble_simple gtkglext -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_DIRS+=helloworld helloworld2 gtk_demo gettingstarted plugins scribble_simple gtkglext -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -753,11 +704,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1244,10 +1190,6 @@ REQUIRE_PACKAGES_GTK2=1 REQUIRE_PACKAGES_OPENGL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_GTK2=1 -REQUIRE_PACKAGES_OPENGL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_GTK2=1 @@ -1400,11 +1342,6 @@ REQUIRE_PACKAGES_GTK2=1 REQUIRE_PACKAGES_OPENGL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -REQUIRE_PACKAGES_OPENGL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_GTK2=1 REQUIRE_PACKAGES_OPENGL=1 @@ -1422,11 +1359,6 @@ REQUIRE_PACKAGES_GTK2=1 REQUIRE_PACKAGES_OPENGL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -REQUIRE_PACKAGES_OPENGL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_GTK2=1 REQUIRE_PACKAGES_OPENGL=1 @@ -1452,28 +1384,10 @@ REQUIRE_PACKAGES_GTK2=1 REQUIRE_PACKAGES_OPENGL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -REQUIRE_PACKAGES_OPENGL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_GTK2=1 REQUIRE_PACKAGES_OPENGL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_GTK2=1 -REQUIRE_PACKAGES_OPENGL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -REQUIRE_PACKAGES_OPENGL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_GTK2=1 -REQUIRE_PACKAGES_OPENGL=1 -endif ifdef REQUIRE_PACKAGES_X11 PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_X11),) @@ -1553,20 +1467,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1704,13 +1618,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif ifdef TARGET_RSTS override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS)) override CLEANRSTFILES+=$(RSTFILES) @@ -1942,15 +1852,6 @@ TARGET_DIRS_SCRIBBLE_SIMPLE=1 TARGET_DIRS_GTKGLEXT=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -TARGET_DIRS_HELLOWORLD=1 -TARGET_DIRS_HELLOWORLD2=1 -TARGET_DIRS_GTK_DEMO=1 -TARGET_DIRS_GETTINGSTARTED=1 -TARGET_DIRS_PLUGINS=1 -TARGET_DIRS_SCRIBBLE_SIMPLE=1 -TARGET_DIRS_GTKGLEXT=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) TARGET_DIRS_HELLOWORLD=1 TARGET_DIRS_HELLOWORLD2=1 @@ -2257,15 +2158,6 @@ TARGET_DIRS_SCRIBBLE_SIMPLE=1 TARGET_DIRS_GTKGLEXT=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_DIRS_HELLOWORLD=1 -TARGET_DIRS_HELLOWORLD2=1 -TARGET_DIRS_GTK_DEMO=1 -TARGET_DIRS_GETTINGSTARTED=1 -TARGET_DIRS_PLUGINS=1 -TARGET_DIRS_SCRIBBLE_SIMPLE=1 -TARGET_DIRS_GTKGLEXT=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) TARGET_DIRS_HELLOWORLD=1 TARGET_DIRS_HELLOWORLD2=1 @@ -2302,15 +2194,6 @@ TARGET_DIRS_SCRIBBLE_SIMPLE=1 TARGET_DIRS_GTKGLEXT=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_DIRS_HELLOWORLD=1 -TARGET_DIRS_HELLOWORLD2=1 -TARGET_DIRS_GTK_DEMO=1 -TARGET_DIRS_GETTINGSTARTED=1 -TARGET_DIRS_PLUGINS=1 -TARGET_DIRS_SCRIBBLE_SIMPLE=1 -TARGET_DIRS_GTKGLEXT=1 -endif ifeq ($(FULL_TARGET),arm-wince) TARGET_DIRS_HELLOWORLD=1 TARGET_DIRS_HELLOWORLD2=1 @@ -2365,15 +2248,6 @@ TARGET_DIRS_SCRIBBLE_SIMPLE=1 TARGET_DIRS_GTKGLEXT=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_DIRS_HELLOWORLD=1 -TARGET_DIRS_HELLOWORLD2=1 -TARGET_DIRS_GTK_DEMO=1 -TARGET_DIRS_GETTINGSTARTED=1 -TARGET_DIRS_PLUGINS=1 -TARGET_DIRS_SCRIBBLE_SIMPLE=1 -TARGET_DIRS_GTKGLEXT=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) TARGET_DIRS_HELLOWORLD=1 TARGET_DIRS_HELLOWORLD2=1 @@ -2383,33 +2257,6 @@ TARGET_DIRS_SCRIBBLE_SIMPLE=1 TARGET_DIRS_GTKGLEXT=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -TARGET_DIRS_HELLOWORLD=1 -TARGET_DIRS_HELLOWORLD2=1 -TARGET_DIRS_GTK_DEMO=1 -TARGET_DIRS_GETTINGSTARTED=1 -TARGET_DIRS_PLUGINS=1 -TARGET_DIRS_SCRIBBLE_SIMPLE=1 -TARGET_DIRS_GTKGLEXT=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -TARGET_DIRS_HELLOWORLD=1 -TARGET_DIRS_HELLOWORLD2=1 -TARGET_DIRS_GTK_DEMO=1 -TARGET_DIRS_GETTINGSTARTED=1 -TARGET_DIRS_PLUGINS=1 -TARGET_DIRS_SCRIBBLE_SIMPLE=1 -TARGET_DIRS_GTKGLEXT=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -TARGET_DIRS_HELLOWORLD=1 -TARGET_DIRS_HELLOWORLD2=1 -TARGET_DIRS_GTK_DEMO=1 -TARGET_DIRS_GETTINGSTARTED=1 -TARGET_DIRS_PLUGINS=1 -TARGET_DIRS_SCRIBBLE_SIMPLE=1 -TARGET_DIRS_GTKGLEXT=1 -endif ifdef TARGET_DIRS_HELLOWORLD helloworld_all: $(MAKE) -C helloworld all --- fpc-2.2.2.orig/fpcsrc/packages/gtk2/examples/gtk_demo/Makefile +++ fpc-2.2.2/fpcsrc/packages/gtk2/examples/gtk_demo/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -276,9 +248,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=gtk_demo endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=gtk_demo -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=gtk_demo endif @@ -381,9 +350,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=gtk_demo endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=gtk_demo -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=gtk_demo endif @@ -396,9 +362,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=gtk_demo endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=gtk_demo -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=gtk_demo endif @@ -417,21 +380,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=gtk_demo endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=gtk_demo -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=gtk_demo endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=gtk_demo -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=gtk_demo -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=gtk_demo -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -753,11 +704,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1244,10 +1190,6 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_GTK2=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_GTK2=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 @@ -1400,11 +1342,6 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_GTK2=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GTK2=1 @@ -1422,11 +1359,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GTK2=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GTK2=1 @@ -1452,28 +1384,10 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_GTK2=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GTK2=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_GTK2=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_GTK2=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1553,20 +1467,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1704,13 +1618,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/fpcsrc/packages/gtk2/examples/plugins/Makefile +++ fpc-2.2.2/fpcsrc/packages/gtk2/examples/plugins/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -276,9 +248,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=plugin main endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=plugin main -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=plugin main endif @@ -381,9 +350,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=plugin main endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=plugin main -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=plugin main endif @@ -396,9 +362,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=plugin main endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=plugin main -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=plugin main endif @@ -417,21 +380,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=plugin main endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=plugin main -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=plugin main endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=plugin main -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=plugin main -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=plugin main -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -753,11 +704,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1244,10 +1190,6 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_GTK2=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_GTK2=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 @@ -1400,11 +1342,6 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_GTK2=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GTK2=1 @@ -1422,11 +1359,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GTK2=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GTK2=1 @@ -1452,28 +1384,10 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_GTK2=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GTK2=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_GTK2=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_GTK2=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1553,20 +1467,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1704,13 +1618,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/fpcsrc/packages/gtk2/examples/scribble_simple/Makefile +++ fpc-2.2.2/fpcsrc/packages/gtk2/examples/scribble_simple/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -276,9 +248,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=scribble_simple endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=scribble_simple -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=scribble_simple endif @@ -381,9 +350,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=scribble_simple endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=scribble_simple -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=scribble_simple endif @@ -396,9 +362,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=scribble_simple endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=scribble_simple -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=scribble_simple endif @@ -417,21 +380,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=scribble_simple endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=scribble_simple -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=scribble_simple endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=scribble_simple -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=scribble_simple -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=scribble_simple -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -753,11 +704,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1244,10 +1190,6 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_GTK2=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_GTK2=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 @@ -1400,11 +1342,6 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_GTK2=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GTK2=1 @@ -1422,11 +1359,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GTK2=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GTK2=1 @@ -1452,28 +1384,10 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_GTK2=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GTK2=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_GTK2=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_GTK2=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1553,20 +1467,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1704,13 +1618,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/fpcsrc/packages/gtk2/examples/gtkglext/Makefile +++ fpc-2.2.2/fpcsrc/packages/gtk2/examples/gtkglext/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -276,9 +248,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=gears endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=gears -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=gears endif @@ -381,9 +350,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=gears endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=gears -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=gears endif @@ -396,9 +362,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=gears endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=gears -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=gears endif @@ -417,21 +380,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=gears endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=gears -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=gears endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=gears -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=gears -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=gears -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -753,11 +704,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1250,11 +1196,6 @@ REQUIRE_PACKAGES_GTK2=1 REQUIRE_PACKAGES_OPENGL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_GTK2=1 -REQUIRE_PACKAGES_OPENGL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 @@ -1441,12 +1382,6 @@ REQUIRE_PACKAGES_GTK2=1 REQUIRE_PACKAGES_OPENGL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -REQUIRE_PACKAGES_OPENGL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GTK2=1 @@ -1468,12 +1403,6 @@ REQUIRE_PACKAGES_GTK2=1 REQUIRE_PACKAGES_OPENGL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -REQUIRE_PACKAGES_OPENGL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GTK2=1 @@ -1505,33 +1434,11 @@ REQUIRE_PACKAGES_GTK2=1 REQUIRE_PACKAGES_OPENGL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -REQUIRE_PACKAGES_OPENGL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GTK2=1 REQUIRE_PACKAGES_OPENGL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_GTK2=1 -REQUIRE_PACKAGES_OPENGL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -REQUIRE_PACKAGES_OPENGL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_GTK2=1 -REQUIRE_PACKAGES_OPENGL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1637,20 +1544,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1788,13 +1695,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/fpcsrc/packages/gtk2/examples/gettingstarted/Makefile +++ fpc-2.2.2/fpcsrc/packages/gtk2/examples/gettingstarted/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -276,9 +248,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=gettingstarted endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=gettingstarted -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=gettingstarted endif @@ -381,9 +350,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=gettingstarted endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=gettingstarted -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=gettingstarted endif @@ -396,9 +362,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=gettingstarted endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=gettingstarted -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=gettingstarted endif @@ -417,21 +380,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=gettingstarted endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=gettingstarted -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=gettingstarted endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=gettingstarted -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=gettingstarted -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=gettingstarted -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -753,11 +704,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1244,10 +1190,6 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_GTK2=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_GTK2=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 @@ -1400,11 +1342,6 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_GTK2=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GTK2=1 @@ -1422,11 +1359,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GTK2=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GTK2=1 @@ -1452,28 +1384,10 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_GTK2=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GTK2=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_GTK2=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_GTK2=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1553,20 +1467,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1704,13 +1618,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/fpcsrc/packages/gtk2/examples/helloworld/Makefile +++ fpc-2.2.2/fpcsrc/packages/gtk2/examples/helloworld/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -276,9 +248,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=helloworld endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=helloworld -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=helloworld endif @@ -381,9 +350,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=helloworld endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=helloworld -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=helloworld endif @@ -396,9 +362,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=helloworld endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=helloworld -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=helloworld endif @@ -417,21 +380,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=helloworld endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=helloworld -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=helloworld endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=helloworld -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=helloworld -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=helloworld -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -753,11 +704,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1244,10 +1190,6 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_GTK2=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_GTK2=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 @@ -1400,11 +1342,6 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_GTK2=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GTK2=1 @@ -1422,11 +1359,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GTK2=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GTK2=1 @@ -1452,28 +1384,10 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_GTK2=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GTK2=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_GTK2=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_GTK2=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1553,20 +1467,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1704,13 +1618,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/fpcsrc/packages/gtk2/examples/helloworld2/Makefile +++ fpc-2.2.2/fpcsrc/packages/gtk2/examples/helloworld2/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -276,9 +248,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=helloworld2 endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=helloworld2 -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=helloworld2 endif @@ -381,9 +350,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=helloworld2 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=helloworld2 -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=helloworld2 endif @@ -396,9 +362,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=helloworld2 endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=helloworld2 -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=helloworld2 endif @@ -417,21 +380,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=helloworld2 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=helloworld2 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=helloworld2 endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=helloworld2 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=helloworld2 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=helloworld2 -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -753,11 +704,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1244,10 +1190,6 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_GTK2=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_GTK2=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 @@ -1400,11 +1342,6 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_GTK2=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GTK2=1 @@ -1422,11 +1359,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GTK2=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GTK2=1 @@ -1452,28 +1384,10 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_GTK2=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GTK2=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_GTK2=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_GTK2=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_GTK2=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1553,20 +1467,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1704,13 +1618,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/fpcsrc/packages/pcap/Makefile +++ fpc-2.2.2/fpcsrc/packages/pcap/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=pcap endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=pcap -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=pcap endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=pcap endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=pcap -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=pcap endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=pcap endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=pcap -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=pcap endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=pcap endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=pcap -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=pcap endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=pcap -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=pcap -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=pcap -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1072,11 +981,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1554,9 +1458,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1659,9 +1560,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1674,9 +1572,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1695,21 +1590,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1737,20 +1620,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1882,15 +1765,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2113,12 +1992,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/a52/Makefile +++ fpc-2.2.2/fpcsrc/packages/a52/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=a52 endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=a52 -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=a52 endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=a52 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=a52 -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=a52 endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=a52 endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=a52 -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=a52 endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=a52 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=a52 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=a52 endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=a52 -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1072,11 +981,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1554,9 +1458,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1659,9 +1560,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1674,9 +1572,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1695,21 +1590,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1737,20 +1620,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1882,15 +1765,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2113,12 +1992,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/palmunits/Makefile +++ fpc-2.2.2/fpcsrc/packages/palmunits/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1072,11 +981,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1554,9 +1458,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1659,9 +1560,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1674,9 +1572,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1695,21 +1590,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1737,20 +1620,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1882,15 +1765,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2113,12 +1992,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/fftw/Makefile +++ fpc-2.2.2/fpcsrc/packages/fftw/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=fftw_s endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=fftw_s -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=fftw_s endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=fftw_s endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=fftw_s -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=fftw_s endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=fftw_s endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=fftw_s -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=fftw_s endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=fftw_s endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=fftw_s -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=fftw_s endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=fftw_s -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1074,11 +983,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1556,9 +1460,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1661,9 +1562,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1676,9 +1574,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1697,21 +1592,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1739,20 +1622,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1884,15 +1767,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2115,12 +1994,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/ncurses/Makefile +++ fpc-2.2.2/fpcsrc/packages/ncurses/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=ncurses panel ncrt ocrt menu form endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=ncurses panel ncrt ocrt menu form -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=ncurses panel ncrt ocrt menu form endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=ncurses panel ncrt ocrt menu form endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=ncurses panel ncrt ocrt menu form -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=ncurses panel ncrt ocrt menu form endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=ncurses panel ncrt ocrt menu form endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=ncurses panel ncrt ocrt menu form -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=ncurses panel ncrt ocrt menu form endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=ncurses panel ncrt ocrt menu form endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=ncurses panel ncrt ocrt menu form -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=ncurses panel ncrt ocrt menu form endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=ncurses panel ncrt ocrt menu form -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=ncurses panel ncrt ocrt menu form -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=ncurses panel ncrt ocrt menu form -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests examples endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests examples endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests examples endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1277,11 +1165,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1759,9 +1642,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1864,9 +1744,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1879,9 +1756,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1900,21 +1774,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1942,20 +1804,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2093,15 +1955,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2342,12 +2200,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/newt/Makefile +++ fpc-2.2.2/fpcsrc/packages/newt/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=newt endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=newt -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=newt endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=newt endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=newt -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=newt endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=newt endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=newt -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=newt endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=newt endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=newt -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=newt endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=newt -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=newt -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=newt -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=newt1 newt2 newt3 endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLES+=newt1 newt2 newt3 endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=newt1 newt2 newt3 -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLES+=newt1 newt2 newt3 endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLES+=newt1 newt2 newt3 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=newt1 newt2 newt3 -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLES+=newt1 newt2 newt3 endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLES+=newt1 newt2 newt3 endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=newt1 newt2 newt3 -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLES+=newt1 newt2 newt3 endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLES+=newt1 newt2 newt3 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=newt1 newt2 newt3 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLES+=newt1 newt2 newt3 endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=newt1 newt2 newt3 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=newt1 newt2 newt3 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=newt1 newt2 newt3 -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1279,11 +1167,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1761,9 +1644,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1866,9 +1746,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1881,9 +1758,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1902,21 +1776,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1944,20 +1806,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2095,15 +1957,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2344,12 +2202,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/fcl-fpcunit/Makefile +++ fpc-2.2.2/fpcsrc/packages/fcl-fpcunit/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=testregistry testreport testdecorator ubmockobject xmlreporter fpcunitreport latextestreport xmltestreport plaintestreport fpcunit testutils digesttestreport endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=testregistry testreport testdecorator ubmockobject xmlreporter fpcunitreport latextestreport xmltestreport plaintestreport fpcunit testutils digesttestreport -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=testregistry testreport testdecorator ubmockobject xmlreporter fpcunitreport latextestreport xmltestreport plaintestreport fpcunit testutils digesttestreport endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=testregistry testreport testdecorator ubmockobject xmlreporter fpcunitreport latextestreport xmltestreport plaintestreport fpcunit testutils digesttestreport endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=testregistry testreport testdecorator ubmockobject xmlreporter fpcunitreport latextestreport xmltestreport plaintestreport fpcunit testutils digesttestreport -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=testregistry testreport testdecorator ubmockobject xmlreporter fpcunitreport latextestreport xmltestreport plaintestreport fpcunit testutils digesttestreport endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=testregistry testreport testdecorator ubmockobject xmlreporter fpcunitreport latextestreport xmltestreport plaintestreport fpcunit testutils digesttestreport endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=testregistry testreport testdecorator ubmockobject xmlreporter fpcunitreport latextestreport xmltestreport plaintestreport fpcunit testutils digesttestreport -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=testregistry testreport testdecorator ubmockobject xmlreporter fpcunitreport latextestreport xmltestreport plaintestreport fpcunit testutils digesttestreport endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=testregistry testreport testdecorator ubmockobject xmlreporter fpcunitreport latextestreport xmltestreport plaintestreport fpcunit testutils digesttestreport endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=testregistry testreport testdecorator ubmockobject xmlreporter fpcunitreport latextestreport xmltestreport plaintestreport fpcunit testutils digesttestreport -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=testregistry testreport testdecorator ubmockobject xmlreporter fpcunitreport latextestreport xmltestreport plaintestreport fpcunit testutils digesttestreport endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=testregistry testreport testdecorator ubmockobject xmlreporter fpcunitreport latextestreport xmltestreport plaintestreport fpcunit testutils digesttestreport -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=testregistry testreport testdecorator ubmockobject xmlreporter fpcunitreport latextestreport xmltestreport plaintestreport fpcunit testutils digesttestreport -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=testregistry testreport testdecorator ubmockobject xmlreporter fpcunitreport latextestreport xmltestreport plaintestreport fpcunit testutils digesttestreport -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-S2h endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-S2h endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-S2h endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1072,11 +981,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1580,13 +1484,6 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 @@ -1825,13 +1722,6 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 @@ -1862,13 +1752,6 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 @@ -1911,13 +1794,6 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 @@ -1925,27 +1801,6 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2129,20 +1984,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2274,15 +2129,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2505,12 +2356,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/modplug/Makefile +++ fpc-2.2.2/fpcsrc/packages/modplug/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=modplug endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=modplug -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=modplug endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=modplug endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=modplug -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=modplug endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=modplug endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=modplug -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=modplug endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=modplug endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=modplug -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=modplug endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=modplug -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=modplug -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=modplug -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1072,11 +981,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1554,9 +1458,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1659,9 +1560,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1674,9 +1572,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1695,21 +1590,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1737,20 +1620,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1882,15 +1765,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2113,12 +1992,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/syslog/Makefile +++ fpc-2.2.2/fpcsrc/packages/syslog/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=systemlog endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=systemlog -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=systemlog endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=systemlog endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=systemlog -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=systemlog endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=systemlog endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=systemlog -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=systemlog endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=systemlog endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=systemlog -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=systemlog endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=systemlog -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=testlog endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLES+=testlog endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=testlog -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLES+=testlog endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLES+=testlog endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=testlog -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLES+=testlog endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLES+=testlog endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=testlog -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLES+=testlog endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLES+=testlog endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=testlog -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLES+=testlog endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=testlog -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=testlog -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=testlog -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1277,11 +1165,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1759,9 +1642,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1864,9 +1744,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1879,9 +1756,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1900,21 +1774,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1942,20 +1804,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2093,15 +1955,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2342,12 +2200,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/zlib/Makefile +++ fpc-2.2.2/fpcsrc/packages/zlib/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=zlib endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=zlib -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=zlib endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=zlib endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=zlib -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=zlib endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=zlib endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=zlib -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=zlib endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=zlib endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=zlib -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=zlib endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=zlib -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=zlib -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=zlib -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1103,11 +1012,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1585,9 +1489,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1690,9 +1591,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1705,9 +1603,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1726,21 +1621,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1768,20 +1651,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1919,15 +1802,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2150,12 +2029,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/gtk1/Makefile +++ fpc-2.2.2/fpcsrc/packages/gtk1/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLEDIRS+=examples endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLEDIRS+=examples endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLEDIRS+=examples endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl -endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1105,11 +1014,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1595,10 +1499,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_OPENGL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 @@ -1749,11 +1649,6 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 @@ -1771,11 +1666,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 @@ -1801,28 +1691,10 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_OPENGL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_OPENGL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1902,20 +1774,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2053,15 +1925,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2302,12 +2170,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) @@ -2512,9 +2376,6 @@ ifeq ($(FULL_TARGET),i386-beos) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2617,9 +2478,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2632,9 +2490,6 @@ ifeq ($(FULL_TARGET),arm-palmos) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),arm-wince) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2653,21 +2508,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all --- fpc-2.2.2.orig/fpcsrc/packages/gtk1/examples/Makefile +++ fpc-2.2.2/fpcsrc/packages/gtk1/examples/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -276,9 +248,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_DIRS+=tutorial endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_DIRS+=tutorial -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_DIRS+=tutorial endif @@ -381,9 +350,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_DIRS+=tutorial endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_DIRS+=tutorial -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_DIRS+=tutorial endif @@ -396,9 +362,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_DIRS+=tutorial endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_DIRS+=tutorial -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_DIRS+=tutorial endif @@ -417,21 +380,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=tutorial endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_DIRS+=tutorial -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_DIRS+=tutorial endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_DIRS+=tutorial -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_DIRS+=tutorial -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_DIRS+=tutorial -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo endif @@ -450,9 +401,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo endif @@ -555,9 +503,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo endif @@ -570,9 +515,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo endif @@ -591,21 +533,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=tictactoe endif @@ -624,9 +554,6 @@ ifeq ($(FULL_TARGET),i386-beos) override CLEAN_UNITS+=tictactoe endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=tictactoe -endif ifeq ($(FULL_TARGET),i386-netbsd) override CLEAN_UNITS+=tictactoe endif @@ -729,9 +656,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override CLEAN_UNITS+=tictactoe endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=tictactoe -endif ifeq ($(FULL_TARGET),x86_64-win64) override CLEAN_UNITS+=tictactoe endif @@ -744,9 +668,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override CLEAN_UNITS+=tictactoe endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=tictactoe -endif ifeq ($(FULL_TARGET),arm-wince) override CLEAN_UNITS+=tictactoe endif @@ -765,21 +686,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=tictactoe endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=tictactoe -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override CLEAN_UNITS+=tictactoe endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=tictactoe -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=tictactoe -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=tictactoe -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1101,11 +1010,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1597,11 +1501,6 @@ REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 @@ -1786,12 +1685,6 @@ REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 @@ -1813,12 +1706,6 @@ REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 @@ -1850,33 +1737,11 @@ REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1982,20 +1847,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2133,13 +1998,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) @@ -2496,9 +2357,6 @@ ifeq ($(FULL_TARGET),i386-beos) TARGET_DIRS_TUTORIAL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -TARGET_DIRS_TUTORIAL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) TARGET_DIRS_TUTORIAL=1 endif @@ -2601,9 +2459,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) TARGET_DIRS_TUTORIAL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_DIRS_TUTORIAL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) TARGET_DIRS_TUTORIAL=1 endif @@ -2616,9 +2471,6 @@ ifeq ($(FULL_TARGET),arm-palmos) TARGET_DIRS_TUTORIAL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_DIRS_TUTORIAL=1 -endif ifeq ($(FULL_TARGET),arm-wince) TARGET_DIRS_TUTORIAL=1 endif @@ -2637,21 +2489,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_TUTORIAL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_DIRS_TUTORIAL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) TARGET_DIRS_TUTORIAL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -TARGET_DIRS_TUTORIAL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -TARGET_DIRS_TUTORIAL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -TARGET_DIRS_TUTORIAL=1 -endif ifdef TARGET_DIRS_TUTORIAL tutorial_all: $(MAKE) -C tutorial all --- fpc-2.2.2.orig/fpcsrc/packages/gtk1/examples/tutorial/Makefile +++ fpc-2.2.2/fpcsrc/packages/gtk1/examples/tutorial/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -579,11 +551,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1069,10 +1036,6 @@ REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 @@ -1223,11 +1186,6 @@ REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 @@ -1245,11 +1203,6 @@ REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 @@ -1275,28 +1228,10 @@ REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -endif ifdef REQUIRE_PACKAGES_X11 PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_X11),) @@ -1376,20 +1311,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1527,13 +1462,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif ifdef TARGET_RSTS override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS)) override CLEANRSTFILES+=$(RSTFILES) --- fpc-2.2.2.orig/fpcsrc/packages/unixutil/Makefile +++ fpc-2.2.2/fpcsrc/packages/unixutil/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=unixutils endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=unixutils -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=unixutils endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=unixutils endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=unixutils -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=unixutils endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=unixutils endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=unixutils -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=unixutils endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=unixutils endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=unixutils -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=unixutils endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=unixutils -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=unixutils -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=unixutils -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=unixutils endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=unixutils endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=unixutils -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=unixutils endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=unixutils endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=unixutils -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=unixutils endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=unixutils endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=unixutils -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=unixutils endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=unixutils endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=unixutils -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=unixutils endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=unixutils -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=unixutils -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=unixutils -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1277,11 +1165,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1773,11 +1656,6 @@ REQUIRE_PACKAGES_LIBC=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_LIBC=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_LIBC=1 @@ -1948,11 +1826,6 @@ REQUIRE_PACKAGES_LIBC=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_LIBC=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_LIBC=1 @@ -1975,11 +1848,6 @@ REQUIRE_PACKAGES_LIBC=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_LIBC=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_LIBC=1 @@ -2010,31 +1878,11 @@ REQUIRE_PACKAGES_LIBC=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_LIBC=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_LIBC=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_LIBC=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_LIBC=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_LIBC=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2166,20 +2014,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2317,15 +2165,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2548,12 +2392,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/httpd20/Makefile +++ fpc-2.2.2/fpcsrc/packages/httpd20/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=apr apriconv aprutil httpd endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=apr apriconv aprutil httpd -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=apr apriconv aprutil httpd endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=apr apriconv aprutil httpd endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=apr apriconv aprutil httpd -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=apr apriconv aprutil httpd endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=apr apriconv aprutil httpd endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=apr apriconv aprutil httpd -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=apr apriconv aprutil httpd endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=apr apriconv aprutil httpd endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=apr apriconv aprutil httpd -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=apr apriconv aprutil httpd endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=apr apriconv aprutil httpd -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=apr apriconv aprutil httpd -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=apr apriconv aprutil httpd -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLEDIRS+=examples endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLEDIRS+=examples endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLEDIRS+=examples endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1277,11 +1165,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1759,9 +1642,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1864,9 +1744,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1879,9 +1756,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1900,21 +1774,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1942,20 +1804,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2093,15 +1955,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2342,12 +2200,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) @@ -2552,9 +2406,6 @@ ifeq ($(FULL_TARGET),i386-beos) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2657,9 +2508,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2672,9 +2520,6 @@ ifeq ($(FULL_TARGET),arm-palmos) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),arm-wince) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2693,21 +2538,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all --- fpc-2.2.2.orig/fpcsrc/packages/httpd20/examples/Makefile +++ fpc-2.2.2/fpcsrc/packages/httpd20/examples/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -276,9 +248,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule endif @@ -381,9 +350,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule endif @@ -396,9 +362,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule endif @@ -417,21 +380,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_UNITS+=minimain endif @@ -450,9 +401,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=minimain endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=minimain -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=minimain endif @@ -555,9 +503,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=minimain endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=minimain -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=minimain endif @@ -570,9 +515,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=minimain endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=minimain -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=minimain endif @@ -591,21 +533,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=minimain endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=minimain -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=minimain endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=minimain -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=minimain -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=minimain -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -927,11 +857,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1415,10 +1340,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HTTPD20=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HTTPD20=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HTTPD20=1 @@ -1555,10 +1476,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HTTPD20=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HTTPD20=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HTTPD20=1 @@ -1575,10 +1492,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HTTPD20=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HTTPD20=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HTTPD20=1 @@ -1603,26 +1516,10 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HTTPD20=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HTTPD20=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HTTPD20=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HTTPD20=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HTTPD20=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HTTPD20=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1676,20 +1573,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1827,15 +1724,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/packages/gdbint/Makefile +++ fpc-2.2.2/fpcsrc/packages/gdbint/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -298,9 +270,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=gdbint gdbcon endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=gdbint gdbcon -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=gdbint gdbcon endif @@ -403,9 +372,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=gdbint gdbcon endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=gdbint gdbcon -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=gdbint gdbcon endif @@ -418,9 +384,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=gdbint gdbcon endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=gdbint gdbcon -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=gdbint gdbcon endif @@ -439,21 +402,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=gdbint gdbcon endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=gdbint gdbcon -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=gdbint gdbcon endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=gdbint gdbcon -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=gdbint gdbcon -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=gdbint gdbcon -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=testgdb symify endif @@ -472,9 +423,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLES+=testgdb symify endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=testgdb symify -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLES+=testgdb symify endif @@ -577,9 +525,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLES+=testgdb symify endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=testgdb symify -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLES+=testgdb symify endif @@ -592,9 +537,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLES+=testgdb symify endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=testgdb symify -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLES+=testgdb symify endif @@ -613,21 +555,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLES+=testgdb symify endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=testgdb symify -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLES+=testgdb symify endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=testgdb symify -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=testgdb symify -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=testgdb symify -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -647,9 +577,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -752,9 +679,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -767,9 +691,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -788,21 +709,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -821,9 +730,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -926,9 +832,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -941,9 +844,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -962,21 +862,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OBJECTDIR+=$(GDBLIBDIR) endif @@ -995,9 +883,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OBJECTDIR+=$(GDBLIBDIR) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OBJECTDIR+=$(GDBLIBDIR) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OBJECTDIR+=$(GDBLIBDIR) endif @@ -1100,9 +985,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OBJECTDIR+=$(GDBLIBDIR) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OBJECTDIR+=$(GDBLIBDIR) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OBJECTDIR+=$(GDBLIBDIR) endif @@ -1115,9 +997,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OBJECTDIR+=$(GDBLIBDIR) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OBJECTDIR+=$(GDBLIBDIR) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OBJECTDIR+=$(GDBLIBDIR) endif @@ -1136,21 +1015,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OBJECTDIR+=$(GDBLIBDIR) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OBJECTDIR+=$(GDBLIBDIR) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OBJECTDIR+=$(GDBLIBDIR) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OBJECTDIR+=$(GDBLIBDIR) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OBJECTDIR+=$(GDBLIBDIR) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OBJECTDIR+=$(GDBLIBDIR) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_LIBRARYDIR+=$(GDBLIBDIR) endif @@ -1169,9 +1036,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_LIBRARYDIR+=$(GDBLIBDIR) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_LIBRARYDIR+=$(GDBLIBDIR) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_LIBRARYDIR+=$(GDBLIBDIR) endif @@ -1274,9 +1138,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_LIBRARYDIR+=$(GDBLIBDIR) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_LIBRARYDIR+=$(GDBLIBDIR) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_LIBRARYDIR+=$(GDBLIBDIR) endif @@ -1289,9 +1150,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_LIBRARYDIR+=$(GDBLIBDIR) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_LIBRARYDIR+=$(GDBLIBDIR) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_LIBRARYDIR+=$(GDBLIBDIR) endif @@ -1310,21 +1168,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_LIBRARYDIR+=$(GDBLIBDIR) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_LIBRARYDIR+=$(GDBLIBDIR) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_LIBRARYDIR+=$(GDBLIBDIR) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_LIBRARYDIR+=$(GDBLIBDIR) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_LIBRARYDIR+=$(GDBLIBDIR) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_LIBRARYDIR+=$(GDBLIBDIR) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1645,11 +1491,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -2127,9 +1968,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -2232,9 +2070,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -2247,9 +2082,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -2268,21 +2100,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2310,20 +2130,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2461,15 +2281,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2710,12 +2526,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/gdbm/Makefile +++ fpc-2.2.2/fpcsrc/packages/gdbm/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=gdbm endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=gdbm -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=gdbm endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=gdbm endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=gdbm -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=gdbm endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=gdbm endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=gdbm -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=gdbm endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=gdbm endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=gdbm -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=gdbm endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=gdbm -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=gdbm -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=gdbm -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=testgdbm testgdbm2 endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLES+=testgdbm testgdbm2 endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=testgdbm testgdbm2 -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLES+=testgdbm testgdbm2 endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLES+=testgdbm testgdbm2 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=testgdbm testgdbm2 -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLES+=testgdbm testgdbm2 endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLES+=testgdbm testgdbm2 endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=testgdbm testgdbm2 -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLES+=testgdbm testgdbm2 endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLES+=testgdbm testgdbm2 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=testgdbm testgdbm2 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLES+=testgdbm testgdbm2 endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=testgdbm testgdbm2 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=testgdbm testgdbm2 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=testgdbm testgdbm2 -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1248,11 +1136,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1730,9 +1613,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1835,9 +1715,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1850,9 +1727,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1871,21 +1745,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1913,20 +1775,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2058,15 +1920,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2307,12 +2165,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/cdrom/Makefile +++ fpc-2.2.2/fpcsrc/packages/cdrom/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=cdrom discid endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=cdrom discid -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=cdrom discid endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=cdrom discid endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=cdrom discid -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=cdrom discid endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=cdrom discid endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=cdrom discid -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=cdrom discid endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=cdrom discid endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=cdrom discid -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=cdrom discid endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=cdrom discid -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=cdrom discid -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=cdrom discid -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=major lincd endif @@ -458,9 +409,6 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_IMPLICITUNITS+=major lincd endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_IMPLICITUNITS+=major lincd -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=showcds getdiscid endif @@ -479,9 +427,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLES+=showcds getdiscid endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=showcds getdiscid -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLES+=showcds getdiscid endif @@ -584,9 +529,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLES+=showcds getdiscid endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=showcds getdiscid -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLES+=showcds getdiscid endif @@ -599,9 +541,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLES+=showcds getdiscid endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=showcds getdiscid -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLES+=showcds getdiscid endif @@ -620,21 +559,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLES+=showcds getdiscid endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=showcds getdiscid -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLES+=showcds getdiscid endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=showcds getdiscid -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=showcds getdiscid -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=showcds getdiscid -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -654,9 +581,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -759,9 +683,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -774,9 +695,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -795,21 +713,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -828,9 +734,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -933,9 +836,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -948,9 +848,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -969,21 +866,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1273,11 +1158,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1755,9 +1635,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1860,9 +1737,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1875,9 +1749,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1896,21 +1767,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1938,20 +1797,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2083,15 +1942,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2332,12 +2187,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/oracle/Makefile +++ fpc-2.2.2/fpcsrc/packages/oracle/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=oci ocidyn oratypes oraoci endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=oci ocidyn oratypes oraoci -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=oci ocidyn oratypes oraoci endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=oci ocidyn oratypes oraoci endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=oci ocidyn oratypes oraoci -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=oci ocidyn oratypes oraoci endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=oci ocidyn oratypes oraoci endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=oci ocidyn oratypes oraoci -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=oci ocidyn oratypes oraoci endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=oci ocidyn oratypes oraoci endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=oci ocidyn oratypes oraoci -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=oci ocidyn oratypes oraoci endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=oci ocidyn oratypes oraoci -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=oci ocidyn oratypes oraoci -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=oci ocidyn oratypes oraoci -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLEDIRS+=examples endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLEDIRS+=examples endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLEDIRS+=examples endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1279,11 +1167,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1761,9 +1644,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1866,9 +1746,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1881,9 +1758,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1902,21 +1776,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1944,20 +1806,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2095,15 +1957,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2344,12 +2202,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) @@ -2554,9 +2408,6 @@ ifeq ($(FULL_TARGET),i386-beos) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2659,9 +2510,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2674,9 +2522,6 @@ ifeq ($(FULL_TARGET),arm-palmos) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),arm-wince) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2695,21 +2540,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all --- fpc-2.2.2.orig/fpcsrc/packages/oracle/examples/Makefile +++ fpc-2.2.2/fpcsrc/packages/oracle/examples/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -276,9 +248,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=oraclew endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=oraclew -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=oraclew endif @@ -381,9 +350,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=oraclew endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=oraclew -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=oraclew endif @@ -396,9 +362,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=oraclew endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=oraclew -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=oraclew endif @@ -417,21 +380,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=oraclew endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=oraclew -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=oraclew endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=oraclew -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=oraclew -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=oraclew -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=test01 endif @@ -450,9 +401,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLES+=test01 endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=test01 -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLES+=test01 endif @@ -555,9 +503,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLES+=test01 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=test01 -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLES+=test01 endif @@ -570,9 +515,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLES+=test01 endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=test01 -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLES+=test01 endif @@ -591,21 +533,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLES+=test01 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=test01 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLES+=test01 endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=test01 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=test01 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=test01 -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -927,11 +857,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1459,13 +1384,6 @@ REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_PXLIB=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-XML=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ORACLE=1 @@ -1793,18 +1711,6 @@ REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_PXLIB=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_SQLITE=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ORACLE=1 @@ -1845,18 +1751,6 @@ REQUIRE_PACKAGES_FCL-DB=1 REQUIRE_PACKAGES_FCL-XML=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_SQLITE=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ORACLE=1 @@ -1910,18 +1804,6 @@ REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_PXLIB=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_SQLITE=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ORACLE=1 @@ -1929,33 +1811,6 @@ REQUIRE_PACKAGES_FCL-DB=1 REQUIRE_PACKAGES_FCL-XML=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-XML=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-XML=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2295,20 +2150,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2446,15 +2301,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/packages/gnome1/Makefile +++ fpc-2.2.2/fpcsrc/packages/gnome1/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=libzvt libart libgnome gconf gconfclient libgnomeui endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=libzvt libart libgnome gconf gconfclient libgnomeui -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=libzvt libart libgnome gconf gconfclient libgnomeui endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=libzvt libart libgnome gconf gconfclient libgnomeui endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=libzvt libart libgnome gconf gconfclient libgnomeui -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=libzvt libart libgnome gconf gconfclient libgnomeui endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=libzvt libart libgnome gconf gconfclient libgnomeui endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=libzvt libart libgnome gconf gconfclient libgnomeui -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=libzvt libart libgnome gconf gconfclient libgnomeui endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=libzvt libart libgnome gconf gconfclient libgnomeui endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=libzvt libart libgnome gconf gconfclient libgnomeui -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=libzvt libart libgnome gconf gconfclient libgnomeui endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=libzvt libart libgnome gconf gconfclient libgnomeui -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=libzvt libart libgnome gconf gconfclient libgnomeui -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=libzvt libart libgnome gconf gconfclient libgnomeui -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src src/libgnome src/zvt src/gconf src/gconfclient src/libgnomeui @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src src/libgnome src/zvt src/gconf src/gconfclient src/libgnomeui endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src src/libgnome src/zvt src/gconf src/gconfclient src/libgnomeui -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src src/libgnome src/zvt src/gconf src/gconfclient src/libgnomeui endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src src/libgnome src/zvt src/gconf src/gconfclient src/libgnomeui endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src src/libgnome src/zvt src/gconf src/gconfclient src/libgnomeui -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src src/libgnome src/zvt src/gconf src/gconfclient src/libgnomeui endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src src/libgnome src/zvt src/gconf src/gconfclient src/libgnomeui endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src src/libgnome src/zvt src/gconf src/gconfclient src/libgnomeui -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src src/libgnome src/zvt src/gconf src/gconfclient src/libgnomeui endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src src/libgnome src/zvt src/gconf src/gconfclient src/libgnomeui endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src src/libgnome src/zvt src/gconf src/gconfclient src/libgnomeui -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src src/libgnome src/zvt src/gconf src/gconfclient src/libgnomeui endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src src/libgnome src/zvt src/gconf src/gconfclient src/libgnomeui -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src src/libgnome src/zvt src/gconf src/gconfclient src/libgnomeui -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src src/libgnome src/zvt src/gconf src/gconfclient src/libgnomeui -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples src src/zvt src/libgnome src/gconfclient src/gconf src/libgnomeui endif @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests examples src src/zvt src/libgnome src/gconfclient src/gconf src/libgnomeui endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests examples src src/zvt src/libgnome src/gconfclient src/gconf src/libgnomeui -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests examples src src/zvt src/libgnome src/gconfclient src/gconf src/libgnomeui endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests examples src src/zvt src/libgnome src/gconfclient src/gconf src/libgnomeui endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests examples src src/zvt src/libgnome src/gconfclient src/gconf src/libgnomeui -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests examples src src/zvt src/libgnome src/gconfclient src/gconf src/libgnomeui endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests examples src src/zvt src/libgnome src/gconfclient src/gconf src/libgnomeui endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests examples src src/zvt src/libgnome src/gconfclient src/gconf src/libgnomeui -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests examples src src/zvt src/libgnome src/gconfclient src/gconf src/libgnomeui endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests examples src src/zvt src/libgnome src/gconfclient src/gconf src/libgnomeui endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests examples src src/zvt src/libgnome src/gconfclient src/gconf src/libgnomeui -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests examples src src/zvt src/libgnome src/gconfclient src/gconf src/libgnomeui endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests examples src src/zvt src/libgnome src/gconfclient src/gconf src/libgnomeui -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests examples src src/zvt src/libgnome src/gconfclient src/gconf src/libgnomeui -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests examples src src/zvt src/libgnome src/gconfclient src/gconf src/libgnomeui -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1103,11 +1012,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1609,13 +1513,6 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_IMLIB=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_IMLIB=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 @@ -1854,13 +1751,6 @@ REQUIRE_PACKAGES_GTK1=1 REQUIRE_PACKAGES_IMLIB=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -REQUIRE_PACKAGES_IMLIB=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 @@ -1889,13 +1779,6 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_IMLIB=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -REQUIRE_PACKAGES_IMLIB=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 @@ -1938,13 +1821,6 @@ REQUIRE_PACKAGES_GTK1=1 REQUIRE_PACKAGES_IMLIB=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -REQUIRE_PACKAGES_IMLIB=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 @@ -1952,27 +1828,6 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_IMLIB=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_IMLIB=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -REQUIRE_PACKAGES_IMLIB=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_IMLIB=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2104,20 +1959,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2255,15 +2110,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2486,12 +2337,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/openal/Makefile +++ fpc-2.2.2/fpcsrc/packages/openal/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=openal endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=openal -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=openal endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=openal endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=openal -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=openal endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=openal endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=openal -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=openal endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=openal endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=openal -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=openal endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=openal -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=openal -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=openal -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLEDIRS+=examples endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLEDIRS+=examples endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLEDIRS+=examples endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests examples endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests examples endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests examples endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1246,11 +1134,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1728,9 +1611,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1833,9 +1713,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1848,9 +1725,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1869,21 +1743,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1911,20 +1773,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2056,15 +1918,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2305,12 +2163,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) @@ -2515,9 +2369,6 @@ ifeq ($(FULL_TARGET),i386-beos) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2620,9 +2471,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2635,9 +2483,6 @@ ifeq ($(FULL_TARGET),arm-palmos) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),arm-wince) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2656,21 +2501,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all --- fpc-2.2.2.orig/fpcsrc/packages/openal/examples/Makefile +++ fpc-2.2.2/fpcsrc/packages/openal/examples/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -276,9 +248,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=madopenal endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=madopenal -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=madopenal endif @@ -381,9 +350,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=madopenal endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=madopenal -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=madopenal endif @@ -396,9 +362,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=madopenal endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=madopenal -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=madopenal endif @@ -417,21 +380,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=madopenal endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=madopenal -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=madopenal endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=madopenal -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=madopenal -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=madopenal -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -722,11 +673,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1246,16 +1192,6 @@ REQUIRE_PACKAGES_MODPLUG=1 REQUIRE_PACKAGES_MATROSKA=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_OPENAL=1 -REQUIRE_PACKAGES_MAD=1 -REQUIRE_PACKAGES_OGGVORBIS=1 -REQUIRE_PACKAGES_A52=1 -REQUIRE_PACKAGES_DTS=1 -REQUIRE_PACKAGES_MODPLUG=1 -REQUIRE_PACKAGES_MATROSKA=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENAL=1 @@ -1596,16 +1532,6 @@ REQUIRE_PACKAGES_MODPLUG=1 REQUIRE_PACKAGES_MATROSKA=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_OPENAL=1 -REQUIRE_PACKAGES_MAD=1 -REQUIRE_PACKAGES_OGGVORBIS=1 -REQUIRE_PACKAGES_A52=1 -REQUIRE_PACKAGES_DTS=1 -REQUIRE_PACKAGES_MODPLUG=1 -REQUIRE_PACKAGES_MATROSKA=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENAL=1 @@ -1646,16 +1572,6 @@ REQUIRE_PACKAGES_MODPLUG=1 REQUIRE_PACKAGES_MATROSKA=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_OPENAL=1 -REQUIRE_PACKAGES_MAD=1 -REQUIRE_PACKAGES_OGGVORBIS=1 -REQUIRE_PACKAGES_A52=1 -REQUIRE_PACKAGES_DTS=1 -REQUIRE_PACKAGES_MODPLUG=1 -REQUIRE_PACKAGES_MATROSKA=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENAL=1 @@ -1716,16 +1632,6 @@ REQUIRE_PACKAGES_MODPLUG=1 REQUIRE_PACKAGES_MATROSKA=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_OPENAL=1 -REQUIRE_PACKAGES_MAD=1 -REQUIRE_PACKAGES_OGGVORBIS=1 -REQUIRE_PACKAGES_A52=1 -REQUIRE_PACKAGES_DTS=1 -REQUIRE_PACKAGES_MODPLUG=1 -REQUIRE_PACKAGES_MATROSKA=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENAL=1 @@ -1736,36 +1642,6 @@ REQUIRE_PACKAGES_MODPLUG=1 REQUIRE_PACKAGES_MATROSKA=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_OPENAL=1 -REQUIRE_PACKAGES_MAD=1 -REQUIRE_PACKAGES_OGGVORBIS=1 -REQUIRE_PACKAGES_A52=1 -REQUIRE_PACKAGES_DTS=1 -REQUIRE_PACKAGES_MODPLUG=1 -REQUIRE_PACKAGES_MATROSKA=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_OPENAL=1 -REQUIRE_PACKAGES_MAD=1 -REQUIRE_PACKAGES_OGGVORBIS=1 -REQUIRE_PACKAGES_A52=1 -REQUIRE_PACKAGES_DTS=1 -REQUIRE_PACKAGES_MODPLUG=1 -REQUIRE_PACKAGES_MATROSKA=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_OPENAL=1 -REQUIRE_PACKAGES_MAD=1 -REQUIRE_PACKAGES_OGGVORBIS=1 -REQUIRE_PACKAGES_A52=1 -REQUIRE_PACKAGES_DTS=1 -REQUIRE_PACKAGES_MODPLUG=1 -REQUIRE_PACKAGES_MATROSKA=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1975,20 +1851,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2120,13 +1996,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/fpcsrc/packages/libgd/Makefile +++ fpc-2.2.2/fpcsrc/packages/libgd/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=gd endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=gd -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=gd endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=gd endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=gd -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=gd endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=gd endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=gd -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=gd endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=gd endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=gd -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=gd endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=gd -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=gd -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=gd -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=gdtest endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLES+=gdtest endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=gdtest -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLES+=gdtest endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLES+=gdtest endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=gdtest -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLES+=gdtest endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLES+=gdtest endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=gdtest -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLES+=gdtest endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLES+=gdtest endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=gdtest -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLES+=gdtest endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=gdtest -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=gdtest -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=gdtest -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1279,11 +1167,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1761,9 +1644,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1866,9 +1746,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1881,9 +1758,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1902,21 +1776,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1944,20 +1806,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2095,15 +1957,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2344,12 +2202,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/rexx/Makefile +++ fpc-2.2.2/fpcsrc/packages/rexx/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=rexxsaa endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=rexxsaa -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=rexxsaa endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=rexxsaa endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=rexxsaa -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=rexxsaa endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=rexxsaa endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=rexxsaa -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=rexxsaa endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=rexxsaa endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=rexxsaa -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=rexxsaa endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=rexxsaa -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=rexxsaa -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=rexxsaa -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLEDIRS+=examples endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLEDIRS+=examples endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLEDIRS+=examples endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests examples endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests examples endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests examples endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1246,11 +1134,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1728,9 +1611,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1833,9 +1713,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1848,9 +1725,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1869,21 +1743,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1911,20 +1773,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2056,15 +1918,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2305,12 +2163,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) @@ -2515,9 +2369,6 @@ ifeq ($(FULL_TARGET),i386-beos) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2620,9 +2471,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2635,9 +2483,6 @@ ifeq ($(FULL_TARGET),arm-palmos) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),arm-wince) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2656,21 +2501,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all --- fpc-2.2.2.orig/fpcsrc/packages/rexx/examples/Makefile +++ fpc-2.2.2/fpcsrc/packages/rexx/examples/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -276,9 +248,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=callrexx endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=callrexx -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=callrexx endif @@ -381,9 +350,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=callrexx endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=callrexx -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=callrexx endif @@ -396,9 +362,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=callrexx endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=callrexx -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=callrexx endif @@ -417,21 +380,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=callrexx endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=callrexx -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=callrexx endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=callrexx -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=callrexx -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=callrexx -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -722,11 +673,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1210,10 +1156,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_REXX=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_REXX=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_REXX=1 @@ -1350,10 +1292,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_REXX=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_REXX=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_REXX=1 @@ -1370,10 +1308,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_REXX=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_REXX=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_REXX=1 @@ -1398,26 +1332,10 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_REXX=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_REXX=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_REXX=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_REXX=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_REXX=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_REXX=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1471,20 +1389,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1616,13 +1534,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/fpcsrc/packages/symbolic/Makefile +++ fpc-2.2.2/fpcsrc/packages/symbolic/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=symbolic endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=symbolic -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=symbolic endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=symbolic endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=symbolic -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=symbolic endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=symbolic endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=symbolic -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=symbolic endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=symbolic endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=symbolic -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=symbolic endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=symbolic -endif override INSTALL_FPCPACKAGE=y override INSTALL_FPCSUBDIR=packages ifeq ($(FULL_TARGET),i386-linux) @@ -454,9 +405,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -559,9 +507,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -574,9 +519,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -595,21 +537,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -628,9 +558,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -733,9 +660,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -748,9 +672,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -769,21 +690,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1106,11 +1015,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1588,9 +1492,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1693,9 +1594,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1708,9 +1606,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1729,21 +1624,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1771,20 +1654,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1922,15 +1805,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2153,12 +2032,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/cairo/Makefile +++ fpc-2.2.2/fpcsrc/packages/cairo/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=cairo cairoft endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=cairo cairoft -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=cairo cairoft cairoxlib endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=cairo cairoft cairoxlib endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=cairo cairoft cairoxlib -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=cairo cairoft endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=cairo cairoft endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=cairo cairoft cairoxlib -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=cairo cairoft endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=cairo cairoft cairoxlib endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=cairo cairoft cairoxlib -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=cairo cairoft endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=cairo cairoft cairoxlib -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=cairo cairoft -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1103,11 +1012,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1619,14 +1523,6 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-IMAGE=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASJPEG=1 @@ -1915,15 +1811,6 @@ REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASJPEG=1 @@ -1959,15 +1846,6 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-IMAGE=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASJPEG=1 @@ -2017,15 +1895,6 @@ REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASJPEG=1 @@ -2034,31 +1903,6 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-IMAGE=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2294,20 +2138,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2445,15 +2289,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2676,12 +2516,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/winunits-jedi/Makefile +++ fpc-2.2.2/fpcsrc/packages/winunits-jedi/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=buildjwa endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=buildjwa -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=buildjwa endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=buildjwa endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=buildjwa -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=buildjwa endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=buildjwa endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=buildjwa -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=buildjwa endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=buildjwa endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=buildjwa -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=buildjwa endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=buildjwa -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=buildjwa -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=buildjwa -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=jwawintype jwawinbase jwawinnt jwalmerr jwalmmsg jwaaclui jwaadsdb jwalmerrlog jwalmjoin jwaauthz jwabits jwalmremutl jwalmrepl jwalmserver jwalmshare jwalmsname jwalmstats jwaaccctrl jwaaclapi jwacderr jwacpl jwaactiveds jwadbt jwadde jwaadserr jwaadshlp jwaadsnms jwaadsprop jwaadssts jwaadtgen jwaaf_irda jwaatalkwsh jwaauthif jwadlgs jwadssec jwabatclass jwaexcpt jwaime jwabits1_5 jwabitscfg jwabitsmsg jwablberr jwabluetoothapis jwabthdef jwabthsdpdef jwabugcodes jwalmat jwalmsvc jwacmnquery jwacolordlg jwalmuse jwamsi jwacplext jwacryptuiapi jwanb30 jwanetsh jwapbt jwapdh jwadhcpcsdk jwadhcpsapi jwadhcpssdk jwaprsht jwapsapi jwadsadmin jwadsclient jwadsgetdc jwadskquota jwadsquery jwadsrole jwaqos jwaqossp jwaerrorrep jwarpc jwasddl jwafaxdev jwafaxext jwafaxmmc jwafaxroute jwagpedit jwahherror jwahtmlguid jwahtmlhelp jwaiaccess jwaiadmext jwaicmpapi jwaiiscnfg jwaimagehlp jwalmdfs jwaimapierror jwasens jwasfc jwaioevent jwaipexport jwaiphlpapi jwaipifcons jwaipinfoid jwaiprtrmib jwaiptypes jwaisguids jwaissper16 jwalmaccess jwalmalert jwalmapibuf jwasnmp jwasspi jwalmaudit jwalmconfig jwalmcons jwawpapi jwawsipx jwawsrm jwalmuseflg jwalmwksta jwaloadperf jwalpmapi jwamciavi jwamprerror jwawsvns jwaimapi jwamsidefs jwamsiquery jwamstask jwamstcpip jwamswsock jwanspapi jwantddpar jwantdsapi jwantdsbcli jwantdsbmsg jwantldap jwantquery jwantsecapi jwantstatus jwaobjsel jwapatchapi jwapatchwiz jwapdhmsg jwapowrprof jwaprofinfo jwaprotocol jwaqosname jwaqospol jwareason jwaregstr jwarpcasync jwarpcdce jwarpcnsi jwarpcnterr jwarpcssl jwascesvc jwaschedule jwaschemadef jwasecext jwasecurity jwasensapi jwashlguid jwasisbkup jwasporder jwasrrestoreptapi jwasubauth jwasvcguid jwatlhelp32 jwatmschema jwatraffic jwauserenv jwauxtheme jwawbemcli jwawinable jwawinber jwawincon jwawincpl jwawincred jwawincrypt jwawindns jwawinefs jwawinerror jwawinfax jwawingdi jwawinioctl jwawinldap jwawinnetwk jwawinnls jwawinperf jwawinreg jwawinresrc jwawinsafer jwawinsock jwawinsock2 jwawinsvc jwawinuser jwawinver jwawinwlx jwawmistr jwawownt16 jwawownt32 jwawpapimsg jwawpcrsmsg jwawpftpmsg jwawppstmsg jwawpspihlp jwawptypes jwawpwizmsg jwaws2atm jwaws2bth jwaws2dnet jwaws2spi jwaws2tcpip jwawshisotp jwawsnetbs jwawsnwlink jwawtsapi32 jwazmouse jwasensevts jwaadstlb jwanative jwawindows jwacarderr jwaactivex jwawindllnames jwawinternl jwawinsta jwavista endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_IMPLICITUNITS+=jwawintype jwawinbase jwawinnt jwalmerr jwalmmsg jwaaclui jwaadsdb jwalmerrlog jwalmjoin jwaauthz jwabits jwalmremutl jwalmrepl jwalmserver jwalmshare jwalmsname jwalmstats jwaaccctrl jwaaclapi jwacderr jwacpl jwaactiveds jwadbt jwadde jwaadserr jwaadshlp jwaadsnms jwaadsprop jwaadssts jwaadtgen jwaaf_irda jwaatalkwsh jwaauthif jwadlgs jwadssec jwabatclass jwaexcpt jwaime jwabits1_5 jwabitscfg jwabitsmsg jwablberr jwabluetoothapis jwabthdef jwabthsdpdef jwabugcodes jwalmat jwalmsvc jwacmnquery jwacolordlg jwalmuse jwamsi jwacplext jwacryptuiapi jwanb30 jwanetsh jwapbt jwapdh jwadhcpcsdk jwadhcpsapi jwadhcpssdk jwaprsht jwapsapi jwadsadmin jwadsclient jwadsgetdc jwadskquota jwadsquery jwadsrole jwaqos jwaqossp jwaerrorrep jwarpc jwasddl jwafaxdev jwafaxext jwafaxmmc jwafaxroute jwagpedit jwahherror jwahtmlguid jwahtmlhelp jwaiaccess jwaiadmext jwaicmpapi jwaiiscnfg jwaimagehlp jwalmdfs jwaimapierror jwasens jwasfc jwaioevent jwaipexport jwaiphlpapi jwaipifcons jwaipinfoid jwaiprtrmib jwaiptypes jwaisguids jwaissper16 jwalmaccess jwalmalert jwalmapibuf jwasnmp jwasspi jwalmaudit jwalmconfig jwalmcons jwawpapi jwawsipx jwawsrm jwalmuseflg jwalmwksta jwaloadperf jwalpmapi jwamciavi jwamprerror jwawsvns jwaimapi jwamsidefs jwamsiquery jwamstask jwamstcpip jwamswsock jwanspapi jwantddpar jwantdsapi jwantdsbcli jwantdsbmsg jwantldap jwantquery jwantsecapi jwantstatus jwaobjsel jwapatchapi jwapatchwiz jwapdhmsg jwapowrprof jwaprofinfo jwaprotocol jwaqosname jwaqospol jwareason jwaregstr jwarpcasync jwarpcdce jwarpcnsi jwarpcnterr jwarpcssl jwascesvc jwaschedule jwaschemadef jwasecext jwasecurity jwasensapi jwashlguid jwasisbkup jwasporder jwasrrestoreptapi jwasubauth jwasvcguid jwatlhelp32 jwatmschema jwatraffic jwauserenv jwauxtheme jwawbemcli jwawinable jwawinber jwawincon jwawincpl jwawincred jwawincrypt jwawindns jwawinefs jwawinerror jwawinfax jwawingdi jwawinioctl jwawinldap jwawinnetwk jwawinnls jwawinperf jwawinreg jwawinresrc jwawinsafer jwawinsock jwawinsock2 jwawinsvc jwawinuser jwawinver jwawinwlx jwawmistr jwawownt16 jwawownt32 jwawpapimsg jwawpcrsmsg jwawpftpmsg jwawppstmsg jwawpspihlp jwawptypes jwawpwizmsg jwaws2atm jwaws2bth jwaws2dnet jwaws2spi jwaws2tcpip jwawshisotp jwawsnetbs jwawsnwlink jwawtsapi32 jwazmouse jwasensevts jwaadstlb jwanative jwawindows jwacarderr jwaactivex jwawindllnames jwawinternl jwawinsta jwavista endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_IMPLICITUNITS+=jwawintype jwawinbase jwawinnt jwalmerr jwalmmsg jwaaclui jwaadsdb jwalmerrlog jwalmjoin jwaauthz jwabits jwalmremutl jwalmrepl jwalmserver jwalmshare jwalmsname jwalmstats jwaaccctrl jwaaclapi jwacderr jwacpl jwaactiveds jwadbt jwadde jwaadserr jwaadshlp jwaadsnms jwaadsprop jwaadssts jwaadtgen jwaaf_irda jwaatalkwsh jwaauthif jwadlgs jwadssec jwabatclass jwaexcpt jwaime jwabits1_5 jwabitscfg jwabitsmsg jwablberr jwabluetoothapis jwabthdef jwabthsdpdef jwabugcodes jwalmat jwalmsvc jwacmnquery jwacolordlg jwalmuse jwamsi jwacplext jwacryptuiapi jwanb30 jwanetsh jwapbt jwapdh jwadhcpcsdk jwadhcpsapi jwadhcpssdk jwaprsht jwapsapi jwadsadmin jwadsclient jwadsgetdc jwadskquota jwadsquery jwadsrole jwaqos jwaqossp jwaerrorrep jwarpc jwasddl jwafaxdev jwafaxext jwafaxmmc jwafaxroute jwagpedit jwahherror jwahtmlguid jwahtmlhelp jwaiaccess jwaiadmext jwaicmpapi jwaiiscnfg jwaimagehlp jwalmdfs jwaimapierror jwasens jwasfc jwaioevent jwaipexport jwaiphlpapi jwaipifcons jwaipinfoid jwaiprtrmib jwaiptypes jwaisguids jwaissper16 jwalmaccess jwalmalert jwalmapibuf jwasnmp jwasspi jwalmaudit jwalmconfig jwalmcons jwawpapi jwawsipx jwawsrm jwalmuseflg jwalmwksta jwaloadperf jwalpmapi jwamciavi jwamprerror jwawsvns jwaimapi jwamsidefs jwamsiquery jwamstask jwamstcpip jwamswsock jwanspapi jwantddpar jwantdsapi jwantdsbcli jwantdsbmsg jwantldap jwantquery jwantsecapi jwantstatus jwaobjsel jwapatchapi jwapatchwiz jwapdhmsg jwapowrprof jwaprofinfo jwaprotocol jwaqosname jwaqospol jwareason jwaregstr jwarpcasync jwarpcdce jwarpcnsi jwarpcnterr jwarpcssl jwascesvc jwaschedule jwaschemadef jwasecext jwasecurity jwasensapi jwashlguid jwasisbkup jwasporder jwasrrestoreptapi jwasubauth jwasvcguid jwatlhelp32 jwatmschema jwatraffic jwauserenv jwauxtheme jwawbemcli jwawinable jwawinber jwawincon jwawincpl jwawincred jwawincrypt jwawindns jwawinefs jwawinerror jwawinfax jwawingdi jwawinioctl jwawinldap jwawinnetwk jwawinnls jwawinperf jwawinreg jwawinresrc jwawinsafer jwawinsock jwawinsock2 jwawinsvc jwawinuser jwawinver jwawinwlx jwawmistr jwawownt16 jwawownt32 jwawpapimsg jwawpcrsmsg jwawpftpmsg jwawppstmsg jwawpspihlp jwawptypes jwawpwizmsg jwaws2atm jwaws2bth jwaws2dnet jwaws2spi jwaws2tcpip jwawshisotp jwawsnetbs jwawsnwlink jwawtsapi32 jwazmouse jwasensevts jwaadstlb jwanative jwawindows jwacarderr jwaactivex jwawindllnames jwawinternl jwawinsta jwavista -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_IMPLICITUNITS+=jwawintype jwawinbase jwawinnt jwalmerr jwalmmsg jwaaclui jwaadsdb jwalmerrlog jwalmjoin jwaauthz jwabits jwalmremutl jwalmrepl jwalmserver jwalmshare jwalmsname jwalmstats jwaaccctrl jwaaclapi jwacderr jwacpl jwaactiveds jwadbt jwadde jwaadserr jwaadshlp jwaadsnms jwaadsprop jwaadssts jwaadtgen jwaaf_irda jwaatalkwsh jwaauthif jwadlgs jwadssec jwabatclass jwaexcpt jwaime jwabits1_5 jwabitscfg jwabitsmsg jwablberr jwabluetoothapis jwabthdef jwabthsdpdef jwabugcodes jwalmat jwalmsvc jwacmnquery jwacolordlg jwalmuse jwamsi jwacplext jwacryptuiapi jwanb30 jwanetsh jwapbt jwapdh jwadhcpcsdk jwadhcpsapi jwadhcpssdk jwaprsht jwapsapi jwadsadmin jwadsclient jwadsgetdc jwadskquota jwadsquery jwadsrole jwaqos jwaqossp jwaerrorrep jwarpc jwasddl jwafaxdev jwafaxext jwafaxmmc jwafaxroute jwagpedit jwahherror jwahtmlguid jwahtmlhelp jwaiaccess jwaiadmext jwaicmpapi jwaiiscnfg jwaimagehlp jwalmdfs jwaimapierror jwasens jwasfc jwaioevent jwaipexport jwaiphlpapi jwaipifcons jwaipinfoid jwaiprtrmib jwaiptypes jwaisguids jwaissper16 jwalmaccess jwalmalert jwalmapibuf jwasnmp jwasspi jwalmaudit jwalmconfig jwalmcons jwawpapi jwawsipx jwawsrm jwalmuseflg jwalmwksta jwaloadperf jwalpmapi jwamciavi jwamprerror jwawsvns jwaimapi jwamsidefs jwamsiquery jwamstask jwamstcpip jwamswsock jwanspapi jwantddpar jwantdsapi jwantdsbcli jwantdsbmsg jwantldap jwantquery jwantsecapi jwantstatus jwaobjsel jwapatchapi jwapatchwiz jwapdhmsg jwapowrprof jwaprofinfo jwaprotocol jwaqosname jwaqospol jwareason jwaregstr jwarpcasync jwarpcdce jwarpcnsi jwarpcnterr jwarpcssl jwascesvc jwaschedule jwaschemadef jwasecext jwasecurity jwasensapi jwashlguid jwasisbkup jwasporder jwasrrestoreptapi jwasubauth jwasvcguid jwatlhelp32 jwatmschema jwatraffic jwauserenv jwauxtheme jwawbemcli jwawinable jwawinber jwawincon jwawincpl jwawincred jwawincrypt jwawindns jwawinefs jwawinerror jwawinfax jwawingdi jwawinioctl jwawinldap jwawinnetwk jwawinnls jwawinperf jwawinreg jwawinresrc jwawinsafer jwawinsock jwawinsock2 jwawinsvc jwawinuser jwawinver jwawinwlx jwawmistr jwawownt16 jwawownt32 jwawpapimsg jwawpcrsmsg jwawpftpmsg jwawppstmsg jwawpspihlp jwawptypes jwawpwizmsg jwaws2atm jwaws2bth jwaws2dnet jwaws2spi jwaws2tcpip jwawshisotp jwawsnetbs jwawsnwlink jwawtsapi32 jwazmouse jwasensevts jwaadstlb jwanative jwawindows jwacarderr jwaactivex jwawindllnames jwawinternl jwawinsta jwavista endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_IMPLICITUNITS+=jwawintype jwawinbase jwawinnt jwalmerr jwalmmsg jwaaclui jwaadsdb jwalmerrlog jwalmjoin jwaauthz jwabits jwalmremutl jwalmrepl jwalmserver jwalmshare jwalmsname jwalmstats jwaaccctrl jwaaclapi jwacderr jwacpl jwaactiveds jwadbt jwadde jwaadserr jwaadshlp jwaadsnms jwaadsprop jwaadssts jwaadtgen jwaaf_irda jwaatalkwsh jwaauthif jwadlgs jwadssec jwabatclass jwaexcpt jwaime jwabits1_5 jwabitscfg jwabitsmsg jwablberr jwabluetoothapis jwabthdef jwabthsdpdef jwabugcodes jwalmat jwalmsvc jwacmnquery jwacolordlg jwalmuse jwamsi jwacplext jwacryptuiapi jwanb30 jwanetsh jwapbt jwapdh jwadhcpcsdk jwadhcpsapi jwadhcpssdk jwaprsht jwapsapi jwadsadmin jwadsclient jwadsgetdc jwadskquota jwadsquery jwadsrole jwaqos jwaqossp jwaerrorrep jwarpc jwasddl jwafaxdev jwafaxext jwafaxmmc jwafaxroute jwagpedit jwahherror jwahtmlguid jwahtmlhelp jwaiaccess jwaiadmext jwaicmpapi jwaiiscnfg jwaimagehlp jwalmdfs jwaimapierror jwasens jwasfc jwaioevent jwaipexport jwaiphlpapi jwaipifcons jwaipinfoid jwaiprtrmib jwaiptypes jwaisguids jwaissper16 jwalmaccess jwalmalert jwalmapibuf jwasnmp jwasspi jwalmaudit jwalmconfig jwalmcons jwawpapi jwawsipx jwawsrm jwalmuseflg jwalmwksta jwaloadperf jwalpmapi jwamciavi jwamprerror jwawsvns jwaimapi jwamsidefs jwamsiquery jwamstask jwamstcpip jwamswsock jwanspapi jwantddpar jwantdsapi jwantdsbcli jwantdsbmsg jwantldap jwantquery jwantsecapi jwantstatus jwaobjsel jwapatchapi jwapatchwiz jwapdhmsg jwapowrprof jwaprofinfo jwaprotocol jwaqosname jwaqospol jwareason jwaregstr jwarpcasync jwarpcdce jwarpcnsi jwarpcnterr jwarpcssl jwascesvc jwaschedule jwaschemadef jwasecext jwasecurity jwasensapi jwashlguid jwasisbkup jwasporder jwasrrestoreptapi jwasubauth jwasvcguid jwatlhelp32 jwatmschema jwatraffic jwauserenv jwauxtheme jwawbemcli jwawinable jwawinber jwawincon jwawincpl jwawincred jwawincrypt jwawindns jwawinefs jwawinerror jwawinfax jwawingdi jwawinioctl jwawinldap jwawinnetwk jwawinnls jwawinperf jwawinreg jwawinresrc jwawinsafer jwawinsock jwawinsock2 jwawinsvc jwawinuser jwawinver jwawinwlx jwawmistr jwawownt16 jwawownt32 jwawpapimsg jwawpcrsmsg jwawpftpmsg jwawppstmsg jwawpspihlp jwawptypes jwawpwizmsg jwaws2atm jwaws2bth jwaws2dnet jwaws2spi jwaws2tcpip jwawshisotp jwawsnetbs jwawsnwlink jwawtsapi32 jwazmouse jwasensevts jwaadstlb jwanative jwawindows jwacarderr jwaactivex jwawindllnames jwawinternl jwawinsta jwavista endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_IMPLICITUNITS+=jwawintype jwawinbase jwawinnt jwalmerr jwalmmsg jwaaclui jwaadsdb jwalmerrlog jwalmjoin jwaauthz jwabits jwalmremutl jwalmrepl jwalmserver jwalmshare jwalmsname jwalmstats jwaaccctrl jwaaclapi jwacderr jwacpl jwaactiveds jwadbt jwadde jwaadserr jwaadshlp jwaadsnms jwaadsprop jwaadssts jwaadtgen jwaaf_irda jwaatalkwsh jwaauthif jwadlgs jwadssec jwabatclass jwaexcpt jwaime jwabits1_5 jwabitscfg jwabitsmsg jwablberr jwabluetoothapis jwabthdef jwabthsdpdef jwabugcodes jwalmat jwalmsvc jwacmnquery jwacolordlg jwalmuse jwamsi jwacplext jwacryptuiapi jwanb30 jwanetsh jwapbt jwapdh jwadhcpcsdk jwadhcpsapi jwadhcpssdk jwaprsht jwapsapi jwadsadmin jwadsclient jwadsgetdc jwadskquota jwadsquery jwadsrole jwaqos jwaqossp jwaerrorrep jwarpc jwasddl jwafaxdev jwafaxext jwafaxmmc jwafaxroute jwagpedit jwahherror jwahtmlguid jwahtmlhelp jwaiaccess jwaiadmext jwaicmpapi jwaiiscnfg jwaimagehlp jwalmdfs jwaimapierror jwasens jwasfc jwaioevent jwaipexport jwaiphlpapi jwaipifcons jwaipinfoid jwaiprtrmib jwaiptypes jwaisguids jwaissper16 jwalmaccess jwalmalert jwalmapibuf jwasnmp jwasspi jwalmaudit jwalmconfig jwalmcons jwawpapi jwawsipx jwawsrm jwalmuseflg jwalmwksta jwaloadperf jwalpmapi jwamciavi jwamprerror jwawsvns jwaimapi jwamsidefs jwamsiquery jwamstask jwamstcpip jwamswsock jwanspapi jwantddpar jwantdsapi jwantdsbcli jwantdsbmsg jwantldap jwantquery jwantsecapi jwantstatus jwaobjsel jwapatchapi jwapatchwiz jwapdhmsg jwapowrprof jwaprofinfo jwaprotocol jwaqosname jwaqospol jwareason jwaregstr jwarpcasync jwarpcdce jwarpcnsi jwarpcnterr jwarpcssl jwascesvc jwaschedule jwaschemadef jwasecext jwasecurity jwasensapi jwashlguid jwasisbkup jwasporder jwasrrestoreptapi jwasubauth jwasvcguid jwatlhelp32 jwatmschema jwatraffic jwauserenv jwauxtheme jwawbemcli jwawinable jwawinber jwawincon jwawincpl jwawincred jwawincrypt jwawindns jwawinefs jwawinerror jwawinfax jwawingdi jwawinioctl jwawinldap jwawinnetwk jwawinnls jwawinperf jwawinreg jwawinresrc jwawinsafer jwawinsock jwawinsock2 jwawinsvc jwawinuser jwawinver jwawinwlx jwawmistr jwawownt16 jwawownt32 jwawpapimsg jwawpcrsmsg jwawpftpmsg jwawppstmsg jwawpspihlp jwawptypes jwawpwizmsg jwaws2atm jwaws2bth jwaws2dnet jwaws2spi jwaws2tcpip jwawshisotp jwawsnetbs jwawsnwlink jwawtsapi32 jwazmouse jwasensevts jwaadstlb jwanative jwawindows jwacarderr jwaactivex jwawindllnames jwawinternl jwawinsta jwavista -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_IMPLICITUNITS+=jwawintype jwawinbase jwawinnt jwalmerr jwalmmsg jwaaclui jwaadsdb jwalmerrlog jwalmjoin jwaauthz jwabits jwalmremutl jwalmrepl jwalmserver jwalmshare jwalmsname jwalmstats jwaaccctrl jwaaclapi jwacderr jwacpl jwaactiveds jwadbt jwadde jwaadserr jwaadshlp jwaadsnms jwaadsprop jwaadssts jwaadtgen jwaaf_irda jwaatalkwsh jwaauthif jwadlgs jwadssec jwabatclass jwaexcpt jwaime jwabits1_5 jwabitscfg jwabitsmsg jwablberr jwabluetoothapis jwabthdef jwabthsdpdef jwabugcodes jwalmat jwalmsvc jwacmnquery jwacolordlg jwalmuse jwamsi jwacplext jwacryptuiapi jwanb30 jwanetsh jwapbt jwapdh jwadhcpcsdk jwadhcpsapi jwadhcpssdk jwaprsht jwapsapi jwadsadmin jwadsclient jwadsgetdc jwadskquota jwadsquery jwadsrole jwaqos jwaqossp jwaerrorrep jwarpc jwasddl jwafaxdev jwafaxext jwafaxmmc jwafaxroute jwagpedit jwahherror jwahtmlguid jwahtmlhelp jwaiaccess jwaiadmext jwaicmpapi jwaiiscnfg jwaimagehlp jwalmdfs jwaimapierror jwasens jwasfc jwaioevent jwaipexport jwaiphlpapi jwaipifcons jwaipinfoid jwaiprtrmib jwaiptypes jwaisguids jwaissper16 jwalmaccess jwalmalert jwalmapibuf jwasnmp jwasspi jwalmaudit jwalmconfig jwalmcons jwawpapi jwawsipx jwawsrm jwalmuseflg jwalmwksta jwaloadperf jwalpmapi jwamciavi jwamprerror jwawsvns jwaimapi jwamsidefs jwamsiquery jwamstask jwamstcpip jwamswsock jwanspapi jwantddpar jwantdsapi jwantdsbcli jwantdsbmsg jwantldap jwantquery jwantsecapi jwantstatus jwaobjsel jwapatchapi jwapatchwiz jwapdhmsg jwapowrprof jwaprofinfo jwaprotocol jwaqosname jwaqospol jwareason jwaregstr jwarpcasync jwarpcdce jwarpcnsi jwarpcnterr jwarpcssl jwascesvc jwaschedule jwaschemadef jwasecext jwasecurity jwasensapi jwashlguid jwasisbkup jwasporder jwasrrestoreptapi jwasubauth jwasvcguid jwatlhelp32 jwatmschema jwatraffic jwauserenv jwauxtheme jwawbemcli jwawinable jwawinber jwawincon jwawincpl jwawincred jwawincrypt jwawindns jwawinefs jwawinerror jwawinfax jwawingdi jwawinioctl jwawinldap jwawinnetwk jwawinnls jwawinperf jwawinreg jwawinresrc jwawinsafer jwawinsock jwawinsock2 jwawinsvc jwawinuser jwawinver jwawinwlx jwawmistr jwawownt16 jwawownt32 jwawpapimsg jwawpcrsmsg jwawpftpmsg jwawppstmsg jwawpspihlp jwawptypes jwawpwizmsg jwaws2atm jwaws2bth jwaws2dnet jwaws2spi jwaws2tcpip jwawshisotp jwawsnetbs jwawsnwlink jwawtsapi32 jwazmouse jwasensevts jwaadstlb jwanative jwawindows jwacarderr jwaactivex jwawindllnames jwawinternl jwawinsta jwavista endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_IMPLICITUNITS+=jwawintype jwawinbase jwawinnt jwalmerr jwalmmsg jwaaclui jwaadsdb jwalmerrlog jwalmjoin jwaauthz jwabits jwalmremutl jwalmrepl jwalmserver jwalmshare jwalmsname jwalmstats jwaaccctrl jwaaclapi jwacderr jwacpl jwaactiveds jwadbt jwadde jwaadserr jwaadshlp jwaadsnms jwaadsprop jwaadssts jwaadtgen jwaaf_irda jwaatalkwsh jwaauthif jwadlgs jwadssec jwabatclass jwaexcpt jwaime jwabits1_5 jwabitscfg jwabitsmsg jwablberr jwabluetoothapis jwabthdef jwabthsdpdef jwabugcodes jwalmat jwalmsvc jwacmnquery jwacolordlg jwalmuse jwamsi jwacplext jwacryptuiapi jwanb30 jwanetsh jwapbt jwapdh jwadhcpcsdk jwadhcpsapi jwadhcpssdk jwaprsht jwapsapi jwadsadmin jwadsclient jwadsgetdc jwadskquota jwadsquery jwadsrole jwaqos jwaqossp jwaerrorrep jwarpc jwasddl jwafaxdev jwafaxext jwafaxmmc jwafaxroute jwagpedit jwahherror jwahtmlguid jwahtmlhelp jwaiaccess jwaiadmext jwaicmpapi jwaiiscnfg jwaimagehlp jwalmdfs jwaimapierror jwasens jwasfc jwaioevent jwaipexport jwaiphlpapi jwaipifcons jwaipinfoid jwaiprtrmib jwaiptypes jwaisguids jwaissper16 jwalmaccess jwalmalert jwalmapibuf jwasnmp jwasspi jwalmaudit jwalmconfig jwalmcons jwawpapi jwawsipx jwawsrm jwalmuseflg jwalmwksta jwaloadperf jwalpmapi jwamciavi jwamprerror jwawsvns jwaimapi jwamsidefs jwamsiquery jwamstask jwamstcpip jwamswsock jwanspapi jwantddpar jwantdsapi jwantdsbcli jwantdsbmsg jwantldap jwantquery jwantsecapi jwantstatus jwaobjsel jwapatchapi jwapatchwiz jwapdhmsg jwapowrprof jwaprofinfo jwaprotocol jwaqosname jwaqospol jwareason jwaregstr jwarpcasync jwarpcdce jwarpcnsi jwarpcnterr jwarpcssl jwascesvc jwaschedule jwaschemadef jwasecext jwasecurity jwasensapi jwashlguid jwasisbkup jwasporder jwasrrestoreptapi jwasubauth jwasvcguid jwatlhelp32 jwatmschema jwatraffic jwauserenv jwauxtheme jwawbemcli jwawinable jwawinber jwawincon jwawincpl jwawincred jwawincrypt jwawindns jwawinefs jwawinerror jwawinfax jwawingdi jwawinioctl jwawinldap jwawinnetwk jwawinnls jwawinperf jwawinreg jwawinresrc jwawinsafer jwawinsock jwawinsock2 jwawinsvc jwawinuser jwawinver jwawinwlx jwawmistr jwawownt16 jwawownt32 jwawpapimsg jwawpcrsmsg jwawpftpmsg jwawppstmsg jwawpspihlp jwawptypes jwawpwizmsg jwaws2atm jwaws2bth jwaws2dnet jwaws2spi jwaws2tcpip jwawshisotp jwawsnetbs jwawsnwlink jwawtsapi32 jwazmouse jwasensevts jwaadstlb jwanative jwawindows jwacarderr jwaactivex jwawindllnames jwawinternl jwawinsta jwavista endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_IMPLICITUNITS+=jwawintype jwawinbase jwawinnt jwalmerr jwalmmsg jwaaclui jwaadsdb jwalmerrlog jwalmjoin jwaauthz jwabits jwalmremutl jwalmrepl jwalmserver jwalmshare jwalmsname jwalmstats jwaaccctrl jwaaclapi jwacderr jwacpl jwaactiveds jwadbt jwadde jwaadserr jwaadshlp jwaadsnms jwaadsprop jwaadssts jwaadtgen jwaaf_irda jwaatalkwsh jwaauthif jwadlgs jwadssec jwabatclass jwaexcpt jwaime jwabits1_5 jwabitscfg jwabitsmsg jwablberr jwabluetoothapis jwabthdef jwabthsdpdef jwabugcodes jwalmat jwalmsvc jwacmnquery jwacolordlg jwalmuse jwamsi jwacplext jwacryptuiapi jwanb30 jwanetsh jwapbt jwapdh jwadhcpcsdk jwadhcpsapi jwadhcpssdk jwaprsht jwapsapi jwadsadmin jwadsclient jwadsgetdc jwadskquota jwadsquery jwadsrole jwaqos jwaqossp jwaerrorrep jwarpc jwasddl jwafaxdev jwafaxext jwafaxmmc jwafaxroute jwagpedit jwahherror jwahtmlguid jwahtmlhelp jwaiaccess jwaiadmext jwaicmpapi jwaiiscnfg jwaimagehlp jwalmdfs jwaimapierror jwasens jwasfc jwaioevent jwaipexport jwaiphlpapi jwaipifcons jwaipinfoid jwaiprtrmib jwaiptypes jwaisguids jwaissper16 jwalmaccess jwalmalert jwalmapibuf jwasnmp jwasspi jwalmaudit jwalmconfig jwalmcons jwawpapi jwawsipx jwawsrm jwalmuseflg jwalmwksta jwaloadperf jwalpmapi jwamciavi jwamprerror jwawsvns jwaimapi jwamsidefs jwamsiquery jwamstask jwamstcpip jwamswsock jwanspapi jwantddpar jwantdsapi jwantdsbcli jwantdsbmsg jwantldap jwantquery jwantsecapi jwantstatus jwaobjsel jwapatchapi jwapatchwiz jwapdhmsg jwapowrprof jwaprofinfo jwaprotocol jwaqosname jwaqospol jwareason jwaregstr jwarpcasync jwarpcdce jwarpcnsi jwarpcnterr jwarpcssl jwascesvc jwaschedule jwaschemadef jwasecext jwasecurity jwasensapi jwashlguid jwasisbkup jwasporder jwasrrestoreptapi jwasubauth jwasvcguid jwatlhelp32 jwatmschema jwatraffic jwauserenv jwauxtheme jwawbemcli jwawinable jwawinber jwawincon jwawincpl jwawincred jwawincrypt jwawindns jwawinefs jwawinerror jwawinfax jwawingdi jwawinioctl jwawinldap jwawinnetwk jwawinnls jwawinperf jwawinreg jwawinresrc jwawinsafer jwawinsock jwawinsock2 jwawinsvc jwawinuser jwawinver jwawinwlx jwawmistr jwawownt16 jwawownt32 jwawpapimsg jwawpcrsmsg jwawpftpmsg jwawppstmsg jwawpspihlp jwawptypes jwawpwizmsg jwaws2atm jwaws2bth jwaws2dnet jwaws2spi jwaws2tcpip jwawshisotp jwawsnetbs jwawsnwlink jwawtsapi32 jwazmouse jwasensevts jwaadstlb jwanative jwawindows jwacarderr jwaactivex jwawindllnames jwawinternl jwawinsta jwavista -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_IMPLICITUNITS+=jwawintype jwawinbase jwawinnt jwalmerr jwalmmsg jwaaclui jwaadsdb jwalmerrlog jwalmjoin jwaauthz jwabits jwalmremutl jwalmrepl jwalmserver jwalmshare jwalmsname jwalmstats jwaaccctrl jwaaclapi jwacderr jwacpl jwaactiveds jwadbt jwadde jwaadserr jwaadshlp jwaadsnms jwaadsprop jwaadssts jwaadtgen jwaaf_irda jwaatalkwsh jwaauthif jwadlgs jwadssec jwabatclass jwaexcpt jwaime jwabits1_5 jwabitscfg jwabitsmsg jwablberr jwabluetoothapis jwabthdef jwabthsdpdef jwabugcodes jwalmat jwalmsvc jwacmnquery jwacolordlg jwalmuse jwamsi jwacplext jwacryptuiapi jwanb30 jwanetsh jwapbt jwapdh jwadhcpcsdk jwadhcpsapi jwadhcpssdk jwaprsht jwapsapi jwadsadmin jwadsclient jwadsgetdc jwadskquota jwadsquery jwadsrole jwaqos jwaqossp jwaerrorrep jwarpc jwasddl jwafaxdev jwafaxext jwafaxmmc jwafaxroute jwagpedit jwahherror jwahtmlguid jwahtmlhelp jwaiaccess jwaiadmext jwaicmpapi jwaiiscnfg jwaimagehlp jwalmdfs jwaimapierror jwasens jwasfc jwaioevent jwaipexport jwaiphlpapi jwaipifcons jwaipinfoid jwaiprtrmib jwaiptypes jwaisguids jwaissper16 jwalmaccess jwalmalert jwalmapibuf jwasnmp jwasspi jwalmaudit jwalmconfig jwalmcons jwawpapi jwawsipx jwawsrm jwalmuseflg jwalmwksta jwaloadperf jwalpmapi jwamciavi jwamprerror jwawsvns jwaimapi jwamsidefs jwamsiquery jwamstask jwamstcpip jwamswsock jwanspapi jwantddpar jwantdsapi jwantdsbcli jwantdsbmsg jwantldap jwantquery jwantsecapi jwantstatus jwaobjsel jwapatchapi jwapatchwiz jwapdhmsg jwapowrprof jwaprofinfo jwaprotocol jwaqosname jwaqospol jwareason jwaregstr jwarpcasync jwarpcdce jwarpcnsi jwarpcnterr jwarpcssl jwascesvc jwaschedule jwaschemadef jwasecext jwasecurity jwasensapi jwashlguid jwasisbkup jwasporder jwasrrestoreptapi jwasubauth jwasvcguid jwatlhelp32 jwatmschema jwatraffic jwauserenv jwauxtheme jwawbemcli jwawinable jwawinber jwawincon jwawincpl jwawincred jwawincrypt jwawindns jwawinefs jwawinerror jwawinfax jwawingdi jwawinioctl jwawinldap jwawinnetwk jwawinnls jwawinperf jwawinreg jwawinresrc jwawinsafer jwawinsock jwawinsock2 jwawinsvc jwawinuser jwawinver jwawinwlx jwawmistr jwawownt16 jwawownt32 jwawpapimsg jwawpcrsmsg jwawpftpmsg jwawppstmsg jwawpspihlp jwawptypes jwawpwizmsg jwaws2atm jwaws2bth jwaws2dnet jwaws2spi jwaws2tcpip jwawshisotp jwawsnetbs jwawsnwlink jwawtsapi32 jwazmouse jwasensevts jwaadstlb jwanative jwawindows jwacarderr jwaactivex jwawindllnames jwawinternl jwawinsta jwavista endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_IMPLICITUNITS+=jwawintype jwawinbase jwawinnt jwalmerr jwalmmsg jwaaclui jwaadsdb jwalmerrlog jwalmjoin jwaauthz jwabits jwalmremutl jwalmrepl jwalmserver jwalmshare jwalmsname jwalmstats jwaaccctrl jwaaclapi jwacderr jwacpl jwaactiveds jwadbt jwadde jwaadserr jwaadshlp jwaadsnms jwaadsprop jwaadssts jwaadtgen jwaaf_irda jwaatalkwsh jwaauthif jwadlgs jwadssec jwabatclass jwaexcpt jwaime jwabits1_5 jwabitscfg jwabitsmsg jwablberr jwabluetoothapis jwabthdef jwabthsdpdef jwabugcodes jwalmat jwalmsvc jwacmnquery jwacolordlg jwalmuse jwamsi jwacplext jwacryptuiapi jwanb30 jwanetsh jwapbt jwapdh jwadhcpcsdk jwadhcpsapi jwadhcpssdk jwaprsht jwapsapi jwadsadmin jwadsclient jwadsgetdc jwadskquota jwadsquery jwadsrole jwaqos jwaqossp jwaerrorrep jwarpc jwasddl jwafaxdev jwafaxext jwafaxmmc jwafaxroute jwagpedit jwahherror jwahtmlguid jwahtmlhelp jwaiaccess jwaiadmext jwaicmpapi jwaiiscnfg jwaimagehlp jwalmdfs jwaimapierror jwasens jwasfc jwaioevent jwaipexport jwaiphlpapi jwaipifcons jwaipinfoid jwaiprtrmib jwaiptypes jwaisguids jwaissper16 jwalmaccess jwalmalert jwalmapibuf jwasnmp jwasspi jwalmaudit jwalmconfig jwalmcons jwawpapi jwawsipx jwawsrm jwalmuseflg jwalmwksta jwaloadperf jwalpmapi jwamciavi jwamprerror jwawsvns jwaimapi jwamsidefs jwamsiquery jwamstask jwamstcpip jwamswsock jwanspapi jwantddpar jwantdsapi jwantdsbcli jwantdsbmsg jwantldap jwantquery jwantsecapi jwantstatus jwaobjsel jwapatchapi jwapatchwiz jwapdhmsg jwapowrprof jwaprofinfo jwaprotocol jwaqosname jwaqospol jwareason jwaregstr jwarpcasync jwarpcdce jwarpcnsi jwarpcnterr jwarpcssl jwascesvc jwaschedule jwaschemadef jwasecext jwasecurity jwasensapi jwashlguid jwasisbkup jwasporder jwasrrestoreptapi jwasubauth jwasvcguid jwatlhelp32 jwatmschema jwatraffic jwauserenv jwauxtheme jwawbemcli jwawinable jwawinber jwawincon jwawincpl jwawincred jwawincrypt jwawindns jwawinefs jwawinerror jwawinfax jwawingdi jwawinioctl jwawinldap jwawinnetwk jwawinnls jwawinperf jwawinreg jwawinresrc jwawinsafer jwawinsock jwawinsock2 jwawinsvc jwawinuser jwawinver jwawinwlx jwawmistr jwawownt16 jwawownt32 jwawpapimsg jwawpcrsmsg jwawpftpmsg jwawppstmsg jwawpspihlp jwawptypes jwawpwizmsg jwaws2atm jwaws2bth jwaws2dnet jwaws2spi jwaws2tcpip jwawshisotp jwawsnetbs jwawsnwlink jwawtsapi32 jwazmouse jwasensevts jwaadstlb jwanative jwawindows jwacarderr jwaactivex jwawindllnames jwawinternl jwawinsta jwavista endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_IMPLICITUNITS+=jwawintype jwawinbase jwawinnt jwalmerr jwalmmsg jwaaclui jwaadsdb jwalmerrlog jwalmjoin jwaauthz jwabits jwalmremutl jwalmrepl jwalmserver jwalmshare jwalmsname jwalmstats jwaaccctrl jwaaclapi jwacderr jwacpl jwaactiveds jwadbt jwadde jwaadserr jwaadshlp jwaadsnms jwaadsprop jwaadssts jwaadtgen jwaaf_irda jwaatalkwsh jwaauthif jwadlgs jwadssec jwabatclass jwaexcpt jwaime jwabits1_5 jwabitscfg jwabitsmsg jwablberr jwabluetoothapis jwabthdef jwabthsdpdef jwabugcodes jwalmat jwalmsvc jwacmnquery jwacolordlg jwalmuse jwamsi jwacplext jwacryptuiapi jwanb30 jwanetsh jwapbt jwapdh jwadhcpcsdk jwadhcpsapi jwadhcpssdk jwaprsht jwapsapi jwadsadmin jwadsclient jwadsgetdc jwadskquota jwadsquery jwadsrole jwaqos jwaqossp jwaerrorrep jwarpc jwasddl jwafaxdev jwafaxext jwafaxmmc jwafaxroute jwagpedit jwahherror jwahtmlguid jwahtmlhelp jwaiaccess jwaiadmext jwaicmpapi jwaiiscnfg jwaimagehlp jwalmdfs jwaimapierror jwasens jwasfc jwaioevent jwaipexport jwaiphlpapi jwaipifcons jwaipinfoid jwaiprtrmib jwaiptypes jwaisguids jwaissper16 jwalmaccess jwalmalert jwalmapibuf jwasnmp jwasspi jwalmaudit jwalmconfig jwalmcons jwawpapi jwawsipx jwawsrm jwalmuseflg jwalmwksta jwaloadperf jwalpmapi jwamciavi jwamprerror jwawsvns jwaimapi jwamsidefs jwamsiquery jwamstask jwamstcpip jwamswsock jwanspapi jwantddpar jwantdsapi jwantdsbcli jwantdsbmsg jwantldap jwantquery jwantsecapi jwantstatus jwaobjsel jwapatchapi jwapatchwiz jwapdhmsg jwapowrprof jwaprofinfo jwaprotocol jwaqosname jwaqospol jwareason jwaregstr jwarpcasync jwarpcdce jwarpcnsi jwarpcnterr jwarpcssl jwascesvc jwaschedule jwaschemadef jwasecext jwasecurity jwasensapi jwashlguid jwasisbkup jwasporder jwasrrestoreptapi jwasubauth jwasvcguid jwatlhelp32 jwatmschema jwatraffic jwauserenv jwauxtheme jwawbemcli jwawinable jwawinber jwawincon jwawincpl jwawincred jwawincrypt jwawindns jwawinefs jwawinerror jwawinfax jwawingdi jwawinioctl jwawinldap jwawinnetwk jwawinnls jwawinperf jwawinreg jwawinresrc jwawinsafer jwawinsock jwawinsock2 jwawinsvc jwawinuser jwawinver jwawinwlx jwawmistr jwawownt16 jwawownt32 jwawpapimsg jwawpcrsmsg jwawpftpmsg jwawppstmsg jwawpspihlp jwawptypes jwawpwizmsg jwaws2atm jwaws2bth jwaws2dnet jwaws2spi jwaws2tcpip jwawshisotp jwawsnetbs jwawsnwlink jwawtsapi32 jwazmouse jwasensevts jwaadstlb jwanative jwawindows jwacarderr jwaactivex jwawindllnames jwawinternl jwawinsta jwavista -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_IMPLICITUNITS+=jwawintype jwawinbase jwawinnt jwalmerr jwalmmsg jwaaclui jwaadsdb jwalmerrlog jwalmjoin jwaauthz jwabits jwalmremutl jwalmrepl jwalmserver jwalmshare jwalmsname jwalmstats jwaaccctrl jwaaclapi jwacderr jwacpl jwaactiveds jwadbt jwadde jwaadserr jwaadshlp jwaadsnms jwaadsprop jwaadssts jwaadtgen jwaaf_irda jwaatalkwsh jwaauthif jwadlgs jwadssec jwabatclass jwaexcpt jwaime jwabits1_5 jwabitscfg jwabitsmsg jwablberr jwabluetoothapis jwabthdef jwabthsdpdef jwabugcodes jwalmat jwalmsvc jwacmnquery jwacolordlg jwalmuse jwamsi jwacplext jwacryptuiapi jwanb30 jwanetsh jwapbt jwapdh jwadhcpcsdk jwadhcpsapi jwadhcpssdk jwaprsht jwapsapi jwadsadmin jwadsclient jwadsgetdc jwadskquota jwadsquery jwadsrole jwaqos jwaqossp jwaerrorrep jwarpc jwasddl jwafaxdev jwafaxext jwafaxmmc jwafaxroute jwagpedit jwahherror jwahtmlguid jwahtmlhelp jwaiaccess jwaiadmext jwaicmpapi jwaiiscnfg jwaimagehlp jwalmdfs jwaimapierror jwasens jwasfc jwaioevent jwaipexport jwaiphlpapi jwaipifcons jwaipinfoid jwaiprtrmib jwaiptypes jwaisguids jwaissper16 jwalmaccess jwalmalert jwalmapibuf jwasnmp jwasspi jwalmaudit jwalmconfig jwalmcons jwawpapi jwawsipx jwawsrm jwalmuseflg jwalmwksta jwaloadperf jwalpmapi jwamciavi jwamprerror jwawsvns jwaimapi jwamsidefs jwamsiquery jwamstask jwamstcpip jwamswsock jwanspapi jwantddpar jwantdsapi jwantdsbcli jwantdsbmsg jwantldap jwantquery jwantsecapi jwantstatus jwaobjsel jwapatchapi jwapatchwiz jwapdhmsg jwapowrprof jwaprofinfo jwaprotocol jwaqosname jwaqospol jwareason jwaregstr jwarpcasync jwarpcdce jwarpcnsi jwarpcnterr jwarpcssl jwascesvc jwaschedule jwaschemadef jwasecext jwasecurity jwasensapi jwashlguid jwasisbkup jwasporder jwasrrestoreptapi jwasubauth jwasvcguid jwatlhelp32 jwatmschema jwatraffic jwauserenv jwauxtheme jwawbemcli jwawinable jwawinber jwawincon jwawincpl jwawincred jwawincrypt jwawindns jwawinefs jwawinerror jwawinfax jwawingdi jwawinioctl jwawinldap jwawinnetwk jwawinnls jwawinperf jwawinreg jwawinresrc jwawinsafer jwawinsock jwawinsock2 jwawinsvc jwawinuser jwawinver jwawinwlx jwawmistr jwawownt16 jwawownt32 jwawpapimsg jwawpcrsmsg jwawpftpmsg jwawppstmsg jwawpspihlp jwawptypes jwawpwizmsg jwaws2atm jwaws2bth jwaws2dnet jwaws2spi jwaws2tcpip jwawshisotp jwawsnetbs jwawsnwlink jwawtsapi32 jwazmouse jwasensevts jwaadstlb jwanative jwawindows jwacarderr jwaactivex jwawindllnames jwawinternl jwawinsta jwavista endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_IMPLICITUNITS+=jwawintype jwawinbase jwawinnt jwalmerr jwalmmsg jwaaclui jwaadsdb jwalmerrlog jwalmjoin jwaauthz jwabits jwalmremutl jwalmrepl jwalmserver jwalmshare jwalmsname jwalmstats jwaaccctrl jwaaclapi jwacderr jwacpl jwaactiveds jwadbt jwadde jwaadserr jwaadshlp jwaadsnms jwaadsprop jwaadssts jwaadtgen jwaaf_irda jwaatalkwsh jwaauthif jwadlgs jwadssec jwabatclass jwaexcpt jwaime jwabits1_5 jwabitscfg jwabitsmsg jwablberr jwabluetoothapis jwabthdef jwabthsdpdef jwabugcodes jwalmat jwalmsvc jwacmnquery jwacolordlg jwalmuse jwamsi jwacplext jwacryptuiapi jwanb30 jwanetsh jwapbt jwapdh jwadhcpcsdk jwadhcpsapi jwadhcpssdk jwaprsht jwapsapi jwadsadmin jwadsclient jwadsgetdc jwadskquota jwadsquery jwadsrole jwaqos jwaqossp jwaerrorrep jwarpc jwasddl jwafaxdev jwafaxext jwafaxmmc jwafaxroute jwagpedit jwahherror jwahtmlguid jwahtmlhelp jwaiaccess jwaiadmext jwaicmpapi jwaiiscnfg jwaimagehlp jwalmdfs jwaimapierror jwasens jwasfc jwaioevent jwaipexport jwaiphlpapi jwaipifcons jwaipinfoid jwaiprtrmib jwaiptypes jwaisguids jwaissper16 jwalmaccess jwalmalert jwalmapibuf jwasnmp jwasspi jwalmaudit jwalmconfig jwalmcons jwawpapi jwawsipx jwawsrm jwalmuseflg jwalmwksta jwaloadperf jwalpmapi jwamciavi jwamprerror jwawsvns jwaimapi jwamsidefs jwamsiquery jwamstask jwamstcpip jwamswsock jwanspapi jwantddpar jwantdsapi jwantdsbcli jwantdsbmsg jwantldap jwantquery jwantsecapi jwantstatus jwaobjsel jwapatchapi jwapatchwiz jwapdhmsg jwapowrprof jwaprofinfo jwaprotocol jwaqosname jwaqospol jwareason jwaregstr jwarpcasync jwarpcdce jwarpcnsi jwarpcnterr jwarpcssl jwascesvc jwaschedule jwaschemadef jwasecext jwasecurity jwasensapi jwashlguid jwasisbkup jwasporder jwasrrestoreptapi jwasubauth jwasvcguid jwatlhelp32 jwatmschema jwatraffic jwauserenv jwauxtheme jwawbemcli jwawinable jwawinber jwawincon jwawincpl jwawincred jwawincrypt jwawindns jwawinefs jwawinerror jwawinfax jwawingdi jwawinioctl jwawinldap jwawinnetwk jwawinnls jwawinperf jwawinreg jwawinresrc jwawinsafer jwawinsock jwawinsock2 jwawinsvc jwawinuser jwawinver jwawinwlx jwawmistr jwawownt16 jwawownt32 jwawpapimsg jwawpcrsmsg jwawpftpmsg jwawppstmsg jwawpspihlp jwawptypes jwawpwizmsg jwaws2atm jwaws2bth jwaws2dnet jwaws2spi jwaws2tcpip jwawshisotp jwawsnetbs jwawsnwlink jwawtsapi32 jwazmouse jwasensevts jwaadstlb jwanative jwawindows jwacarderr jwaactivex jwawindllnames jwawinternl jwawinsta jwavista -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_IMPLICITUNITS+=jwawintype jwawinbase jwawinnt jwalmerr jwalmmsg jwaaclui jwaadsdb jwalmerrlog jwalmjoin jwaauthz jwabits jwalmremutl jwalmrepl jwalmserver jwalmshare jwalmsname jwalmstats jwaaccctrl jwaaclapi jwacderr jwacpl jwaactiveds jwadbt jwadde jwaadserr jwaadshlp jwaadsnms jwaadsprop jwaadssts jwaadtgen jwaaf_irda jwaatalkwsh jwaauthif jwadlgs jwadssec jwabatclass jwaexcpt jwaime jwabits1_5 jwabitscfg jwabitsmsg jwablberr jwabluetoothapis jwabthdef jwabthsdpdef jwabugcodes jwalmat jwalmsvc jwacmnquery jwacolordlg jwalmuse jwamsi jwacplext jwacryptuiapi jwanb30 jwanetsh jwapbt jwapdh jwadhcpcsdk jwadhcpsapi jwadhcpssdk jwaprsht jwapsapi jwadsadmin jwadsclient jwadsgetdc jwadskquota jwadsquery jwadsrole jwaqos jwaqossp jwaerrorrep jwarpc jwasddl jwafaxdev jwafaxext jwafaxmmc jwafaxroute jwagpedit jwahherror jwahtmlguid jwahtmlhelp jwaiaccess jwaiadmext jwaicmpapi jwaiiscnfg jwaimagehlp jwalmdfs jwaimapierror jwasens jwasfc jwaioevent jwaipexport jwaiphlpapi jwaipifcons jwaipinfoid jwaiprtrmib jwaiptypes jwaisguids jwaissper16 jwalmaccess jwalmalert jwalmapibuf jwasnmp jwasspi jwalmaudit jwalmconfig jwalmcons jwawpapi jwawsipx jwawsrm jwalmuseflg jwalmwksta jwaloadperf jwalpmapi jwamciavi jwamprerror jwawsvns jwaimapi jwamsidefs jwamsiquery jwamstask jwamstcpip jwamswsock jwanspapi jwantddpar jwantdsapi jwantdsbcli jwantdsbmsg jwantldap jwantquery jwantsecapi jwantstatus jwaobjsel jwapatchapi jwapatchwiz jwapdhmsg jwapowrprof jwaprofinfo jwaprotocol jwaqosname jwaqospol jwareason jwaregstr jwarpcasync jwarpcdce jwarpcnsi jwarpcnterr jwarpcssl jwascesvc jwaschedule jwaschemadef jwasecext jwasecurity jwasensapi jwashlguid jwasisbkup jwasporder jwasrrestoreptapi jwasubauth jwasvcguid jwatlhelp32 jwatmschema jwatraffic jwauserenv jwauxtheme jwawbemcli jwawinable jwawinber jwawincon jwawincpl jwawincred jwawincrypt jwawindns jwawinefs jwawinerror jwawinfax jwawingdi jwawinioctl jwawinldap jwawinnetwk jwawinnls jwawinperf jwawinreg jwawinresrc jwawinsafer jwawinsock jwawinsock2 jwawinsvc jwawinuser jwawinver jwawinwlx jwawmistr jwawownt16 jwawownt32 jwawpapimsg jwawpcrsmsg jwawpftpmsg jwawppstmsg jwawpspihlp jwawptypes jwawpwizmsg jwaws2atm jwaws2bth jwaws2dnet jwaws2spi jwaws2tcpip jwawshisotp jwawsnetbs jwawsnwlink jwawtsapi32 jwazmouse jwasensevts jwaadstlb jwanative jwawindows jwacarderr jwaactivex jwawindllnames jwawinternl jwawinsta jwavista -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_IMPLICITUNITS+=jwawintype jwawinbase jwawinnt jwalmerr jwalmmsg jwaaclui jwaadsdb jwalmerrlog jwalmjoin jwaauthz jwabits jwalmremutl jwalmrepl jwalmserver jwalmshare jwalmsname jwalmstats jwaaccctrl jwaaclapi jwacderr jwacpl jwaactiveds jwadbt jwadde jwaadserr jwaadshlp jwaadsnms jwaadsprop jwaadssts jwaadtgen jwaaf_irda jwaatalkwsh jwaauthif jwadlgs jwadssec jwabatclass jwaexcpt jwaime jwabits1_5 jwabitscfg jwabitsmsg jwablberr jwabluetoothapis jwabthdef jwabthsdpdef jwabugcodes jwalmat jwalmsvc jwacmnquery jwacolordlg jwalmuse jwamsi jwacplext jwacryptuiapi jwanb30 jwanetsh jwapbt jwapdh jwadhcpcsdk jwadhcpsapi jwadhcpssdk jwaprsht jwapsapi jwadsadmin jwadsclient jwadsgetdc jwadskquota jwadsquery jwadsrole jwaqos jwaqossp jwaerrorrep jwarpc jwasddl jwafaxdev jwafaxext jwafaxmmc jwafaxroute jwagpedit jwahherror jwahtmlguid jwahtmlhelp jwaiaccess jwaiadmext jwaicmpapi jwaiiscnfg jwaimagehlp jwalmdfs jwaimapierror jwasens jwasfc jwaioevent jwaipexport jwaiphlpapi jwaipifcons jwaipinfoid jwaiprtrmib jwaiptypes jwaisguids jwaissper16 jwalmaccess jwalmalert jwalmapibuf jwasnmp jwasspi jwalmaudit jwalmconfig jwalmcons jwawpapi jwawsipx jwawsrm jwalmuseflg jwalmwksta jwaloadperf jwalpmapi jwamciavi jwamprerror jwawsvns jwaimapi jwamsidefs jwamsiquery jwamstask jwamstcpip jwamswsock jwanspapi jwantddpar jwantdsapi jwantdsbcli jwantdsbmsg jwantldap jwantquery jwantsecapi jwantstatus jwaobjsel jwapatchapi jwapatchwiz jwapdhmsg jwapowrprof jwaprofinfo jwaprotocol jwaqosname jwaqospol jwareason jwaregstr jwarpcasync jwarpcdce jwarpcnsi jwarpcnterr jwarpcssl jwascesvc jwaschedule jwaschemadef jwasecext jwasecurity jwasensapi jwashlguid jwasisbkup jwasporder jwasrrestoreptapi jwasubauth jwasvcguid jwatlhelp32 jwatmschema jwatraffic jwauserenv jwauxtheme jwawbemcli jwawinable jwawinber jwawincon jwawincpl jwawincred jwawincrypt jwawindns jwawinefs jwawinerror jwawinfax jwawingdi jwawinioctl jwawinldap jwawinnetwk jwawinnls jwawinperf jwawinreg jwawinresrc jwawinsafer jwawinsock jwawinsock2 jwawinsvc jwawinuser jwawinver jwawinwlx jwawmistr jwawownt16 jwawownt32 jwawpapimsg jwawpcrsmsg jwawpftpmsg jwawppstmsg jwawpspihlp jwawptypes jwawpwizmsg jwaws2atm jwaws2bth jwaws2dnet jwaws2spi jwaws2tcpip jwawshisotp jwawsnetbs jwawsnwlink jwawtsapi32 jwazmouse jwasensevts jwaadstlb jwanative jwawindows jwacarderr jwaactivex jwawindllnames jwawinternl jwawinsta jwavista -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=jwawintype endif @@ -626,9 +556,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=jwawintype endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=jwawintype -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=jwawintype endif @@ -731,9 +658,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=jwawintype endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=jwawintype -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=jwawintype endif @@ -746,9 +670,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=jwawintype endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=jwawintype -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=jwawintype endif @@ -767,21 +688,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=jwawintype endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=jwawintype -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=jwawintype endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=jwawintype -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=jwawintype -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=jwawintype -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=examples endif @@ -800,9 +709,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLES+=examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLES+=examples endif @@ -905,9 +811,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLES+=examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLES+=examples endif @@ -920,9 +823,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLES+=examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=examples -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLES+=examples endif @@ -941,21 +841,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLES+=examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLES+=examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=examples -endif override INSTALL_BUILDUNIT=buildjwa override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) @@ -976,9 +864,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-Ur endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-Ur -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-Ur endif @@ -1081,9 +966,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-Ur endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-Ur -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-Ur endif @@ -1096,9 +978,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-Ur endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-Ur -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-Ur endif @@ -1117,21 +996,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-Ur endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-Ur -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-Ur endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-Ur -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-Ur -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-Ur -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src endif @@ -1150,9 +1017,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -1255,9 +1119,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -1270,9 +1131,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -1291,21 +1149,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITDIR+=units endif @@ -1324,9 +1170,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_UNITDIR+=units endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_UNITDIR+=units -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_UNITDIR+=units endif @@ -1429,9 +1272,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_UNITDIR+=units endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_UNITDIR+=units -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_UNITDIR+=units endif @@ -1444,9 +1284,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_UNITDIR+=units endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_UNITDIR+=units -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_UNITDIR+=units endif @@ -1465,21 +1302,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITDIR+=units endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_UNITDIR+=units -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_UNITDIR+=units endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_UNITDIR+=units -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_UNITDIR+=units -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_UNITDIR+=units -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -1498,9 +1323,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src endif @@ -1603,9 +1425,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src endif @@ -1618,9 +1437,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src endif @@ -1639,21 +1455,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1943,11 +1747,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -2426,9 +2225,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -2531,9 +2327,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_WINUNITS-BASE=1 @@ -2547,9 +2340,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -2568,21 +2358,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2636,20 +2414,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2781,15 +2559,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -3030,12 +2804,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/mysql/Makefile +++ fpc-2.2.2/fpcsrc/packages/mysql/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=my4_sys mysql4_com mysql4_version mysql4 mysql4dyn mysql4_comdyn mysql3_com mysql3_version mysql3 mysql3_comdyn mysql3dyn mysql40 mysql40dyn mysql41 mysql41dyn mysql50 mysql50dyn endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=my4_sys mysql4_com mysql4_version mysql4 mysql4dyn mysql4_comdyn mysql3_com mysql3_version mysql3 mysql3_comdyn mysql3dyn mysql40 mysql40dyn mysql41 mysql41dyn mysql50 mysql50dyn -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=my4_sys mysql4_com mysql4_version mysql4 mysql4dyn mysql4_comdyn mysql3_com mysql3_version mysql3 mysql3_comdyn mysql3dyn mysql40 mysql40dyn mysql41 mysql41dyn mysql50 mysql50dyn endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=my4_sys mysql4_com mysql4_version mysql4 mysql4dyn mysql4_comdyn mysql3_com mysql3_version mysql3 mysql3_comdyn mysql3dyn mysql40 mysql40dyn mysql41 mysql41dyn mysql50 mysql50dyn endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=my4_sys mysql4_com mysql4_version mysql4 mysql4dyn mysql4_comdyn mysql3_com mysql3_version mysql3 mysql3_comdyn mysql3dyn mysql40 mysql40dyn mysql41 mysql41dyn mysql50 mysql50dyn -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=my4_sys mysql4_com mysql4_version mysql4 mysql4dyn mysql4_comdyn mysql3_com mysql3_version mysql3 mysql3_comdyn mysql3dyn mysql40 mysql40dyn mysql41 mysql41dyn mysql50 mysql50dyn endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=my4_sys mysql4_com mysql4_version mysql4 mysql4dyn mysql4_comdyn mysql3_com mysql3_version mysql3 mysql3_comdyn mysql3dyn mysql40 mysql40dyn mysql41 mysql41dyn mysql50 mysql50dyn endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=my4_sys mysql4_com mysql4_version mysql4 mysql4dyn mysql4_comdyn mysql3_com mysql3_version mysql3 mysql3_comdyn mysql3dyn mysql40 mysql40dyn mysql41 mysql41dyn mysql50 mysql50dyn -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=my4_sys mysql4_com mysql4_version mysql4 mysql4dyn mysql4_comdyn mysql3_com mysql3_version mysql3 mysql3_comdyn mysql3dyn mysql40 mysql40dyn mysql41 mysql41dyn mysql50 mysql50dyn endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=my4_sys mysql4_com mysql4_version mysql4 mysql4dyn mysql4_comdyn mysql3_com mysql3_version mysql3 mysql3_comdyn mysql3dyn mysql40 mysql40dyn mysql41 mysql41dyn mysql50 mysql50dyn endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=my4_sys mysql4_com mysql4_version mysql4 mysql4dyn mysql4_comdyn mysql3_com mysql3_version mysql3 mysql3_comdyn mysql3dyn mysql40 mysql40dyn mysql41 mysql41dyn mysql50 mysql50dyn -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=my4_sys mysql4_com mysql4_version mysql4 mysql4dyn mysql4_comdyn mysql3_com mysql3_version mysql3 mysql3_comdyn mysql3dyn mysql40 mysql40dyn mysql41 mysql41dyn mysql50 mysql50dyn endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=my4_sys mysql4_com mysql4_version mysql4 mysql4dyn mysql4_comdyn mysql3_com mysql3_version mysql3 mysql3_comdyn mysql3dyn mysql40 mysql40dyn mysql41 mysql41dyn mysql50 mysql50dyn -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=my4_sys mysql4_com mysql4_version mysql4 mysql4dyn mysql4_comdyn mysql3_com mysql3_version mysql3 mysql3_comdyn mysql3dyn mysql40 mysql40dyn mysql41 mysql41dyn mysql50 mysql50dyn -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=my4_sys mysql4_com mysql4_version mysql4 mysql4dyn mysql4_comdyn mysql3_com mysql3_version mysql3 mysql3_comdyn mysql3dyn mysql40 mysql40dyn mysql41 mysql41dyn mysql50 mysql50dyn -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=testdb4 testdb3 endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLES+=testdb4 testdb3 endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=testdb4 testdb3 -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLES+=testdb4 testdb3 endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLES+=testdb4 testdb3 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=testdb4 testdb3 -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLES+=testdb4 testdb3 endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLES+=testdb4 testdb3 endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=testdb4 testdb3 -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLES+=testdb4 testdb3 endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLES+=testdb4 testdb3 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=testdb4 testdb3 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLES+=testdb4 testdb3 endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=testdb4 testdb3 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=testdb4 testdb3 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=testdb4 testdb3 -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1279,11 +1167,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1761,9 +1644,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1866,9 +1746,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1881,9 +1758,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1902,21 +1776,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1944,20 +1806,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2095,15 +1957,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2344,12 +2202,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/httpd22/Makefile +++ fpc-2.2.2/fpcsrc/packages/httpd22/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=apr apriconv aprutil httpd endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=apr apriconv aprutil httpd -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=apr apriconv aprutil httpd endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=apr apriconv aprutil httpd endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=apr apriconv aprutil httpd -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=apr apriconv aprutil httpd endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=apr apriconv aprutil httpd endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=apr apriconv aprutil httpd -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=apr apriconv aprutil httpd endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=apr apriconv aprutil httpd endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=apr apriconv aprutil httpd -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=apr apriconv aprutil httpd endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=apr apriconv aprutil httpd -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=apr apriconv aprutil httpd -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=apr apriconv aprutil httpd -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLEDIRS+=examples endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLEDIRS+=examples endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLEDIRS+=examples endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1277,11 +1165,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1759,9 +1642,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1864,9 +1744,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1879,9 +1756,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1900,21 +1774,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1942,20 +1804,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2093,15 +1955,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2342,12 +2200,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) @@ -2552,9 +2406,6 @@ ifeq ($(FULL_TARGET),i386-beos) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2657,9 +2508,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2672,9 +2520,6 @@ ifeq ($(FULL_TARGET),arm-palmos) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),arm-wince) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2693,21 +2538,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all --- fpc-2.2.2.orig/fpcsrc/packages/httpd22/examples/Makefile +++ fpc-2.2.2/fpcsrc/packages/httpd22/examples/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -276,9 +248,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule endif @@ -381,9 +350,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule endif @@ -396,9 +362,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule endif @@ -417,21 +380,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_UNITS+=minimain endif @@ -450,9 +401,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=minimain endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=minimain -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=minimain endif @@ -555,9 +503,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=minimain endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=minimain -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=minimain endif @@ -570,9 +515,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=minimain endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=minimain -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=minimain endif @@ -591,21 +533,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=minimain endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=minimain -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=minimain endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=minimain -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=minimain -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=minimain -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -927,11 +857,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1415,10 +1340,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HTTPD22=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HTTPD22=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HTTPD22=1 @@ -1555,10 +1476,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HTTPD22=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HTTPD22=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HTTPD22=1 @@ -1575,10 +1492,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HTTPD22=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HTTPD22=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HTTPD22=1 @@ -1603,26 +1516,10 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HTTPD22=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HTTPD22=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HTTPD22=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HTTPD22=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HTTPD22=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HTTPD22=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1676,20 +1573,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1827,15 +1724,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/packages/fcl-registry/Makefile +++ fpc-2.2.2/fpcsrc/packages/fcl-registry/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=xmlreg registry endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=xmlreg registry -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=xmlreg registry endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=xmlreg registry endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=xmlreg registry -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=xmlreg registry endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=xmlreg registry endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=xmlreg registry -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=xmlreg registry endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=xmlreg registry endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=xmlreg registry -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=xmlreg registry endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=xmlreg registry -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=xmlreg registry -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=xmlreg registry -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-S2h endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-S2h endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-S2h endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1072,11 +981,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1568,11 +1472,6 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1743,11 +1642,6 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_WINUNITS-BASE=1 @@ -1770,11 +1664,6 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1805,31 +1694,11 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1961,20 +1830,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2106,15 +1975,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2337,12 +2202,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/regexpr/Makefile +++ fpc-2.2.2/fpcsrc/packages/regexpr/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=regex regexpr endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=regex regexpr -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=regex regexpr endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=regex regexpr endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=regex regexpr -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=regex regexpr endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=regex regexpr endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=regex regexpr -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=regex regexpr endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=regex regexpr endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=regex regexpr -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=regex regexpr endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=regex regexpr -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=regex regexpr -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=regex regexpr -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=testreg1 endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLES+=testreg1 endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=testreg1 -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLES+=testreg1 endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLES+=testreg1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=testreg1 -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLES+=testreg1 endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLES+=testreg1 endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=testreg1 -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLES+=testreg1 endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLES+=testreg1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=testreg1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLES+=testreg1 endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=testreg1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=testreg1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=testreg1 -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2 @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-S2 endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-S2 endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-S2 endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-S2 endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2 -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -975,9 +863,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests examples endif @@ -1080,9 +965,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests examples endif @@ -1095,9 +977,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests examples endif @@ -1116,21 +995,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1420,11 +1287,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1902,9 +1764,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -2007,9 +1866,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -2022,9 +1878,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -2043,21 +1896,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2085,20 +1926,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2230,15 +2071,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2479,12 +2316,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/fcl-process/Makefile +++ fpc-2.2.2/fpcsrc/packages/fcl-process/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=pipes process simpleipc dbugmsg dbugintf endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=pipes process -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=pipes process simpleipc dbugmsg dbugintf endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=pipes process simpleipc dbugmsg dbugintf endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=pipes process simpleipc dbugmsg dbugintf -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=pipes process simpleipc dbugmsg dbugintf endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=pipes process endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=pipes process simpleipc dbugmsg dbugintf -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=pipes process simpleipc dbugmsg dbugintf endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=pipes process simpleipc dbugmsg dbugintf endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=pipes process simpleipc dbugmsg dbugintf -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=pipes process endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=pipes process -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=pipes process simpleipc dbugmsg dbugintf -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=pipes process -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=process simpleipc endif @@ -506,30 +457,18 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=process simpleipc endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=process simpleipc -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=simpleipc endif ifeq ($(FULL_TARGET),arm-linux) override TARGET_RSTS+=process simpleipc endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=process simpleipc -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=simpleipc endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=process simpleipc endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=process simpleipc -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=process simpleipc -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -549,9 +488,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-S2h endif @@ -654,9 +590,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-S2h endif @@ -669,9 +602,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-S2h endif @@ -690,21 +620,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix endif @@ -723,9 +641,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix endif @@ -828,9 +743,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/win endif @@ -843,9 +755,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/win endif @@ -864,21 +773,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif @@ -897,9 +794,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif @@ -1002,9 +896,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif @@ -1017,9 +908,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif @@ -1038,21 +926,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1342,11 +1218,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1824,9 +1695,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1929,9 +1797,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1944,9 +1809,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1965,21 +1827,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2007,20 +1857,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2152,15 +2002,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2383,12 +2229,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/dts/Makefile +++ fpc-2.2.2/fpcsrc/packages/dts/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=dts endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=dts -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=dts endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=dts endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=dts -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=dts endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=dts endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=dts -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=dts endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=dts endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=dts -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=dts endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=dts -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1072,11 +981,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1554,9 +1458,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1659,9 +1560,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1674,9 +1572,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1695,21 +1590,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1737,20 +1620,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1882,15 +1765,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2113,12 +1992,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/winceunits/Makefile +++ fpc-2.2.2/fpcsrc/packages/winceunits/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -295,9 +267,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-Ur endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-Ur -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-Ur endif @@ -400,9 +369,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-Ur endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-Ur -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-Ur endif @@ -415,9 +381,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-Ur endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-Ur -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-Ur endif @@ -436,21 +399,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-Ur endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-Ur -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-Ur endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-Ur -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-Ur -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-Ur -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -469,9 +420,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src endif @@ -574,9 +522,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src endif @@ -589,9 +534,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src endif @@ -610,21 +552,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -914,11 +844,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1396,9 +1321,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1501,9 +1423,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1516,9 +1435,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1537,21 +1453,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1579,20 +1483,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1724,15 +1628,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -1955,12 +1855,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/httpd13/Makefile +++ fpc-2.2.2/fpcsrc/packages/httpd13/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=httpd endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=httpd -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=httpd endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=httpd endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=httpd -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=httpd endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=httpd endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=httpd -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=httpd endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=httpd endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=httpd -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=httpd endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=httpd -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=httpd -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=httpd -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1103,11 +1012,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1585,9 +1489,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1690,9 +1591,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1705,9 +1603,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1726,21 +1621,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1768,20 +1651,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1919,15 +1802,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2150,12 +2029,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/lua/Makefile +++ fpc-2.2.2/fpcsrc/packages/lua/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=lua lualib lauxlib endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=lua lualib lauxlib -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=lua lualib lauxlib endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=lua lualib lauxlib endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=lua lualib lauxlib -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=lua lualib lauxlib endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=lua lualib lauxlib endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=lua lualib lauxlib -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=lua lualib lauxlib endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=lua lualib lauxlib endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=lua lualib lauxlib -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=lua lualib lauxlib endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=lua lualib lauxlib -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=lua lualib lauxlib -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=lua lualib lauxlib -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1074,11 +983,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1556,9 +1460,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1661,9 +1562,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1676,9 +1574,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1697,21 +1592,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1739,20 +1622,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1884,15 +1767,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2115,12 +1994,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/uuid/Makefile +++ fpc-2.2.2/fpcsrc/packages/uuid/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=macuuid libuuid endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=macuuid libuuid -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=macuuid libuuid endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=macuuid libuuid endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=macuuid libuuid -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=macuuid libuuid endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=macuuid libuuid endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=macuuid libuuid -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=macuuid libuuid endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=macuuid libuuid endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=macuuid libuuid -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=macuuid libuuid endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=macuuid libuuid -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=macuuid libuuid -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=macuuid libuuid -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=testuid testlibuid endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLES+=testuid testlibuid endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=testuid testlibuid -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLES+=testuid testlibuid endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLES+=testuid testlibuid endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=testuid testlibuid -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLES+=testuid testlibuid endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLES+=testuid testlibuid endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=testuid testlibuid -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLES+=testuid testlibuid endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLES+=testuid testlibuid endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=testuid testlibuid -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLES+=testuid testlibuid endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=testuid testlibuid -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=testuid testlibuid -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=testuid testlibuid -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITDIR+=units/$(OS_TARGET) endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_UNITDIR+=units/$(OS_TARGET) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_UNITDIR+=units/$(OS_TARGET) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_UNITDIR+=units/$(OS_TARGET) endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_UNITDIR+=units/$(OS_TARGET) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_UNITDIR+=units/$(OS_TARGET) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_UNITDIR+=units/$(OS_TARGET) endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_UNITDIR+=units/$(OS_TARGET) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_UNITDIR+=units/$(OS_TARGET) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_UNITDIR+=units/$(OS_TARGET) endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITDIR+=units/$(OS_TARGET) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_UNITDIR+=units/$(OS_TARGET) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_UNITDIR+=units/$(OS_TARGET) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_UNITDIR+=units/$(OS_TARGET) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_UNITDIR+=units/$(OS_TARGET) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_UNITDIR+=units/$(OS_TARGET) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -975,9 +863,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests examples endif @@ -1080,9 +965,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests examples endif @@ -1095,9 +977,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests examples endif @@ -1116,21 +995,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1420,11 +1287,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1902,9 +1764,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -2007,9 +1866,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -2022,9 +1878,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -2043,21 +1896,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2085,20 +1926,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2230,15 +2071,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2479,12 +2316,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/bfd/Makefile +++ fpc-2.2.2/fpcsrc/packages/bfd/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=bfd endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=bfd -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=bfd endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=bfd endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=bfd -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=bfd endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=bfd endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=bfd -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=bfd endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=bfd endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=bfd -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=bfd endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=bfd -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1074,11 +983,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1556,9 +1460,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1661,9 +1562,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1676,9 +1574,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1697,21 +1592,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1739,20 +1622,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1884,15 +1767,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2115,12 +1994,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/paszlib/Makefile +++ fpc-2.2.2/fpcsrc/packages/paszlib/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=paszlib zip unzip zipper endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=paszlib zip unzip zipper -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=paszlib zip unzip zipper endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=paszlib zip unzip zipper endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=paszlib zip unzip zipper -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=paszlib zip unzip zipper endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=paszlib zip unzip zipper endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=paszlib zip unzip zipper -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=paszlib zip unzip zipper endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=paszlib zip unzip zipper endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=paszlib zip unzip zipper -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=paszlib zip unzip zipper endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=paszlib zip unzip zipper -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=paszlib zip unzip zipper -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=paszlib zip unzip zipper -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=adler gzio infblock infcodes inffast inftrees infutil trees zcompres zdeflate zinflate zbase zuncompr ziputils zstream endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_IMPLICITUNITS+=adler gzio infblock infcodes inffast inftrees infutil trees zcompres zdeflate zinflate zbase zuncompr ziputils zstream endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_IMPLICITUNITS+=adler gzio infblock infcodes inffast inftrees infutil trees zcompres zdeflate zinflate zbase zuncompr ziputils zstream -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_IMPLICITUNITS+=adler gzio infblock infcodes inffast inftrees infutil trees zcompres zdeflate zinflate zbase zuncompr ziputils zstream endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_IMPLICITUNITS+=adler gzio infblock infcodes inffast inftrees infutil trees zcompres zdeflate zinflate zbase zuncompr ziputils zstream endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_IMPLICITUNITS+=adler gzio infblock infcodes inffast inftrees infutil trees zcompres zdeflate zinflate zbase zuncompr ziputils zstream -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_IMPLICITUNITS+=adler gzio infblock infcodes inffast inftrees infutil trees zcompres zdeflate zinflate zbase zuncompr ziputils zstream endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_IMPLICITUNITS+=adler gzio infblock infcodes inffast inftrees infutil trees zcompres zdeflate zinflate zbase zuncompr ziputils zstream endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_IMPLICITUNITS+=adler gzio infblock infcodes inffast inftrees infutil trees zcompres zdeflate zinflate zbase zuncompr ziputils zstream -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_IMPLICITUNITS+=adler gzio infblock infcodes inffast inftrees infutil trees zcompres zdeflate zinflate zbase zuncompr ziputils zstream endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_IMPLICITUNITS+=adler gzio infblock infcodes inffast inftrees infutil trees zcompres zdeflate zinflate zbase zuncompr ziputils zstream endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_IMPLICITUNITS+=adler gzio infblock infcodes inffast inftrees infutil trees zcompres zdeflate zinflate zbase zuncompr ziputils zstream -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_IMPLICITUNITS+=adler gzio infblock infcodes inffast inftrees infutil trees zcompres zdeflate zinflate zbase zuncompr ziputils zstream endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_IMPLICITUNITS+=adler gzio infblock infcodes inffast inftrees infutil trees zcompres zdeflate zinflate zbase zuncompr ziputils zstream -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_IMPLICITUNITS+=adler gzio infblock infcodes inffast inftrees infutil trees zcompres zdeflate zinflate zbase zuncompr ziputils zstream -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_IMPLICITUNITS+=adler gzio infblock infcodes inffast inftrees infutil trees zcompres zdeflate zinflate zbase zuncompr ziputils zstream -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -626,9 +556,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLEDIRS+=examples endif @@ -731,9 +658,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLEDIRS+=examples endif @@ -746,9 +670,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLEDIRS+=examples endif @@ -767,21 +688,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1246,11 +1134,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1734,10 +1617,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 @@ -1874,10 +1753,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 @@ -1894,10 +1769,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 @@ -1922,26 +1793,10 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1995,20 +1850,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2140,15 +1995,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2389,12 +2240,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) @@ -2599,9 +2446,6 @@ ifeq ($(FULL_TARGET),i386-beos) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2704,9 +2548,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2719,9 +2560,6 @@ ifeq ($(FULL_TARGET),arm-palmos) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),arm-wince) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2740,21 +2578,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all --- fpc-2.2.2.orig/fpcsrc/packages/paszlib/examples/Makefile +++ fpc-2.2.2/fpcsrc/packages/paszlib/examples/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -276,9 +248,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=minigzip example minizip miniunz endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=minigzip example minizip miniunz -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=minigzip example minizip miniunz endif @@ -381,9 +350,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=minigzip example minizip miniunz endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=minigzip example minizip miniunz -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=minigzip example minizip miniunz endif @@ -396,9 +362,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=minigzip example minizip miniunz endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=minigzip example minizip miniunz -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=minigzip example minizip miniunz endif @@ -417,21 +380,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=minigzip example minizip miniunz endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=minigzip example minizip miniunz -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=minigzip example minizip miniunz endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=minigzip example minizip miniunz -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=minigzip example minizip miniunz -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=minigzip example minizip miniunz -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -722,11 +673,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1216,11 +1162,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 @@ -1391,11 +1332,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 @@ -1416,11 +1352,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 @@ -1451,31 +1382,11 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1555,20 +1466,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1700,13 +1611,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/fpcsrc/packages/aspell/Makefile +++ fpc-2.2.2/fpcsrc/packages/aspell/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=aspell spellcheck endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=aspell spellcheck -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=aspell spellcheck endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=aspell spellcheck endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=aspell spellcheck -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=aspell spellcheck endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=aspell spellcheck endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=aspell spellcheck -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=aspell spellcheck endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=aspell spellcheck endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=aspell spellcheck -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=aspell spellcheck endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=aspell spellcheck -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=aspell spellcheck -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=aspell spellcheck -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1072,11 +981,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1554,9 +1458,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1659,9 +1560,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1674,9 +1572,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1695,21 +1590,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1737,20 +1620,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1882,15 +1765,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2113,12 +1992,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/fcl-passrc/Makefile +++ fpc-2.2.2/fpcsrc/packages/fcl-passrc/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=pastree pscanner pparser paswrite endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=pastree pscanner pparser paswrite -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=pastree pscanner pparser paswrite endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=pastree pscanner pparser paswrite endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=pastree pscanner pparser paswrite -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=pastree pscanner pparser paswrite endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=pastree pscanner pparser paswrite endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=pastree pscanner pparser paswrite -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=pastree pscanner pparser paswrite endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=pastree pscanner pparser paswrite endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=pastree pscanner pparser paswrite -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=pastree pscanner pparser paswrite endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=pastree pscanner pparser paswrite -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=pastree pscanner pparser paswrite -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=pastree pscanner pparser paswrite -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=pscanner pparser pastree endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=pscanner pparser pastree endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=pscanner pparser pastree -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=pscanner pparser pastree endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=pscanner pparser pastree endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=pscanner pparser pastree -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=pscanner pparser pastree endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=pscanner pparser pastree endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=pscanner pparser pastree -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=pscanner pparser pastree endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=pscanner pparser pastree endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=pscanner pparser pastree -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=pscanner pparser pastree endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=pscanner pparser pastree -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=pscanner pparser pastree -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=pscanner pparser pastree -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-S2h endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-S2h endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-S2h endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1246,11 +1134,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1728,9 +1611,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1833,9 +1713,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1848,9 +1725,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1869,21 +1743,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1911,20 +1773,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2056,15 +1918,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2287,12 +2145,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/users/Makefile +++ fpc-2.2.2/fpcsrc/packages/users/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=grp pwd users endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=grp pwd users -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=grp pwd users endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=grp pwd users endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=grp pwd users -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=grp pwd users endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=grp pwd users endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=grp pwd users -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=grp pwd users endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=grp pwd users shadow crypth endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=grp pwd users -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=grp pwd users endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=grp pwd users -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=grp pwd users shadow crypth -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=grp pwd users -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=testuser testpass2 testpass endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLES+=testuser testpass2 endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=testuser testpass2 -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLES+=testuser testpass2 endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLES+=testuser testpass2 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=testuser testpass2 -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLES+=testuser testpass2 endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLES+=testuser testpass2 endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=testuser testpass2 -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLES+=testuser testpass2 endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLES+=testuser testpass2 testpass endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=testuser testpass2 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLES+=testuser testpass2 endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=testuser testpass2 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=testuser testpass2 testpass -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=testuser testpass2 -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests examples endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests examples endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests examples endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1279,11 +1167,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1761,9 +1644,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1866,9 +1746,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1881,9 +1758,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1902,21 +1776,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1944,20 +1806,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2095,15 +1957,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2344,12 +2202,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/imagemagick/Makefile +++ fpc-2.2.2/fpcsrc/packages/imagemagick/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=buildim endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=buildim -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=buildim endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=buildim endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=buildim -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=buildim endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=buildim endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=buildim -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=buildim endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=buildim endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=buildim -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=buildim endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=buildim -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=buildim -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=buildim -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=magick_wand imagemagick endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_IMPLICITUNITS+=magick_wand imagemagick endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_IMPLICITUNITS+=magick_wand imagemagick -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_IMPLICITUNITS+=magick_wand imagemagick endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_IMPLICITUNITS+=magick_wand imagemagick endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_IMPLICITUNITS+=magick_wand imagemagick -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_IMPLICITUNITS+=magick_wand imagemagick endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_IMPLICITUNITS+=magick_wand imagemagick endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_IMPLICITUNITS+=magick_wand imagemagick -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_IMPLICITUNITS+=magick_wand imagemagick endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_IMPLICITUNITS+=magick_wand imagemagick endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_IMPLICITUNITS+=magick_wand imagemagick -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_IMPLICITUNITS+=magick_wand imagemagick endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_IMPLICITUNITS+=magick_wand imagemagick -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_IMPLICITUNITS+=magick_wand imagemagick -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_IMPLICITUNITS+=magick_wand imagemagick -endif override INSTALL_BUILDUNIT=buildgtk2 override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) @@ -628,9 +558,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -733,9 +660,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -748,9 +672,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -769,21 +690,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -802,9 +711,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -907,9 +813,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -922,9 +825,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -943,21 +843,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1280,11 +1168,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1762,9 +1645,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1867,9 +1747,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1882,9 +1759,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1903,21 +1777,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1945,20 +1807,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2096,15 +1958,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2327,12 +2185,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/os2units/Makefile +++ fpc-2.2.2/fpcsrc/packages/os2units/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLEDIRS+=examples endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLEDIRS+=examples endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLEDIRS+=examples endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests examples endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests examples endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests examples endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1277,11 +1165,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1759,9 +1642,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1864,9 +1744,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1879,9 +1756,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1900,21 +1774,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1942,20 +1804,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2093,15 +1955,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2342,12 +2200,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) @@ -2552,9 +2406,6 @@ ifeq ($(FULL_TARGET),i386-beos) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2657,9 +2508,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2672,9 +2520,6 @@ ifeq ($(FULL_TARGET),arm-palmos) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),arm-wince) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2693,21 +2538,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all --- fpc-2.2.2.orig/fpcsrc/packages/os2units/examples/Makefile +++ fpc-2.2.2/fpcsrc/packages/os2units/examples/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -276,9 +248,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=clktest ftptest lvmtest mciapi1 mciapi2 endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=clktest ftptest lvmtest mciapi1 mciapi2 -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=clktest ftptest lvmtest mciapi1 mciapi2 endif @@ -381,9 +350,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=clktest ftptest lvmtest mciapi1 mciapi2 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=clktest ftptest lvmtest mciapi1 mciapi2 -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=clktest ftptest lvmtest mciapi1 mciapi2 endif @@ -396,9 +362,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=clktest ftptest lvmtest mciapi1 mciapi2 endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=clktest ftptest lvmtest mciapi1 mciapi2 -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=clktest ftptest lvmtest mciapi1 mciapi2 endif @@ -417,21 +380,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=clktest ftptest lvmtest mciapi1 mciapi2 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=clktest ftptest lvmtest mciapi1 mciapi2 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=clktest ftptest lvmtest mciapi1 mciapi2 endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=clktest ftptest lvmtest mciapi1 mciapi2 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=clktest ftptest lvmtest mciapi1 mciapi2 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=clktest ftptest lvmtest mciapi1 mciapi2 -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -753,11 +704,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1241,10 +1187,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OS2UNITS=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_OS2UNITS=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OS2UNITS=1 @@ -1381,10 +1323,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OS2UNITS=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_OS2UNITS=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OS2UNITS=1 @@ -1401,10 +1339,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OS2UNITS=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_OS2UNITS=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OS2UNITS=1 @@ -1429,26 +1363,10 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OS2UNITS=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_OS2UNITS=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OS2UNITS=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_OS2UNITS=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_OS2UNITS=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_OS2UNITS=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1502,20 +1420,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1653,13 +1571,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/fpcsrc/packages/x11/Makefile +++ fpc-2.2.2/fpcsrc/packages/x11/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=x xlib xutil xresource xcms xshm xrender keysym xi xkb xkblib xatom xinerama xv xvlib cursorfont xrandr xf86dga xf86vmode endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=x xlib xutil xresource xcms xshm xrender keysym xi xkb xkblib xatom xinerama xv xvlib cursorfont xrandr xf86dga xf86vmode -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=x xlib xutil xresource xcms xshm xrender keysym xi xkb xkblib xatom xinerama xv xvlib cursorfont xrandr xf86dga xf86vmode endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=x xlib xutil xresource xcms xshm xrender keysym xi xkb xkblib xatom xinerama xv xvlib cursorfont xrandr xf86dga xf86vmode endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=x xlib xutil xresource xcms xshm xrender keysym xi xkb xkblib xatom xinerama xv xvlib cursorfont xrandr xf86dga xf86vmode -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=x xlib xutil xresource xcms xshm xrender keysym xi xkb xkblib xatom xinerama xv xvlib cursorfont xrandr xf86dga xf86vmode endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=x xlib xutil xresource xcms xshm xrender keysym xi xkb xkblib xatom xinerama xv xvlib cursorfont xrandr xf86dga xf86vmode endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=x xlib xutil xresource xcms xshm xrender keysym xi xkb xkblib xatom xinerama xv xvlib cursorfont xrandr xf86dga xf86vmode -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=x xlib xutil xresource xcms xshm xrender keysym xi xkb xkblib xatom xinerama xv xvlib cursorfont xrandr xf86dga xf86vmode endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=x xlib xutil xresource xcms xshm xrender keysym xi xkb xkblib xatom xinerama xv xvlib cursorfont xrandr xf86dga xf86vmode endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=x xlib xutil xresource xcms xshm xrender keysym xi xkb xkblib xatom xinerama xv xvlib cursorfont xrandr xf86dga xf86vmode -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=x xlib xutil xresource xcms xshm xrender keysym xi xkb xkblib xatom xinerama xv xvlib cursorfont xrandr xf86dga xf86vmode endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=x xlib xutil xresource xcms xshm xrender keysym xi xkb xkblib xatom xinerama xv xvlib cursorfont xrandr xf86dga xf86vmode -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=x xlib xutil xresource xcms xshm xrender keysym xi xkb xkblib xatom xinerama xv xvlib cursorfont xrandr xf86dga xf86vmode -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=x xlib xutil xresource xcms xshm xrender keysym xi xkb xkblib xatom xinerama xv xvlib cursorfont xrandr xf86dga xf86vmode -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1105,11 +1014,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1587,9 +1491,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1692,9 +1593,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1707,9 +1605,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1728,21 +1623,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1770,20 +1653,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1921,15 +1804,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2152,12 +2031,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/opengl/Makefile +++ fpc-2.2.2/fpcsrc/packages/opengl/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=gl glu glut endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=gl glu glut -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=gl glu glut glx glext endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=gl glu glut glx glext endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=gl glu glut glx glext -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=gl glu glut endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=gl glu glut endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=gl glu glut glx glext -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=gl glu glut endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=gl glu glut glx glext endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=gl glu glut glx glext -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=gl glu glut endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=gl glu glut -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=gl glu glut glx glext -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=gl glu glut -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLEDIRS+=examples endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLEDIRS+=examples endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLEDIRS+=examples endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLEDIRS+=examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests examples endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests examples endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests examples endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1277,11 +1165,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1761,9 +1644,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 @@ -1880,10 +1760,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1897,10 +1773,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1920,23 +1792,9 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1990,20 +1848,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2141,15 +1999,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2390,12 +2244,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) @@ -2600,9 +2450,6 @@ ifeq ($(FULL_TARGET),i386-beos) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2705,9 +2552,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2720,9 +2564,6 @@ ifeq ($(FULL_TARGET),arm-palmos) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),arm-wince) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2741,21 +2582,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all --- fpc-2.2.2.orig/fpcsrc/packages/opengl/examples/Makefile +++ fpc-2.2.2/fpcsrc/packages/opengl/examples/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -276,9 +248,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=glutdemo morph3d bounce radblur endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=glutdemo morph3d bounce radblur -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=glutdemo morph3d bounce radblur glxtest endif @@ -381,9 +350,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=glutdemo morph3d bounce radblur glxtest endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=glutdemo morph3d bounce radblur glxtest -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=glutdemo morph3d bounce radblur endif @@ -396,9 +362,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=glutdemo morph3d bounce radblur endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=glutdemo morph3d bounce radblur glxtest -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=glutdemo morph3d bounce radblur endif @@ -417,21 +380,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=glutdemo morph3d bounce radblur glxtest endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=glutdemo morph3d bounce radblur glxtest -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=glutdemo morph3d bounce radblur endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=glutdemo morph3d bounce radblur -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=glutdemo morph3d bounce radblur glxtest -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=glutdemo morph3d bounce radblur -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -451,9 +402,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-S2h endif @@ -556,9 +504,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-S2h endif @@ -571,9 +516,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-S2h endif @@ -592,21 +534,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2h -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -927,11 +857,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1417,10 +1342,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_OPENGL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 @@ -1571,11 +1492,6 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 @@ -1593,11 +1509,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 @@ -1623,28 +1534,10 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_OPENGL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_OPENGL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1724,20 +1617,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1875,13 +1768,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/fpcsrc/packages/fcl-xml/Makefile +++ fpc-2.2.2/fpcsrc/packages/fcl-xml/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=sax xpath htmlwriter xmlconf endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=sax xpath htmlwriter xmlconf endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=sax xpath htmlwriter xmlconf endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=sax xpath htmlwriter xmlconf endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=sax xpath htmlwriter xmlconf endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=sax xpath htmlwriter xmlconf endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=sax xpath htmlwriter xmlconf endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=sax xpath htmlwriter xmlconf endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=sax xpath htmlwriter xmlconf endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-S2h endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-S2h endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-S2h endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1246,11 +1134,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1736,10 +1619,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1876,10 +1755,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_WINUNITS-BASE=1 @@ -1898,10 +1773,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1926,26 +1797,10 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2051,20 +1906,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2196,15 +2051,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2427,12 +2278,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/libcurl/Makefile +++ fpc-2.2.2/fpcsrc/packages/libcurl/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=libcurl endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=libcurl -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=libcurl endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=libcurl endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=libcurl -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=libcurl endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=libcurl endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=libcurl -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=libcurl endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=libcurl endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=libcurl -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=libcurl endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=libcurl -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=libcurl -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=libcurl -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=testcurl teststream endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLES+=testcurl teststream endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=testcurl teststream -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLES+=testcurl teststream endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLES+=testcurl teststream endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=testcurl teststream -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLES+=testcurl teststream endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLES+=testcurl teststream endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=testcurl teststream -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLES+=testcurl teststream endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLES+=testcurl teststream endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=testcurl teststream -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLES+=testcurl teststream endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=testcurl teststream -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=testcurl teststream -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=testcurl teststream -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1279,11 +1167,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1761,9 +1644,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1866,9 +1746,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1881,9 +1758,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1902,21 +1776,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1944,20 +1806,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2095,15 +1957,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2344,12 +2202,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/fpmkunit/Makefile +++ fpc-2.2.2/fpcsrc/packages/fpmkunit/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=fpmkunit endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=fpmkunit -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=fpmkunit endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=fpmkunit endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=fpmkunit -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=fpmkunit endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=fpmkunit endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=fpmkunit -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=fpmkunit endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=fpmkunit endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=fpmkunit -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=fpmkunit endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=fpmkunit -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=fpmkunit -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=fpmkunit -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1072,11 +981,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1572,12 +1476,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 @@ -1782,12 +1680,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 @@ -1812,12 +1704,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 @@ -1854,36 +1740,12 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1989,20 +1851,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2134,15 +1996,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2365,12 +2223,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/fcl-base/Makefile +++ fpc-2.2.2/fpcsrc/packages/fcl-base/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -284,9 +256,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=contnrs inifiles rtfpars idea base64 gettext iostream cachecls avl_tree uriparser eventlog custapp wformat whtml wtex rttiutils bufstream streamex blowfish streamio inicol pooledmm libtar streamcoll maskutils syncobjs endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=contnrs inifiles rtfpars idea base64 gettext iostream cachecls avl_tree uriparser eventlog custapp wformat whtml wtex rttiutils bufstream streamex blowfish streamio inicol pooledmm libtar streamcoll maskutils -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=contnrs inifiles rtfpars idea base64 gettext iostream cachecls avl_tree uriparser eventlog custapp wformat whtml wtex rttiutils bufstream streamex blowfish streamio inicol pooledmm libtar streamcoll maskutils daemonapp fptimer endif @@ -389,9 +358,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=contnrs inifiles rtfpars idea base64 gettext iostream cachecls avl_tree uriparser eventlog custapp wformat whtml wtex rttiutils bufstream streamex blowfish streamio inicol pooledmm libtar streamcoll maskutils syncobjs daemonapp fptimer endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=contnrs inifiles rtfpars idea base64 gettext iostream cachecls avl_tree uriparser eventlog custapp wformat whtml wtex rttiutils bufstream streamex blowfish streamio inicol pooledmm libtar streamcoll maskutils syncobjs daemonapp fptimer -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=contnrs inifiles rtfpars idea base64 gettext iostream cachecls avl_tree uriparser eventlog custapp wformat whtml wtex rttiutils bufstream streamex blowfish streamio inicol pooledmm libtar streamcoll maskutils fileinfo syncobjs daemonapp ServiceManager fptimer endif @@ -404,9 +370,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=contnrs inifiles rtfpars idea base64 gettext iostream cachecls avl_tree uriparser eventlog custapp wformat whtml wtex rttiutils bufstream streamex blowfish streamio inicol pooledmm libtar streamcoll maskutils endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=contnrs inifiles rtfpars idea base64 gettext iostream cachecls avl_tree uriparser eventlog custapp wformat whtml wtex rttiutils bufstream streamex blowfish streamio inicol pooledmm libtar streamcoll maskutils syncobjs daemonapp fptimer -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=contnrs inifiles rtfpars idea base64 gettext iostream cachecls avl_tree uriparser eventlog custapp wformat whtml wtex rttiutils bufstream streamex blowfish streamio inicol pooledmm libtar streamcoll maskutils fileinfo syncobjs fptimer endif @@ -425,21 +388,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=contnrs inifiles rtfpars idea base64 gettext iostream cachecls avl_tree uriparser eventlog custapp wformat whtml wtex rttiutils bufstream streamex blowfish streamio inicol pooledmm libtar streamcoll maskutils syncobjs daemonapp fptimer endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=contnrs inifiles rtfpars idea base64 gettext iostream cachecls avl_tree uriparser eventlog custapp wformat whtml wtex rttiutils bufstream streamex blowfish streamio inicol pooledmm libtar streamcoll maskutils syncobjs daemonapp fptimer -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=contnrs inifiles rtfpars idea base64 gettext iostream cachecls avl_tree uriparser eventlog custapp wformat whtml wtex rttiutils bufstream streamex blowfish streamio inicol pooledmm libtar streamcoll maskutils endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=contnrs inifiles rtfpars idea base64 gettext iostream cachecls avl_tree uriparser eventlog custapp wformat whtml wtex rttiutils bufstream streamex blowfish streamio inicol pooledmm libtar streamcoll maskutils -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=contnrs inifiles rtfpars idea base64 gettext iostream cachecls avl_tree uriparser eventlog custapp wformat whtml wtex rttiutils bufstream streamex blowfish streamio inicol pooledmm libtar streamcoll maskutils syncobjs daemonapp fptimer -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=contnrs inifiles rtfpars idea base64 gettext iostream cachecls avl_tree uriparser eventlog custapp wformat whtml wtex rttiutils bufstream streamex blowfish streamio inicol pooledmm libtar streamcoll maskutils -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=cachecls custapp cgiapp eventlog registry streamcoll inicol endif @@ -458,9 +409,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=cachecls custapp cgiapp eventlog registry streamcoll inicol endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=cachecls custapp cgiapp eventlog registry streamcoll inicol -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=cachecls custapp cgiapp eventlog registry streamcoll inicol endif @@ -563,9 +511,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=cachecls custapp cgiapp eventlog registry streamcoll inicol endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=cachecls custapp cgiapp eventlog registry streamcoll inicol -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=cachecls custapp cgiapp eventlog registry streamcoll inicol endif @@ -578,9 +523,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=cachecls custapp cgiapp eventlog registry streamcoll inicol endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=cachecls custapp cgiapp eventlog registry streamcoll inicol -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=cachecls custapp cgiapp eventlog registry streamcoll inicol endif @@ -599,21 +541,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=cachecls custapp cgiapp eventlog registry streamcoll inicol endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=cachecls custapp cgiapp eventlog registry streamcoll inicol -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=cachecls custapp cgiapp eventlog registry streamcoll inicol endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=cachecls custapp cgiapp eventlog registry streamcoll inicol -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=cachecls custapp cgiapp eventlog registry streamcoll inicol -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=cachecls custapp cgiapp eventlog registry streamcoll inicol -endif ifeq ($(FULL_TARGET),i386-win32) override INSTALL_FILES+=src/win/fclel.res endif @@ -639,9 +569,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-S2h endif @@ -744,9 +671,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-S2h endif @@ -759,9 +683,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-S2h endif @@ -780,21 +701,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix endif @@ -813,9 +722,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix endif @@ -918,9 +824,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/win endif @@ -933,9 +836,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/win endif @@ -954,21 +854,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif @@ -987,9 +875,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif @@ -1092,9 +977,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif @@ -1107,9 +989,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif @@ -1128,21 +1007,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1432,11 +1299,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1916,9 +1778,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -2021,9 +1880,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_WINUNITS-BASE=1 @@ -2038,9 +1894,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -2059,21 +1912,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2153,20 +1994,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2298,15 +2139,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2529,12 +2366,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/ibase/Makefile +++ fpc-2.2.2/fpcsrc/packages/ibase/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=ibase40 ibase60 ibase60dyn endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=ibase40 ibase60 ibase60dyn -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=ibase40 ibase60 ibase60dyn endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=ibase40 ibase60 ibase60dyn endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=ibase40 ibase60 ibase60dyn -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=ibase40 ibase60 ibase60dyn endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=ibase40 ibase60 ibase60dyn endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=ibase40 ibase60 ibase60dyn -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=ibase40 ibase60 ibase60dyn endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=ibase40 ibase60 ibase60dyn endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=ibase40 ibase60 ibase60dyn -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=ibase40 ibase60 ibase60dyn endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=ibase40 ibase60 ibase60dyn -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=ibase40 ibase60 ibase60dyn -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=ibase40 ibase60 ibase60dyn -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=testib40 testib60 endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLES+=testib40 testib60 endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=testib40 testib60 -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLES+=testib40 testib60 endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLES+=testib40 testib60 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=testib40 testib60 -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLES+=testib40 testib60 endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLES+=testib40 testib60 endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=testib40 testib60 -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLES+=testib40 testib60 endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLES+=testib40 testib60 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=testib40 testib60 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLES+=testib40 testib60 endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=testib40 testib60 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=testib40 testib60 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=testib40 testib60 -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1279,11 +1167,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1761,9 +1644,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1866,9 +1746,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1881,9 +1758,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1902,21 +1776,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1944,20 +1806,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2095,15 +1957,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2344,12 +2202,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/imlib/Makefile +++ fpc-2.2.2/fpcsrc/packages/imlib/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=gdk_imlib imlib endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=gdk_imlib imlib -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=gdk_imlib imlib endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=gdk_imlib imlib endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=gdk_imlib imlib -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=gdk_imlib imlib endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=gdk_imlib imlib endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=gdk_imlib imlib -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=gdk_imlib imlib endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=gdk_imlib imlib endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=gdk_imlib imlib -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=gdk_imlib imlib endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=gdk_imlib imlib -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=gdk_imlib imlib -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=gdk_imlib imlib -endif override INSTALL_FPCPACKAGE=y override INSTALL_FPCSUBDIR=packages ifeq ($(FULL_TARGET),i386-linux) @@ -454,9 +405,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -559,9 +507,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -574,9 +519,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -595,21 +537,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -628,9 +558,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -733,9 +660,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -748,9 +672,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -769,21 +690,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1106,11 +1015,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1606,12 +1510,6 @@ REQUIRE_PACKAGES_GTK1=1 REQUIRE_PACKAGES_X11=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -REQUIRE_PACKAGES_X11=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 @@ -1816,12 +1714,6 @@ REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 @@ -1846,12 +1738,6 @@ REQUIRE_PACKAGES_GTK1=1 REQUIRE_PACKAGES_X11=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 @@ -1888,36 +1774,12 @@ REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 REQUIRE_PACKAGES_X11=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -REQUIRE_PACKAGES_X11=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -REQUIRE_PACKAGES_X11=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2023,20 +1885,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2174,15 +2036,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2405,12 +2263,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/libc/Makefile +++ fpc-2.2.2/fpcsrc/packages/libc/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=kerneldefs kernelioctl libc endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=kerneldefs kernelioctl libc -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=kerneldefs kernelioctl libc endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=kerneldefs kernelioctl libc endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=kerneldefs kernelioctl libc -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=kerneldefs kernelioctl libc endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=kerneldefs kernelioctl libc endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=kerneldefs kernelioctl libc -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=kerneldefs kernelioctl libc endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=kerneldefs kernelioctl libc endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=kerneldefs kernelioctl libc -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=kerneldefs kernelioctl libc endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=kerneldefs kernelioctl libc -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=kerneldefs kernelioctl libc -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=kerneldefs kernelioctl libc -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -453,9 +404,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -558,9 +506,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -573,9 +518,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -594,21 +536,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1105,11 +1014,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1587,9 +1491,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1692,9 +1593,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1707,9 +1605,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1728,21 +1623,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1770,20 +1653,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1921,15 +1804,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2152,12 +2031,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/packages/ggi/Makefile +++ fpc-2.2.2/fpcsrc/packages/ggi/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=gii ggi ggi2d endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=gii ggi ggi2d -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=gii ggi ggi2d endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=gii ggi ggi2d endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=gii ggi ggi2d -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=gii ggi ggi2d endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=gii ggi ggi2d endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=gii ggi ggi2d -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=gii ggi ggi2d endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=gii ggi ggi2d endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=gii ggi ggi2d -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=gii ggi ggi2d endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=gii ggi ggi2d -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=gii ggi ggi2d -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=gii ggi ggi2d -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=ggi1 endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_EXAMPLES+=ggi1 endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=ggi1 -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_EXAMPLES+=ggi1 endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_EXAMPLES+=ggi1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=ggi1 -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLES+=ggi1 endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_EXAMPLES+=ggi1 endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=ggi1 -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_EXAMPLES+=ggi1 endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLES+=ggi1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=ggi1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLES+=ggi1 endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=ggi1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=ggi1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=ggi1 -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -627,9 +557,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=src endif @@ -732,9 +659,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=src endif @@ -747,9 +671,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -768,21 +689,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=src endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=src tests examples endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=src tests examples endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests examples endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests examples -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=src tests examples endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1279,11 +1167,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1761,9 +1644,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1866,9 +1746,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1881,9 +1758,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1902,21 +1776,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1944,20 +1806,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2095,15 +1957,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2344,12 +2202,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/compiler/Makefile +++ fpc-2.2.2/fpcsrc/compiler/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -398,9 +370,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_DIRS+=utils endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_DIRS+=utils -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_DIRS+=utils endif @@ -503,9 +472,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_DIRS+=utils endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_DIRS+=utils -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_DIRS+=utils endif @@ -518,9 +484,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_DIRS+=utils endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_DIRS+=utils -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_DIRS+=utils endif @@ -539,21 +502,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=utils endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_DIRS+=utils -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_DIRS+=utils endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_DIRS+=utils -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_DIRS+=utils -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_DIRS+=utils -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=pp endif @@ -572,9 +523,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=pp endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=pp -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=pp endif @@ -677,9 +625,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=pp endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=pp -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=pp endif @@ -692,9 +637,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=pp endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=pp -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=pp endif @@ -713,21 +655,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=pp endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=pp -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=pp endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=pp -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=pp -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=pp -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(PPC_TARGET) @@ -747,9 +677,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=$(PPC_TARGET) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=$(PPC_TARGET) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=$(PPC_TARGET) endif @@ -852,9 +779,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=$(PPC_TARGET) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=$(PPC_TARGET) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=$(PPC_TARGET) endif @@ -867,9 +791,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=$(PPC_TARGET) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=$(PPC_TARGET) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=$(PPC_TARGET) endif @@ -888,21 +809,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=$(PPC_TARGET) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=$(PPC_TARGET) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=$(PPC_TARGET) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=$(PPC_TARGET) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=$(PPC_TARGET) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=$(PPC_TARGET) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) endif @@ -921,9 +830,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) endif @@ -1026,9 +932,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) endif @@ -1041,9 +944,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) endif @@ -1062,21 +962,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_TARGETDIR+=. endif @@ -1095,9 +983,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_TARGETDIR+=. endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_TARGETDIR+=. -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_TARGETDIR+=. endif @@ -1200,9 +1085,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_TARGETDIR+=. endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_TARGETDIR+=. -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_TARGETDIR+=. endif @@ -1215,9 +1097,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_TARGETDIR+=. endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_TARGETDIR+=. -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_TARGETDIR+=. endif @@ -1236,21 +1115,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_TARGETDIR+=. endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_TARGETDIR+=. -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_TARGETDIR+=. endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_TARGETDIR+=. -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_TARGETDIR+=. -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_TARGETDIR+=. -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) endif @@ -1269,9 +1136,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) endif @@ -1374,9 +1238,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) endif @@ -1389,9 +1250,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) endif @@ -1410,21 +1268,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1714,11 +1560,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -2196,9 +2037,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -2301,9 +2139,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -2316,9 +2151,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -2337,21 +2169,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2379,20 +2199,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2524,13 +2344,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) @@ -2763,12 +2579,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) @@ -2973,9 +2785,6 @@ ifeq ($(FULL_TARGET),i386-beos) TARGET_DIRS_UTILS=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -TARGET_DIRS_UTILS=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) TARGET_DIRS_UTILS=1 endif @@ -3078,9 +2887,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) TARGET_DIRS_UTILS=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_DIRS_UTILS=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) TARGET_DIRS_UTILS=1 endif @@ -3093,9 +2899,6 @@ ifeq ($(FULL_TARGET),arm-palmos) TARGET_DIRS_UTILS=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_DIRS_UTILS=1 -endif ifeq ($(FULL_TARGET),arm-wince) TARGET_DIRS_UTILS=1 endif @@ -3114,21 +2917,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_UTILS=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_DIRS_UTILS=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) TARGET_DIRS_UTILS=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -TARGET_DIRS_UTILS=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -TARGET_DIRS_UTILS=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -TARGET_DIRS_UTILS=1 -endif ifdef TARGET_DIRS_UTILS utils_all: $(MAKE) -C utils all --- fpc-2.2.2.orig/fpcsrc/compiler/utils/Makefile +++ fpc-2.2.2/fpcsrc/compiler/utils/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -276,9 +248,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst fpcmkcfg endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst fpcmkcfg -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst fpcmkcfg endif @@ -381,9 +350,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst fpcmkcfg endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst fpcmkcfg -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst fpcmkcfg endif @@ -396,9 +362,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst fpcmkcfg endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst fpcmkcfg -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst fpcmkcfg endif @@ -417,21 +380,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst fpcmkcfg endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst fpcmkcfg -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst fpcmkcfg endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst fpcmkcfg -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst fpcmkcfg -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst fpcmkcfg -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=ppu crc usubst endif @@ -450,9 +401,6 @@ ifeq ($(FULL_TARGET),i386-beos) override CLEAN_UNITS+=ppu crc usubst endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=ppu crc usubst -endif ifeq ($(FULL_TARGET),i386-netbsd) override CLEAN_UNITS+=ppu crc usubst endif @@ -555,9 +503,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override CLEAN_UNITS+=ppu crc usubst endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=ppu crc usubst -endif ifeq ($(FULL_TARGET),x86_64-win64) override CLEAN_UNITS+=ppu crc usubst endif @@ -570,9 +515,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override CLEAN_UNITS+=ppu crc usubst endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=ppu crc usubst -endif ifeq ($(FULL_TARGET),arm-wince) override CLEAN_UNITS+=ppu crc usubst endif @@ -591,21 +533,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=ppu crc usubst endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=ppu crc usubst -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override CLEAN_UNITS+=ppu crc usubst endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=ppu crc usubst -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=ppu crc usubst -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=ppu crc usubst -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITDIR+=.. @@ -625,9 +555,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_UNITDIR+=.. endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_UNITDIR+=.. -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_UNITDIR+=.. endif @@ -730,9 +657,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_UNITDIR+=.. endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_UNITDIR+=.. -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_UNITDIR+=.. endif @@ -745,9 +669,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_UNITDIR+=.. endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_UNITDIR+=.. -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_UNITDIR+=.. endif @@ -766,21 +687,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITDIR+=.. endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_UNITDIR+=.. -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_UNITDIR+=.. endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_UNITDIR+=.. -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_UNITDIR+=.. -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_UNITDIR+=.. -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=.. endif @@ -799,9 +708,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=.. endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=.. -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=.. endif @@ -904,9 +810,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=.. endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=.. -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=.. endif @@ -919,9 +822,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=.. endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=.. -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=.. endif @@ -940,21 +840,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=.. endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=.. -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=.. endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=.. -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=.. -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=.. -endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1246,11 +1134,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1728,9 +1611,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1833,9 +1713,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1848,9 +1725,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1869,21 +1743,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1911,20 +1773,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2056,13 +1918,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/fpcsrc/utils/Makefile +++ fpc-2.2.2/fpcsrc/utils/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcres endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcres endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcres -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir grab_vcsa endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir grab_vcsa endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir grab_vcsa -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=rstconv endif @@ -626,9 +556,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=rstconv endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=rstconv -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=rstconv endif @@ -731,9 +658,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=rstconv endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=rstconv -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=rstconv endif @@ -746,9 +670,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=rstconv endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=rstconv -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=rstconv endif @@ -767,21 +688,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=rstconv endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=rstconv -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=rstconv endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=rstconv -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=ptopu endif @@ -800,9 +709,6 @@ ifeq ($(FULL_TARGET),i386-beos) override CLEAN_UNITS+=ptopu endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=ptopu -endif ifeq ($(FULL_TARGET),i386-netbsd) override CLEAN_UNITS+=ptopu endif @@ -905,9 +811,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override CLEAN_UNITS+=ptopu endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=ptopu -endif ifeq ($(FULL_TARGET),x86_64-win64) override CLEAN_UNITS+=ptopu endif @@ -920,9 +823,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override CLEAN_UNITS+=ptopu endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=ptopu -endif ifeq ($(FULL_TARGET),arm-wince) override CLEAN_UNITS+=ptopu endif @@ -941,21 +841,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=ptopu endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=ptopu -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override CLEAN_UNITS+=ptopu endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=ptopu -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1246,11 +1134,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1748,12 +1631,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1958,12 +1835,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_WINUNITS-BASE=1 @@ -1990,12 +1861,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -2032,36 +1897,12 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2219,20 +2060,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2364,13 +2205,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) @@ -2603,12 +2440,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) @@ -2853,15 +2686,6 @@ TARGET_DIRS_DXEGEN=1 TARGET_DIRS_FPDOC=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) TARGET_DIRS_FPPKG=1 TARGET_DIRS_FPCM=1 @@ -3174,15 +2998,6 @@ TARGET_DIRS_FPDOC=1 TARGET_DIRS_FPCRES=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) TARGET_DIRS_FPPKG=1 TARGET_DIRS_FPCM=1 @@ -3220,15 +3035,6 @@ TARGET_DIRS_DXEGEN=1 TARGET_DIRS_FPDOC=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -endif ifeq ($(FULL_TARGET),arm-wince) TARGET_DIRS_FPPKG=1 TARGET_DIRS_FPCM=1 @@ -3284,15 +3090,6 @@ TARGET_DIRS_FPDOC=1 TARGET_DIRS_FPCRES=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) TARGET_DIRS_FPPKG=1 TARGET_DIRS_FPCM=1 @@ -3302,34 +3099,6 @@ TARGET_DIRS_DXEGEN=1 TARGET_DIRS_FPDOC=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCRES=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -endif ifdef TARGET_DIRS_FPPKG fppkg_all: $(MAKE) -C fppkg all --- fpc-2.2.2.orig/fpcsrc/utils/tply/Makefile +++ fpc-2.2.2/fpcsrc/utils/tply/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=plex pyacc endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=plex pyacc -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=plex pyacc endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=plex pyacc endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=plex pyacc -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=plex pyacc endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=plex pyacc endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=plex pyacc -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=plex pyacc endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=plex pyacc endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=plex pyacc -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=plex pyacc endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=plex pyacc -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_UNITS+=lexlib yacclib endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=lexlib yacclib endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=lexlib yacclib -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=lexlib yacclib endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=lexlib yacclib endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=lexlib yacclib -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=lexlib yacclib endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=lexlib yacclib endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=lexlib yacclib -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=lexlib yacclib endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=lexlib yacclib endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=lexlib yacclib -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=lexlib yacclib endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=lexlib yacclib -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl endif @@ -626,9 +556,6 @@ ifeq ($(FULL_TARGET),i386-beos) override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif ifeq ($(FULL_TARGET),i386-netbsd) override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl endif @@ -731,9 +658,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif ifeq ($(FULL_TARGET),x86_64-win64) override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl endif @@ -746,9 +670,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif ifeq ($(FULL_TARGET),arm-wince) override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl endif @@ -767,21 +688,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-Sg @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-Sg endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-Sg -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-Sg endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-Sg endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-Sg -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-Sg endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-Sg endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-Sg -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-Sg endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-Sg endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-Sg -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-Sg endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-Sg -endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1248,11 +1136,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1730,9 +1613,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1835,9 +1715,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1850,9 +1727,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1871,21 +1745,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1913,20 +1775,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2058,15 +1920,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) @@ -2306,12 +2164,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/utils/fpmc/Makefile +++ fpc-2.2.2/fpcsrc/utils/fpmc/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -284,9 +256,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=fpmc endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=fpmc -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=fpmc endif @@ -389,9 +358,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=fpmc endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=fpmc -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=fpmc endif @@ -404,9 +370,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=fpmc endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=fpmc -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=fpmc endif @@ -425,21 +388,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=fpmc fpmcgtk endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=fpmc -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=fpmc endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=fpmc fpmcgtk -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=fpmc -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp endif @@ -458,9 +409,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp endif @@ -563,9 +511,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp endif @@ -578,9 +523,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp endif @@ -599,21 +541,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions endif @@ -632,9 +562,6 @@ ifeq ($(FULL_TARGET),i386-beos) override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif ifeq ($(FULL_TARGET),i386-netbsd) override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions endif @@ -737,9 +664,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif ifeq ($(FULL_TARGET),x86_64-win64) override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions endif @@ -752,9 +676,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif ifeq ($(FULL_TARGET),arm-wince) override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions endif @@ -773,21 +694,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1109,11 +1018,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1619,13 +1523,6 @@ REQUIRE_PACKAGES_GTK1=1 REQUIRE_PACKAGES_FPGTK=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -REQUIRE_PACKAGES_FPGTK=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1878,14 +1775,6 @@ REQUIRE_PACKAGES_GTK1=1 REQUIRE_PACKAGES_FPGTK=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -REQUIRE_PACKAGES_FPGTK=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_WINUNITS-BASE=1 @@ -1917,14 +1806,6 @@ REQUIRE_PACKAGES_GTK1=1 REQUIRE_PACKAGES_FPGTK=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -REQUIRE_PACKAGES_FPGTK=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1968,14 +1849,6 @@ REQUIRE_PACKAGES_GTK1=1 REQUIRE_PACKAGES_FPGTK=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -REQUIRE_PACKAGES_FPGTK=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1983,28 +1856,6 @@ REQUIRE_PACKAGES_GTK1=1 REQUIRE_PACKAGES_FPGTK=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -REQUIRE_PACKAGES_FPGTK=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -REQUIRE_PACKAGES_FPGTK=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK1=1 -REQUIRE_PACKAGES_FPGTK=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2214,20 +2065,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2365,13 +2216,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/fpcsrc/utils/fpcres/Makefile +++ fpc-2.2.2/fpcsrc/utils/fpcres/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -276,9 +248,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=fpcres endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=fpcres -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=fpcres endif @@ -381,9 +350,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=fpcres endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=fpcres -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=fpcres endif @@ -396,9 +362,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=fpcres endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=fpcres -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=fpcres endif @@ -417,21 +380,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=fpcres endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=fpcres -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=fpcres endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=fpcres -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=fpcres -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=fpcres -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=fpcres fpcresfix elfres endif @@ -450,9 +401,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=fpcres fpcresfix elfres endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=fpcres fpcresfix elfres -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=fpcres fpcresfix elfres endif @@ -555,9 +503,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=fpcres fpcresfix elfres endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=fpcres fpcresfix elfres -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=fpcres fpcresfix elfres endif @@ -570,9 +515,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=fpcres fpcresfix elfres endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=fpcres fpcresfix elfres -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=fpcres fpcresfix elfres endif @@ -591,21 +533,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=fpcres fpcresfix elfres endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=fpcres fpcresfix elfres -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=fpcres fpcresfix elfres endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=fpcres fpcresfix elfres -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=fpcres fpcresfix elfres -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=fpcres fpcresfix elfres -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=fpcresfix elfbfd elfres endif @@ -624,9 +554,6 @@ ifeq ($(FULL_TARGET),i386-beos) override CLEAN_UNITS+=fpcresfix elfbfd elfres endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=fpcresfix elfbfd elfres -endif ifeq ($(FULL_TARGET),i386-netbsd) override CLEAN_UNITS+=fpcresfix elfbfd elfres endif @@ -729,9 +656,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override CLEAN_UNITS+=fpcresfix elfbfd elfres endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=fpcresfix elfbfd elfres -endif ifeq ($(FULL_TARGET),x86_64-win64) override CLEAN_UNITS+=fpcresfix elfbfd elfres endif @@ -744,9 +668,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override CLEAN_UNITS+=fpcresfix elfbfd elfres endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=fpcresfix elfbfd elfres -endif ifeq ($(FULL_TARGET),arm-wince) override CLEAN_UNITS+=fpcresfix elfbfd elfres endif @@ -765,21 +686,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=fpcresfix elfbfd elfres endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=fpcresfix elfbfd elfres -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override CLEAN_UNITS+=fpcresfix elfbfd elfres endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=fpcresfix elfbfd elfres -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=fpcresfix elfbfd elfres -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=fpcresfix elfbfd elfres -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1070,11 +979,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1552,9 +1456,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1657,9 +1558,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1672,9 +1570,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1693,21 +1588,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1735,20 +1618,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1880,13 +1763,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/fpcsrc/utils/h2pas/Makefile +++ fpc-2.2.2/fpcsrc/utils/h2pas/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -276,9 +248,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=h2pas h2paspp endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=h2pas h2paspp -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=h2pas h2paspp endif @@ -381,9 +350,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=h2pas h2paspp endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=h2pas h2paspp -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=h2pas h2paspp endif @@ -396,9 +362,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=h2pas h2paspp endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=h2pas h2paspp -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=h2pas h2paspp endif @@ -417,21 +380,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=h2pas h2paspp endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=h2pas h2paspp -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=h2pas h2paspp endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=h2pas h2paspp -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=options lexlib scan yacclib converu endif @@ -450,9 +401,6 @@ ifeq ($(FULL_TARGET),i386-beos) override CLEAN_UNITS+=options lexlib scan yacclib converu endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=options lexlib scan yacclib converu -endif ifeq ($(FULL_TARGET),i386-netbsd) override CLEAN_UNITS+=options lexlib scan yacclib converu endif @@ -555,9 +503,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override CLEAN_UNITS+=options lexlib scan yacclib converu endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=options lexlib scan yacclib converu -endif ifeq ($(FULL_TARGET),x86_64-win64) override CLEAN_UNITS+=options lexlib scan yacclib converu endif @@ -570,9 +515,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override CLEAN_UNITS+=options lexlib scan yacclib converu endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=options lexlib scan yacclib converu -endif ifeq ($(FULL_TARGET),arm-wince) override CLEAN_UNITS+=options lexlib scan yacclib converu endif @@ -591,21 +533,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=options lexlib scan yacclib converu endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=options lexlib scan yacclib converu -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override CLEAN_UNITS+=options lexlib scan yacclib converu endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=options lexlib scan yacclib converu -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=options lexlib scan yacclib converu -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=options lexlib scan yacclib converu -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-Sg @@ -625,9 +555,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-Sg endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-Sg -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-Sg endif @@ -730,9 +657,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-Sg endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-Sg -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-Sg endif @@ -745,9 +669,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-Sg endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-Sg -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-Sg endif @@ -766,21 +687,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-Sg endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-Sg -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-Sg endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-Sg -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1070,11 +979,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1552,9 +1456,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1657,9 +1558,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1672,9 +1570,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1693,21 +1588,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1735,20 +1618,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1880,13 +1763,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/fpcsrc/utils/fppkg/Makefile +++ fpc-2.2.2/fpcsrc/utils/fppkg/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=fppkg endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=fppkg -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=fppkg endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=fppkg endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=fppkg -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=fppkg endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=fppkg endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=fppkg -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=fppkg endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=fppkg endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=fppkg -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=fppkg endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=fppkg -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos pkgwget pkglnet endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_IMPLICITUNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos pkgwget pkglnet endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_IMPLICITUNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_IMPLICITUNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos pkgwget pkglnet endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_IMPLICITUNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos pkgwget pkglnet endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_IMPLICITUNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos pkgwget pkglnet -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_IMPLICITUNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos pkgwget pkglnet endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_IMPLICITUNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_IMPLICITUNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos pkgwget pkglnet -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_IMPLICITUNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos pkgwget pkglnet endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_IMPLICITUNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos pkgwget pkglnet endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_IMPLICITUNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos pkgwget pkglnet -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_IMPLICITUNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_IMPLICITUNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_IMPLICITUNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos pkgwget pkglnet -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_IMPLICITUNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=fprepos fpxmlrep pkgmessages endif @@ -626,9 +556,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=fprepos fpxmlrep pkgmessages endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=fprepos fpxmlrep pkgmessages -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=fprepos fpxmlrep pkgmessages endif @@ -731,9 +658,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=fprepos fpxmlrep pkgmessages endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=fprepos fpxmlrep pkgmessages -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=fprepos fpxmlrep pkgmessages endif @@ -746,9 +670,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=fprepos fpxmlrep pkgmessages endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=fprepos fpxmlrep pkgmessages -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=fprepos fpxmlrep pkgmessages endif @@ -767,21 +688,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=fprepos fpxmlrep pkgmessages endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=fprepos fpxmlrep pkgmessages -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=fprepos fpxmlrep pkgmessages endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=fprepos fpxmlrep pkgmessages -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=fprepos fpxmlrep pkgmessages -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=fprepos fpxmlrep pkgmessages -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer endif @@ -800,9 +709,6 @@ ifeq ($(FULL_TARGET),i386-beos) override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif ifeq ($(FULL_TARGET),i386-netbsd) override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer endif @@ -905,9 +811,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif ifeq ($(FULL_TARGET),x86_64-win64) override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer endif @@ -920,9 +823,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif ifeq ($(FULL_TARGET),arm-wince) override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer endif @@ -941,21 +841,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=lnet/sys @@ -975,9 +863,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=lnet/sys endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=lnet/sys -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=lnet/sys endif @@ -1080,9 +965,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=lnet/sys endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=lnet/sys -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=lnet/sys endif @@ -1095,9 +977,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=lnet/sys endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=lnet/sys -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=lnet/sys endif @@ -1116,21 +995,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=lnet/sys endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=lnet/sys -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=lnet/sys endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=lnet/sys -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITDIR+=lnet endif @@ -1149,9 +1016,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_UNITDIR+=lnet endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_UNITDIR+=lnet -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_UNITDIR+=lnet endif @@ -1254,9 +1118,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_UNITDIR+=lnet endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_UNITDIR+=lnet -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_UNITDIR+=lnet endif @@ -1269,9 +1130,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_UNITDIR+=lnet endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_UNITDIR+=lnet -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_UNITDIR+=lnet endif @@ -1290,21 +1148,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITDIR+=lnet endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_UNITDIR+=lnet -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_UNITDIR+=lnet endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_UNITDIR+=lnet -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1625,11 +1471,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -2163,18 +2004,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-ASYNC=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -2583,18 +2412,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-ASYNC=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_WINUNITS-BASE=1 @@ -2645,18 +2462,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-ASYNC=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -2729,18 +2534,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-ASYNC=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -2753,42 +2546,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-ASYNC=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-ASYNC=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-ASYNC=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3102,20 +2859,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -3253,22 +3010,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif -.PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) -override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) -override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) -override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) -endif -fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES) .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) @@ -3501,12 +3245,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/utils/fprcp/Makefile +++ fpc-2.2.2/fpcsrc/utils/fprcp/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -276,9 +248,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=fprcp endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=fprcp -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=fprcp endif @@ -381,9 +350,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=fprcp endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=fprcp -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=fprcp endif @@ -396,9 +362,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=fprcp endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=fprcp -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=fprcp endif @@ -417,21 +380,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=fprcp endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=fprcp -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=fprcp endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=fprcp -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=comments expr pasprep endif @@ -450,9 +401,6 @@ ifeq ($(FULL_TARGET),i386-beos) override CLEAN_UNITS+=comments expr pasprep endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=comments expr pasprep -endif ifeq ($(FULL_TARGET),i386-netbsd) override CLEAN_UNITS+=comments expr pasprep endif @@ -555,9 +503,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override CLEAN_UNITS+=comments expr pasprep endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=comments expr pasprep -endif ifeq ($(FULL_TARGET),x86_64-win64) override CLEAN_UNITS+=comments expr pasprep endif @@ -570,9 +515,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override CLEAN_UNITS+=comments expr pasprep endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=comments expr pasprep -endif ifeq ($(FULL_TARGET),arm-wince) override CLEAN_UNITS+=comments expr pasprep endif @@ -591,21 +533,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=comments expr pasprep endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=comments expr pasprep -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override CLEAN_UNITS+=comments expr pasprep endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=comments expr pasprep -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -896,11 +826,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1378,9 +1303,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1483,9 +1405,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1498,9 +1417,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1519,21 +1435,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1561,20 +1465,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1706,13 +1610,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/fpcsrc/utils/dxegen/Makefile +++ fpc-2.2.2/fpcsrc/utils/dxegen/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -279,9 +251,6 @@ ifeq ($(FULL_TARGET),i386-beos) override CLEAN_UNITS+=coff endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=coff -endif ifeq ($(FULL_TARGET),i386-netbsd) override CLEAN_UNITS+=coff endif @@ -384,9 +353,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override CLEAN_UNITS+=coff endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=coff -endif ifeq ($(FULL_TARGET),x86_64-win64) override CLEAN_UNITS+=coff endif @@ -399,9 +365,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override CLEAN_UNITS+=coff endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=coff -endif ifeq ($(FULL_TARGET),arm-wince) override CLEAN_UNITS+=coff endif @@ -420,21 +383,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=coff endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=coff -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override CLEAN_UNITS+=coff endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=coff -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -725,11 +676,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1207,9 +1153,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1312,9 +1255,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1327,9 +1267,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1348,21 +1285,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1390,20 +1315,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1535,13 +1460,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/fpcsrc/utils/fpdoc/Makefile +++ fpc-2.2.2/fpcsrc/utils/fpdoc/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -278,9 +250,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=fpdoc makeskel unitdiff endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=fpdoc makeskel unitdiff endif @@ -383,9 +352,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=fpdoc makeskel unitdiff endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=fpdoc makeskel unitdiff endif @@ -398,9 +364,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=fpdoc makeskel unitdiff endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=fpdoc makeskel unitdiff endif @@ -419,21 +382,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=fpdoc makeskel unitdiff endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=fpdoc makeskel unitdiff endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man endif @@ -452,9 +403,6 @@ ifeq ($(FULL_TARGET),i386-beos) override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man -endif ifeq ($(FULL_TARGET),i386-netbsd) override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man endif @@ -557,9 +505,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man -endif ifeq ($(FULL_TARGET),x86_64-win64) override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man endif @@ -572,9 +517,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man -endif ifeq ($(FULL_TARGET),arm-wince) override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man endif @@ -593,21 +535,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst endif @@ -626,9 +556,6 @@ ifeq ($(FULL_TARGET),i386-beos) override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst -endif ifeq ($(FULL_TARGET),i386-netbsd) override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst endif @@ -731,9 +658,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst -endif ifeq ($(FULL_TARGET),x86_64-win64) override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst endif @@ -746,9 +670,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst -endif ifeq ($(FULL_TARGET),arm-wince) override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst endif @@ -767,21 +688,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -801,9 +710,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-S2h endif @@ -906,9 +812,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-S2h endif @@ -921,9 +824,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-S2h endif @@ -942,21 +842,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2h -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-S2h endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2h -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1246,11 +1134,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1754,13 +1637,6 @@ REQUIRE_PACKAGES_FCL-PASSRC=1 REQUIRE_PACKAGES_CHM=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1999,13 +1875,6 @@ REQUIRE_PACKAGES_FCL-PASSRC=1 REQUIRE_PACKAGES_CHM=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_WINUNITS-BASE=1 @@ -2036,13 +1905,6 @@ REQUIRE_PACKAGES_FCL-PASSRC=1 REQUIRE_PACKAGES_CHM=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -2085,13 +1947,6 @@ REQUIRE_PACKAGES_FCL-PASSRC=1 REQUIRE_PACKAGES_CHM=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -2099,27 +1954,6 @@ REQUIRE_PACKAGES_FCL-PASSRC=1 REQUIRE_PACKAGES_CHM=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2303,20 +2137,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2448,13 +2282,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) @@ -2687,12 +2517,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/utils/fpcm/Makefile +++ fpc-2.2.2/fpcsrc/utils/fpcm/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -276,9 +248,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=fpcmake endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=fpcmake -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=fpcmake endif @@ -381,9 +350,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=fpcmake endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=fpcmake -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=fpcmake endif @@ -396,9 +362,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=fpcmake endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=fpcmake -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=fpcmake endif @@ -417,21 +380,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=fpcmake endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=fpcmake -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=fpcmake endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=fpcmake -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=fpcmmain endif @@ -450,9 +401,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=fpcmmain endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=fpcmmain -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=fpcmmain endif @@ -555,9 +503,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=fpcmmain endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=fpcmmain -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=fpcmmain endif @@ -570,9 +515,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=fpcmmain endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=fpcmmain -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=fpcmmain endif @@ -591,21 +533,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=fpcmmain endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=fpcmmain -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=fpcmmain endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=fpcmmain -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg endif @@ -624,9 +554,6 @@ ifeq ($(FULL_TARGET),i386-beos) override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif ifeq ($(FULL_TARGET),i386-netbsd) override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg endif @@ -729,9 +656,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif ifeq ($(FULL_TARGET),x86_64-win64) override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg endif @@ -744,9 +668,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif ifeq ($(FULL_TARGET),arm-wince) override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg endif @@ -765,21 +686,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1070,11 +979,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1560,10 +1464,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1700,10 +1600,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_WINUNITS-BASE=1 @@ -1722,10 +1618,6 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1750,26 +1642,10 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1875,20 +1751,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2020,13 +1896,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) --- fpc-2.2.2.orig/fpcsrc/rtl/Makefile +++ fpc-2.2.2/fpcsrc/rtl/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -350,9 +322,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_DIRS+=freebsd endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_DIRS+=darwin -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_DIRS+=win64 endif @@ -362,9 +331,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_DIRS+=palmos endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_DIRS+=darwin -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_DIRS+=wince endif @@ -380,12 +346,6 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=linux endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_DIRS+=darwin -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_DIRS+=linux -endif override INSTALL_FPCPACKAGE=y override INSTALL_CREATEPACKAGEFPC=y ifdef REQUIRE_UNITSDIR @@ -677,11 +637,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1141,20 +1096,20 @@ TAREXT=.tar.gz endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1286,13 +1241,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif ifdef TARGET_RSTS override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS)) override CLEANRSTFILES+=$(RSTFILES) @@ -1434,12 +1385,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) @@ -1716,9 +1663,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) TARGET_DIRS_FREEBSD=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_DIRS_DARWIN=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) TARGET_DIRS_WIN64=1 endif @@ -1728,9 +1672,6 @@ ifeq ($(FULL_TARGET),arm-palmos) TARGET_DIRS_PALMOS=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_DIRS_DARWIN=1 -endif ifeq ($(FULL_TARGET),arm-wince) TARGET_DIRS_WINCE=1 endif @@ -1746,12 +1687,6 @@ ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_LINUX=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_DIRS_DARWIN=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -TARGET_DIRS_LINUX=1 -endif ifdef TARGET_DIRS_LINUX linux_all: $(MAKE) -C linux all --- fpc-2.2.2.orig/fpcsrc/rtl/symbian/Makefile +++ fpc-2.2.2/fpcsrc/rtl/symbian/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -109,11 +103,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -168,17 +158,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -200,7 +179,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -240,20 +219,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -287,9 +259,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=system objpas macpas buildrtl endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=system objpas macpas buildrtl -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=system objpas macpas buildrtl endif @@ -392,9 +361,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=system objpas macpas buildrtl endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=system objpas macpas buildrtl -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=system objpas macpas buildrtl endif @@ -407,9 +373,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=system objpas macpas buildrtl endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=system objpas macpas buildrtl -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=system objpas macpas buildrtl endif @@ -428,21 +391,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=system objpas macpas buildrtl endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=system objpas macpas buildrtl -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=system objpas macpas buildrtl endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=system objpas macpas buildrtl -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=system objpas macpas buildrtl -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=system objpas macpas buildrtl -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=ctypes strings symbian endif @@ -461,9 +412,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_IMPLICITUNITS+=ctypes strings symbian endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_IMPLICITUNITS+=ctypes strings symbian -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_IMPLICITUNITS+=ctypes strings symbian endif @@ -566,9 +514,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_IMPLICITUNITS+=ctypes strings symbian endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_IMPLICITUNITS+=ctypes strings symbian -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_IMPLICITUNITS+=ctypes strings symbian endif @@ -581,9 +526,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_IMPLICITUNITS+=ctypes strings symbian endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_IMPLICITUNITS+=ctypes strings symbian -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_IMPLICITUNITS+=ctypes strings symbian endif @@ -602,21 +544,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_IMPLICITUNITS+=ctypes strings symbian endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_IMPLICITUNITS+=ctypes strings symbian -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_IMPLICITUNITS+=ctypes strings symbian endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_IMPLICITUNITS+=ctypes strings symbian -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_IMPLICITUNITS+=ctypes strings symbian -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_IMPLICITUNITS+=ctypes strings symbian -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) @@ -636,9 +566,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -741,9 +668,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -756,9 +680,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -777,21 +698,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -810,9 +719,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -915,9 +821,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -930,9 +833,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -951,21 +851,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1255,11 +1143,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1719,20 +1602,20 @@ TAREXT=.tar.gz endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1864,15 +1747,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/rtl/netwlibc/Makefile +++ fpc-2.2.2/fpcsrc/rtl/netwlibc/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -109,11 +103,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -168,17 +158,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -200,7 +179,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -240,20 +219,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -292,9 +264,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo lnfodwrf winsock heaptrc matrix nwsnut libc dos crt objects sysconst dynlibs initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem sockets ctypes endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo lnfodwrf winsock heaptrc matrix nwsnut libc dos crt objects sysconst dynlibs initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem sockets ctypes -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo lnfodwrf winsock heaptrc matrix nwsnut libc dos crt objects sysconst dynlibs initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem sockets ctypes endif @@ -397,9 +366,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo lnfodwrf winsock heaptrc matrix nwsnut libc dos crt objects sysconst dynlibs initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem sockets ctypes endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo lnfodwrf winsock heaptrc matrix nwsnut libc dos crt objects sysconst dynlibs initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem sockets ctypes -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo lnfodwrf winsock heaptrc matrix nwsnut libc dos crt objects sysconst dynlibs initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem sockets ctypes endif @@ -412,9 +378,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo lnfodwrf winsock heaptrc matrix nwsnut libc dos crt objects sysconst dynlibs initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem sockets ctypes endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo lnfodwrf winsock heaptrc matrix nwsnut libc dos crt objects sysconst dynlibs initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem sockets ctypes -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo lnfodwrf winsock heaptrc matrix nwsnut libc dos crt objects sysconst dynlibs initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem sockets ctypes endif @@ -433,21 +396,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo lnfodwrf winsock heaptrc matrix nwsnut libc dos crt objects sysconst dynlibs initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem sockets ctypes endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo lnfodwrf winsock heaptrc matrix nwsnut libc dos crt objects sysconst dynlibs initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem sockets ctypes -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo lnfodwrf winsock heaptrc matrix nwsnut libc dos crt objects sysconst dynlibs initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem sockets ctypes endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo lnfodwrf winsock heaptrc matrix nwsnut libc dos crt objects sysconst dynlibs initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem sockets ctypes -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo lnfodwrf winsock heaptrc matrix nwsnut libc dos crt objects sysconst dynlibs initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem sockets ctypes -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo lnfodwrf winsock heaptrc matrix nwsnut libc dos crt objects sysconst dynlibs initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem sockets ctypes -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -466,9 +417,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -571,9 +519,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -586,9 +531,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -607,21 +549,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_IMPLICITUNITS+=exeinfo -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_IMPLICITUNITS+=exeinfo -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=nwplibc nwl_main nwl_dlle endif @@ -640,9 +570,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_LOADERS+=nwplibc nwl_main nwl_dlle endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_LOADERS+=nwplibc nwl_main nwl_dlle -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_LOADERS+=nwplibc nwl_main nwl_dlle endif @@ -745,9 +672,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_LOADERS+=nwplibc nwl_main nwl_dlle endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_LOADERS+=nwplibc nwl_main nwl_dlle -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_LOADERS+=nwplibc nwl_main nwl_dlle endif @@ -760,9 +684,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_LOADERS+=nwplibc nwl_main nwl_dlle endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_LOADERS+=nwplibc nwl_main nwl_dlle -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_LOADERS+=nwplibc nwl_main nwl_dlle endif @@ -781,21 +702,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_LOADERS+=nwplibc nwl_main nwl_dlle endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_LOADERS+=nwplibc nwl_main nwl_dlle -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_LOADERS+=nwplibc nwl_main nwl_dlle endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_LOADERS+=nwplibc nwl_main nwl_dlle -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_LOADERS+=nwplibc nwl_main nwl_dlle -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_LOADERS+=nwplibc nwl_main nwl_dlle -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=math varutils variants convutils typinfo classes dateutils sysconst rtlconsts system endif @@ -814,9 +723,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=math varutils variants convutils typinfo classes dateutils sysconst rtlconsts system endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=math varutils variants convutils typinfo classes dateutils sysconst rtlconsts system -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=math varutils variants convutils typinfo classes dateutils sysconst rtlconsts system endif @@ -919,9 +825,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=math varutils variants convutils typinfo classes dateutils sysconst rtlconsts system endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=math varutils variants convutils typinfo classes dateutils sysconst rtlconsts system -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=math varutils variants convutils typinfo classes dateutils sysconst rtlconsts system endif @@ -934,9 +837,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=math varutils variants convutils typinfo classes dateutils sysconst rtlconsts system endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=math varutils variants convutils typinfo classes dateutils sysconst rtlconsts system -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=math varutils variants convutils typinfo classes dateutils sysconst rtlconsts system endif @@ -955,21 +855,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=math varutils variants convutils typinfo classes dateutils sysconst rtlconsts system endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=math varutils variants convutils typinfo classes dateutils sysconst rtlconsts system -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=math varutils variants convutils typinfo classes dateutils sysconst rtlconsts system endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=math varutils variants convutils typinfo classes dateutils sysconst rtlconsts system -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=math varutils variants convutils typinfo classes dateutils sysconst rtlconsts system -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=math varutils variants convutils typinfo classes dateutils sysconst rtlconsts system -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) @@ -989,9 +877,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -1094,9 +979,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -1109,9 +991,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -1130,21 +1009,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1163,9 +1030,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1268,9 +1132,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1283,9 +1144,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1304,21 +1162,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1608,11 +1454,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -2072,20 +1913,20 @@ TAREXT=.tar.gz endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2217,13 +2058,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_loaders ifneq ($(TARGET_LOADERS),) override ALLTARGET+=fpc_loaders @@ -2252,7 +2089,7 @@ $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR) endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/rtl/go32v2/Makefile +++ fpc-2.2.2/fpcsrc/rtl/go32v2/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -110,11 +104,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -169,17 +159,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -201,7 +180,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -241,20 +220,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -295,9 +267,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=system objpas macpas strings go32 dpmiexcp initc ports profile dxetype dxeload emu387 dos crt objects printer sysutils classes math typinfo matrix cpu mmx ucomplex getopts heaptrc lineinfo lnfodwrf ctypes fgl msmouse charset varutils video mouse keyboard variants vesamode types fmtbcd sysconst rtlconst dateutil convutil strutils endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=system objpas macpas strings go32 dpmiexcp initc ports profile dxetype dxeload emu387 dos crt objects printer sysutils classes math typinfo matrix cpu mmx ucomplex getopts heaptrc lineinfo lnfodwrf ctypes fgl msmouse charset varutils video mouse keyboard variants vesamode types fmtbcd sysconst rtlconst dateutil convutil strutils -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=system objpas macpas strings go32 dpmiexcp initc ports profile dxetype dxeload emu387 dos crt objects printer sysutils classes math typinfo matrix cpu mmx ucomplex getopts heaptrc lineinfo lnfodwrf ctypes fgl msmouse charset varutils video mouse keyboard variants vesamode types fmtbcd sysconst rtlconst dateutil convutil strutils endif @@ -400,9 +369,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=system objpas macpas strings go32 dpmiexcp initc ports profile dxetype dxeload emu387 dos crt objects printer sysutils classes math typinfo matrix cpu mmx ucomplex getopts heaptrc lineinfo lnfodwrf ctypes fgl msmouse charset varutils video mouse keyboard variants vesamode types fmtbcd sysconst rtlconst dateutil convutil strutils endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=system objpas macpas strings go32 dpmiexcp initc ports profile dxetype dxeload emu387 dos crt objects printer sysutils classes math typinfo matrix cpu mmx ucomplex getopts heaptrc lineinfo lnfodwrf ctypes fgl msmouse charset varutils video mouse keyboard variants vesamode types fmtbcd sysconst rtlconst dateutil convutil strutils -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=system objpas macpas strings go32 dpmiexcp initc ports profile dxetype dxeload emu387 dos crt objects printer sysutils classes math typinfo matrix cpu mmx ucomplex getopts heaptrc lineinfo lnfodwrf ctypes fgl msmouse charset varutils video mouse keyboard variants vesamode types fmtbcd sysconst rtlconst dateutil convutil strutils endif @@ -415,9 +381,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=system objpas macpas strings go32 dpmiexcp initc ports profile dxetype dxeload emu387 dos crt objects printer sysutils classes math typinfo matrix cpu mmx ucomplex getopts heaptrc lineinfo lnfodwrf ctypes fgl msmouse charset varutils video mouse keyboard variants vesamode types fmtbcd sysconst rtlconst dateutil convutil strutils endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=system objpas macpas strings go32 dpmiexcp initc ports profile dxetype dxeload emu387 dos crt objects printer sysutils classes math typinfo matrix cpu mmx ucomplex getopts heaptrc lineinfo lnfodwrf ctypes fgl msmouse charset varutils video mouse keyboard variants vesamode types fmtbcd sysconst rtlconst dateutil convutil strutils -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=system objpas macpas strings go32 dpmiexcp initc ports profile dxetype dxeload emu387 dos crt objects printer sysutils classes math typinfo matrix cpu mmx ucomplex getopts heaptrc lineinfo lnfodwrf ctypes fgl msmouse charset varutils video mouse keyboard variants vesamode types fmtbcd sysconst rtlconst dateutil convutil strutils endif @@ -436,21 +399,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=system objpas macpas strings go32 dpmiexcp initc ports profile dxetype dxeload emu387 dos crt objects printer sysutils classes math typinfo matrix cpu mmx ucomplex getopts heaptrc lineinfo lnfodwrf ctypes fgl msmouse charset varutils video mouse keyboard variants vesamode types fmtbcd sysconst rtlconst dateutil convutil strutils endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=system objpas macpas strings go32 dpmiexcp initc ports profile dxetype dxeload emu387 dos crt objects printer sysutils classes math typinfo matrix cpu mmx ucomplex getopts heaptrc lineinfo lnfodwrf ctypes fgl msmouse charset varutils video mouse keyboard variants vesamode types fmtbcd sysconst rtlconst dateutil convutil strutils -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=system objpas macpas strings go32 dpmiexcp initc ports profile dxetype dxeload emu387 dos crt objects printer sysutils classes math typinfo matrix cpu mmx ucomplex getopts heaptrc lineinfo lnfodwrf ctypes fgl msmouse charset varutils video mouse keyboard variants vesamode types fmtbcd sysconst rtlconst dateutil convutil strutils endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=system objpas macpas strings go32 dpmiexcp initc ports profile dxetype dxeload emu387 dos crt objects printer sysutils classes math typinfo matrix cpu mmx ucomplex getopts heaptrc lineinfo lnfodwrf ctypes fgl msmouse charset varutils video mouse keyboard variants vesamode types fmtbcd sysconst rtlconst dateutil convutil strutils -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=system objpas macpas strings go32 dpmiexcp initc ports profile dxetype dxeload emu387 dos crt objects printer sysutils classes math typinfo matrix cpu mmx ucomplex getopts heaptrc lineinfo lnfodwrf ctypes fgl msmouse charset varutils video mouse keyboard variants vesamode types fmtbcd sysconst rtlconst dateutil convutil strutils -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=system objpas macpas strings go32 dpmiexcp initc ports profile dxetype dxeload emu387 dos crt objects printer sysutils classes math typinfo matrix cpu mmx ucomplex getopts heaptrc lineinfo lnfodwrf ctypes fgl msmouse charset varutils video mouse keyboard variants vesamode types fmtbcd sysconst rtlconst dateutil convutil strutils -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -469,9 +420,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -574,9 +522,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -589,9 +534,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -610,21 +552,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_IMPLICITUNITS+=exeinfo -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_IMPLICITUNITS+=exeinfo -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=prt0 exceptn fpu endif @@ -643,9 +573,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_LOADERS+=prt0 exceptn fpu endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_LOADERS+=prt0 exceptn fpu -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_LOADERS+=prt0 exceptn fpu endif @@ -748,9 +675,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_LOADERS+=prt0 exceptn fpu endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_LOADERS+=prt0 exceptn fpu -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_LOADERS+=prt0 exceptn fpu endif @@ -763,9 +687,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_LOADERS+=prt0 exceptn fpu endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_LOADERS+=prt0 exceptn fpu -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_LOADERS+=prt0 exceptn fpu endif @@ -784,21 +705,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_LOADERS+=prt0 exceptn fpu endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_LOADERS+=prt0 exceptn fpu -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_LOADERS+=prt0 exceptn fpu endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_LOADERS+=prt0 exceptn fpu -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_LOADERS+=prt0 exceptn fpu -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_LOADERS+=prt0 exceptn fpu -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=math varutils typinfo classes variants dateutil sysconst endif @@ -817,9 +726,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=math varutils typinfo classes variants dateutil sysconst endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=math varutils typinfo classes variants dateutil sysconst -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=math varutils typinfo classes variants dateutil sysconst endif @@ -922,9 +828,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=math varutils typinfo classes variants dateutil sysconst endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=math varutils typinfo classes variants dateutil sysconst -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=math varutils typinfo classes variants dateutil sysconst endif @@ -937,9 +840,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=math varutils typinfo classes variants dateutil sysconst endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=math varutils typinfo classes variants dateutil sysconst -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=math varutils typinfo classes variants dateutil sysconst endif @@ -958,21 +858,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=math varutils typinfo classes variants dateutil sysconst endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=math varutils typinfo classes variants dateutil sysconst -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=math varutils typinfo classes variants dateutil sysconst endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=math varutils typinfo classes variants dateutil sysconst -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=math varutils typinfo classes variants dateutil sysconst -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=math varutils typinfo classes variants dateutil sysconst -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) @@ -992,9 +880,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -1097,9 +982,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -1112,9 +994,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -1133,21 +1012,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1166,9 +1033,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1271,9 +1135,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1286,9 +1147,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1307,21 +1165,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1611,11 +1457,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -2075,20 +1916,20 @@ TAREXT=.tar.gz endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2220,13 +2061,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_loaders ifneq ($(TARGET_LOADERS),) override ALLTARGET+=fpc_loaders @@ -2255,7 +2092,7 @@ $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR) endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/rtl/win32/Makefile +++ fpc-2.2.2/fpcsrc/rtl/win32/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -109,11 +103,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -168,17 +158,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -200,7 +179,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -240,20 +219,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -295,9 +267,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=system objpas macpas buildrtl endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=system objpas macpas buildrtl -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=system objpas macpas buildrtl endif @@ -400,9 +369,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=system objpas macpas buildrtl endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=system objpas macpas buildrtl -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=system objpas macpas buildrtl endif @@ -415,9 +381,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=system objpas macpas buildrtl endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=system objpas macpas buildrtl -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=system objpas macpas buildrtl endif @@ -436,21 +399,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=system objpas macpas buildrtl endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=system objpas macpas buildrtl -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=system objpas macpas buildrtl endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=system objpas macpas buildrtl -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=system objpas macpas buildrtl -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=system objpas macpas buildrtl -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=sysinitpas sysinitcyg sysinitgprof ctypes strings lineinfo lnfodwrf heaptrc matrix windows winsock winsock2 initc cmem dynlibs signals dos crt objects messages rtlconsts sysconst sysutils math types strutils dateutils varutils variants typinfo fgl classes convutils stdconvs cpu mmx charset ucomplex getopts winevent sockets printer video mouse keyboard fmtbcd winsysut sharemem exeinfo endif @@ -469,9 +420,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_IMPLICITUNITS+=sysinitpas sysinitcyg sysinitgprof ctypes strings lineinfo lnfodwrf heaptrc matrix windows winsock winsock2 initc cmem dynlibs signals dos crt objects messages rtlconsts sysconst sysutils math types strutils dateutils varutils variants typinfo fgl classes convutils stdconvs cpu mmx charset ucomplex getopts winevent sockets printer video mouse keyboard fmtbcd winsysut sharemem exeinfo endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_IMPLICITUNITS+=sysinitpas sysinitcyg sysinitgprof ctypes strings lineinfo lnfodwrf heaptrc matrix windows winsock winsock2 initc cmem dynlibs signals dos crt objects messages rtlconsts sysconst sysutils math types strutils dateutils varutils variants typinfo fgl classes convutils stdconvs cpu mmx charset ucomplex getopts winevent sockets printer video mouse keyboard fmtbcd winsysut sharemem exeinfo -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_IMPLICITUNITS+=sysinitpas sysinitcyg sysinitgprof ctypes strings lineinfo lnfodwrf heaptrc matrix windows winsock winsock2 initc cmem dynlibs signals dos crt objects messages rtlconsts sysconst sysutils math types strutils dateutils varutils variants typinfo fgl classes convutils stdconvs cpu mmx charset ucomplex getopts winevent sockets printer video mouse keyboard fmtbcd winsysut sharemem exeinfo endif @@ -574,9 +522,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_IMPLICITUNITS+=sysinitpas sysinitcyg sysinitgprof ctypes strings lineinfo lnfodwrf heaptrc matrix windows winsock winsock2 initc cmem dynlibs signals dos crt objects messages rtlconsts sysconst sysutils math types strutils dateutils varutils variants typinfo fgl classes convutils stdconvs cpu mmx charset ucomplex getopts winevent sockets printer video mouse keyboard fmtbcd winsysut sharemem exeinfo endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_IMPLICITUNITS+=sysinitpas sysinitcyg sysinitgprof ctypes strings lineinfo lnfodwrf heaptrc matrix windows winsock winsock2 initc cmem dynlibs signals dos crt objects messages rtlconsts sysconst sysutils math types strutils dateutils varutils variants typinfo fgl classes convutils stdconvs cpu mmx charset ucomplex getopts winevent sockets printer video mouse keyboard fmtbcd winsysut sharemem exeinfo -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_IMPLICITUNITS+=sysinitpas sysinitcyg sysinitgprof ctypes strings lineinfo lnfodwrf heaptrc matrix windows winsock winsock2 initc cmem dynlibs signals dos crt objects messages rtlconsts sysconst sysutils math types strutils dateutils varutils variants typinfo fgl classes convutils stdconvs cpu mmx charset ucomplex getopts winevent sockets printer video mouse keyboard fmtbcd winsysut sharemem exeinfo endif @@ -589,9 +534,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_IMPLICITUNITS+=sysinitpas sysinitcyg sysinitgprof ctypes strings lineinfo lnfodwrf heaptrc matrix windows winsock winsock2 initc cmem dynlibs signals dos crt objects messages rtlconsts sysconst sysutils math types strutils dateutils varutils variants typinfo fgl classes convutils stdconvs cpu mmx charset ucomplex getopts winevent sockets printer video mouse keyboard fmtbcd winsysut sharemem exeinfo endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_IMPLICITUNITS+=sysinitpas sysinitcyg sysinitgprof ctypes strings lineinfo lnfodwrf heaptrc matrix windows winsock winsock2 initc cmem dynlibs signals dos crt objects messages rtlconsts sysconst sysutils math types strutils dateutils varutils variants typinfo fgl classes convutils stdconvs cpu mmx charset ucomplex getopts winevent sockets printer video mouse keyboard fmtbcd winsysut sharemem exeinfo -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_IMPLICITUNITS+=sysinitpas sysinitcyg sysinitgprof ctypes strings lineinfo lnfodwrf heaptrc matrix windows winsock winsock2 initc cmem dynlibs signals dos crt objects messages rtlconsts sysconst sysutils math types strutils dateutils varutils variants typinfo fgl classes convutils stdconvs cpu mmx charset ucomplex getopts winevent sockets printer video mouse keyboard fmtbcd winsysut sharemem exeinfo endif @@ -610,21 +552,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_IMPLICITUNITS+=sysinitpas sysinitcyg sysinitgprof ctypes strings lineinfo lnfodwrf heaptrc matrix windows winsock winsock2 initc cmem dynlibs signals dos crt objects messages rtlconsts sysconst sysutils math types strutils dateutils varutils variants typinfo fgl classes convutils stdconvs cpu mmx charset ucomplex getopts winevent sockets printer video mouse keyboard fmtbcd winsysut sharemem exeinfo endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_IMPLICITUNITS+=sysinitpas sysinitcyg sysinitgprof ctypes strings lineinfo lnfodwrf heaptrc matrix windows winsock winsock2 initc cmem dynlibs signals dos crt objects messages rtlconsts sysconst sysutils math types strutils dateutils varutils variants typinfo fgl classes convutils stdconvs cpu mmx charset ucomplex getopts winevent sockets printer video mouse keyboard fmtbcd winsysut sharemem exeinfo -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_IMPLICITUNITS+=sysinitpas sysinitcyg sysinitgprof ctypes strings lineinfo lnfodwrf heaptrc matrix windows winsock winsock2 initc cmem dynlibs signals dos crt objects messages rtlconsts sysconst sysutils math types strutils dateutils varutils variants typinfo fgl classes convutils stdconvs cpu mmx charset ucomplex getopts winevent sockets printer video mouse keyboard fmtbcd winsysut sharemem exeinfo endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_IMPLICITUNITS+=sysinitpas sysinitcyg sysinitgprof ctypes strings lineinfo lnfodwrf heaptrc matrix windows winsock winsock2 initc cmem dynlibs signals dos crt objects messages rtlconsts sysconst sysutils math types strutils dateutils varutils variants typinfo fgl classes convutils stdconvs cpu mmx charset ucomplex getopts winevent sockets printer video mouse keyboard fmtbcd winsysut sharemem exeinfo -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_IMPLICITUNITS+=sysinitpas sysinitcyg sysinitgprof ctypes strings lineinfo lnfodwrf heaptrc matrix windows winsock winsock2 initc cmem dynlibs signals dos crt objects messages rtlconsts sysconst sysutils math types strutils dateutils varutils variants typinfo fgl classes convutils stdconvs cpu mmx charset ucomplex getopts winevent sockets printer video mouse keyboard fmtbcd winsysut sharemem exeinfo -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_IMPLICITUNITS+=sysinitpas sysinitcyg sysinitgprof ctypes strings lineinfo lnfodwrf heaptrc matrix windows winsock winsock2 initc cmem dynlibs signals dos crt objects messages rtlconsts sysconst sysutils math types strutils dateutils varutils variants typinfo fgl classes convutils stdconvs cpu mmx charset ucomplex getopts winevent sockets printer video mouse keyboard fmtbcd winsysut sharemem exeinfo -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=$(LOADERS) endif @@ -643,9 +573,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_LOADERS+=$(LOADERS) endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_LOADERS+=$(LOADERS) -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_LOADERS+=$(LOADERS) endif @@ -748,9 +675,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_LOADERS+=$(LOADERS) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_LOADERS+=$(LOADERS) -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_LOADERS+=$(LOADERS) endif @@ -763,9 +687,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_LOADERS+=$(LOADERS) endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_LOADERS+=$(LOADERS) -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_LOADERS+=$(LOADERS) endif @@ -784,21 +705,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_LOADERS+=$(LOADERS) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_LOADERS+=$(LOADERS) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_LOADERS+=$(LOADERS) endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_LOADERS+=$(LOADERS) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_LOADERS+=$(LOADERS) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_LOADERS+=$(LOADERS) -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst endif @@ -817,9 +726,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst endif @@ -922,9 +828,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst endif @@ -937,9 +840,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst endif @@ -958,21 +858,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) @@ -992,9 +880,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif @@ -1097,9 +982,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif @@ -1112,9 +994,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif @@ -1133,21 +1012,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) endif @@ -1166,9 +1033,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) endif @@ -1271,9 +1135,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) endif @@ -1286,9 +1147,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) endif @@ -1307,21 +1165,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1611,11 +1457,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -2075,20 +1916,20 @@ TAREXT=.tar.gz endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2220,13 +2061,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_loaders ifneq ($(TARGET_LOADERS),) override ALLTARGET+=fpc_loaders @@ -2255,7 +2092,7 @@ $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR) endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/rtl/emx/Makefile +++ fpc-2.2.2/fpcsrc/rtl/emx/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -110,11 +104,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -169,17 +159,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -201,7 +180,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -241,20 +220,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -295,9 +267,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils classes fgl math typinfo varutils winsock fmtbcd charset ucomplex cpu mmx getopts heaptrc lnfodwrf lineinfo dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil ctypes endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils classes fgl math typinfo varutils winsock fmtbcd charset ucomplex cpu mmx getopts heaptrc lnfodwrf lineinfo dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil ctypes -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils classes fgl math typinfo varutils winsock fmtbcd charset ucomplex cpu mmx getopts heaptrc lnfodwrf lineinfo dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil ctypes endif @@ -400,9 +369,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils classes fgl math typinfo varutils winsock fmtbcd charset ucomplex cpu mmx getopts heaptrc lnfodwrf lineinfo dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil ctypes endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils classes fgl math typinfo varutils winsock fmtbcd charset ucomplex cpu mmx getopts heaptrc lnfodwrf lineinfo dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil ctypes -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils classes fgl math typinfo varutils winsock fmtbcd charset ucomplex cpu mmx getopts heaptrc lnfodwrf lineinfo dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil ctypes endif @@ -415,9 +381,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils classes fgl math typinfo varutils winsock fmtbcd charset ucomplex cpu mmx getopts heaptrc lnfodwrf lineinfo dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil ctypes endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils classes fgl math typinfo varutils winsock fmtbcd charset ucomplex cpu mmx getopts heaptrc lnfodwrf lineinfo dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil ctypes -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils classes fgl math typinfo varutils winsock fmtbcd charset ucomplex cpu mmx getopts heaptrc lnfodwrf lineinfo dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil ctypes endif @@ -436,21 +399,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils classes fgl math typinfo varutils winsock fmtbcd charset ucomplex cpu mmx getopts heaptrc lnfodwrf lineinfo dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil ctypes endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils classes fgl math typinfo varutils winsock fmtbcd charset ucomplex cpu mmx getopts heaptrc lnfodwrf lineinfo dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil ctypes -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils classes fgl math typinfo varutils winsock fmtbcd charset ucomplex cpu mmx getopts heaptrc lnfodwrf lineinfo dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil ctypes endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils classes fgl math typinfo varutils winsock fmtbcd charset ucomplex cpu mmx getopts heaptrc lnfodwrf lineinfo dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil ctypes -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils classes fgl math typinfo varutils winsock fmtbcd charset ucomplex cpu mmx getopts heaptrc lnfodwrf lineinfo dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil ctypes -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils classes fgl math typinfo varutils winsock fmtbcd charset ucomplex cpu mmx getopts heaptrc lnfodwrf lineinfo dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil ctypes -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -469,9 +420,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -574,9 +522,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -589,9 +534,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -610,21 +552,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_IMPLICITUNITS+=exeinfo -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_IMPLICITUNITS+=exeinfo -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=prt0 prt1 endif @@ -643,9 +573,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_LOADERS+=prt0 prt1 endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_LOADERS+=prt0 prt1 -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_LOADERS+=prt0 prt1 endif @@ -748,9 +675,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_LOADERS+=prt0 prt1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_LOADERS+=prt0 prt1 -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_LOADERS+=prt0 prt1 endif @@ -763,9 +687,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_LOADERS+=prt0 prt1 endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_LOADERS+=prt0 prt1 -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_LOADERS+=prt0 prt1 endif @@ -784,21 +705,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_LOADERS+=prt0 prt1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_LOADERS+=prt0 prt1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_LOADERS+=prt0 prt1 endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_LOADERS+=prt0 prt1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_LOADERS+=prt0 prt1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_LOADERS+=prt0 prt1 -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil endif @@ -817,9 +726,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil endif @@ -922,9 +828,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil endif @@ -937,9 +840,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil endif @@ -958,21 +858,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(OS2INC) @@ -992,9 +880,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(OS2INC) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(OS2INC) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(OS2INC) endif @@ -1097,9 +982,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(OS2INC) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(OS2INC) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(OS2INC) endif @@ -1112,9 +994,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(OS2INC) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(OS2INC) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(OS2INC) endif @@ -1133,21 +1012,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(OS2INC) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(OS2INC) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(OS2INC) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(OS2INC) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(OS2INC) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(OS2INC) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(OS2INC) endif @@ -1166,9 +1033,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(OS2INC) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(OS2INC) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(OS2INC) endif @@ -1271,9 +1135,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(OS2INC) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(OS2INC) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(OS2INC) endif @@ -1286,9 +1147,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(OS2INC) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(OS2INC) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(OS2INC) endif @@ -1307,21 +1165,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(OS2INC) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(OS2INC) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(OS2INC) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(OS2INC) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(OS2INC) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(OS2INC) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1611,11 +1457,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -2075,20 +1916,20 @@ TAREXT=.tar.gz endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2220,13 +2061,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_loaders ifneq ($(TARGET_LOADERS),) override ALLTARGET+=fpc_loaders @@ -2255,7 +2092,7 @@ $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR) endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/rtl/win64/Makefile +++ fpc-2.2.2/fpcsrc/rtl/win64/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -109,11 +103,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -168,17 +158,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -200,7 +179,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -240,20 +219,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -291,9 +263,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=system objpas macpas buildrtl endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=system objpas macpas buildrtl -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=system objpas macpas buildrtl endif @@ -396,9 +365,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=system objpas macpas buildrtl endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=system objpas macpas buildrtl -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=system objpas macpas buildrtl endif @@ -411,9 +377,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=system objpas macpas buildrtl endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=system objpas macpas buildrtl -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=system objpas macpas buildrtl endif @@ -432,21 +395,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=system objpas macpas buildrtl endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=system objpas macpas buildrtl -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=system objpas macpas buildrtl endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=system objpas macpas buildrtl -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=system objpas macpas buildrtl -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=system objpas macpas buildrtl -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=ctypes strings lineinfo lnfodwrf heaptrc matrix dos crt objects messages windows winsock winsock2 cmem dynlibs rtlconsts sysconst sysutils math types strutils convutils dateutils varutils variants typinfo fgl classes getopts stdconvs sockets printer charset ucomplex fmtbcd winevent video mouse keyboard sharemem exeinfo endif @@ -465,9 +416,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_IMPLICITUNITS+=ctypes strings lineinfo lnfodwrf heaptrc matrix dos crt objects messages windows winsock winsock2 cmem dynlibs rtlconsts sysconst sysutils math types strutils convutils dateutils varutils variants typinfo fgl classes getopts stdconvs sockets printer charset ucomplex fmtbcd winevent video mouse keyboard sharemem exeinfo endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_IMPLICITUNITS+=ctypes strings lineinfo lnfodwrf heaptrc matrix dos crt objects messages windows winsock winsock2 cmem dynlibs rtlconsts sysconst sysutils math types strutils convutils dateutils varutils variants typinfo fgl classes getopts stdconvs sockets printer charset ucomplex fmtbcd winevent video mouse keyboard sharemem exeinfo -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_IMPLICITUNITS+=ctypes strings lineinfo lnfodwrf heaptrc matrix dos crt objects messages windows winsock winsock2 cmem dynlibs rtlconsts sysconst sysutils math types strutils convutils dateutils varutils variants typinfo fgl classes getopts stdconvs sockets printer charset ucomplex fmtbcd winevent video mouse keyboard sharemem exeinfo endif @@ -570,9 +518,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_IMPLICITUNITS+=ctypes strings lineinfo lnfodwrf heaptrc matrix dos crt objects messages windows winsock winsock2 cmem dynlibs rtlconsts sysconst sysutils math types strutils convutils dateutils varutils variants typinfo fgl classes getopts stdconvs sockets printer charset ucomplex fmtbcd winevent video mouse keyboard sharemem exeinfo endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_IMPLICITUNITS+=ctypes strings lineinfo lnfodwrf heaptrc matrix dos crt objects messages windows winsock winsock2 cmem dynlibs rtlconsts sysconst sysutils math types strutils convutils dateutils varutils variants typinfo fgl classes getopts stdconvs sockets printer charset ucomplex fmtbcd winevent video mouse keyboard sharemem exeinfo -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_IMPLICITUNITS+=ctypes strings lineinfo lnfodwrf heaptrc matrix dos crt objects messages windows winsock winsock2 cmem dynlibs rtlconsts sysconst sysutils math types strutils convutils dateutils varutils variants typinfo fgl classes getopts stdconvs sockets printer charset ucomplex fmtbcd winevent video mouse keyboard sharemem exeinfo endif @@ -585,9 +530,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_IMPLICITUNITS+=ctypes strings lineinfo lnfodwrf heaptrc matrix dos crt objects messages windows winsock winsock2 cmem dynlibs rtlconsts sysconst sysutils math types strutils convutils dateutils varutils variants typinfo fgl classes getopts stdconvs sockets printer charset ucomplex fmtbcd winevent video mouse keyboard sharemem exeinfo endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_IMPLICITUNITS+=ctypes strings lineinfo lnfodwrf heaptrc matrix dos crt objects messages windows winsock winsock2 cmem dynlibs rtlconsts sysconst sysutils math types strutils convutils dateutils varutils variants typinfo fgl classes getopts stdconvs sockets printer charset ucomplex fmtbcd winevent video mouse keyboard sharemem exeinfo -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_IMPLICITUNITS+=ctypes strings lineinfo lnfodwrf heaptrc matrix dos crt objects messages windows winsock winsock2 cmem dynlibs rtlconsts sysconst sysutils math types strutils convutils dateutils varutils variants typinfo fgl classes getopts stdconvs sockets printer charset ucomplex fmtbcd winevent video mouse keyboard sharemem exeinfo endif @@ -606,21 +548,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_IMPLICITUNITS+=ctypes strings lineinfo lnfodwrf heaptrc matrix dos crt objects messages windows winsock winsock2 cmem dynlibs rtlconsts sysconst sysutils math types strutils convutils dateutils varutils variants typinfo fgl classes getopts stdconvs sockets printer charset ucomplex fmtbcd winevent video mouse keyboard sharemem exeinfo endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_IMPLICITUNITS+=ctypes strings lineinfo lnfodwrf heaptrc matrix dos crt objects messages windows winsock winsock2 cmem dynlibs rtlconsts sysconst sysutils math types strutils convutils dateutils varutils variants typinfo fgl classes getopts stdconvs sockets printer charset ucomplex fmtbcd winevent video mouse keyboard sharemem exeinfo -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_IMPLICITUNITS+=ctypes strings lineinfo lnfodwrf heaptrc matrix dos crt objects messages windows winsock winsock2 cmem dynlibs rtlconsts sysconst sysutils math types strutils convutils dateutils varutils variants typinfo fgl classes getopts stdconvs sockets printer charset ucomplex fmtbcd winevent video mouse keyboard sharemem exeinfo endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_IMPLICITUNITS+=ctypes strings lineinfo lnfodwrf heaptrc matrix dos crt objects messages windows winsock winsock2 cmem dynlibs rtlconsts sysconst sysutils math types strutils convutils dateutils varutils variants typinfo fgl classes getopts stdconvs sockets printer charset ucomplex fmtbcd winevent video mouse keyboard sharemem exeinfo -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_IMPLICITUNITS+=ctypes strings lineinfo lnfodwrf heaptrc matrix dos crt objects messages windows winsock winsock2 cmem dynlibs rtlconsts sysconst sysutils math types strutils convutils dateutils varutils variants typinfo fgl classes getopts stdconvs sockets printer charset ucomplex fmtbcd winevent video mouse keyboard sharemem exeinfo -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_IMPLICITUNITS+=ctypes strings lineinfo lnfodwrf heaptrc matrix dos crt objects messages windows winsock winsock2 cmem dynlibs rtlconsts sysconst sysutils math types strutils convutils dateutils varutils variants typinfo fgl classes getopts stdconvs sockets printer charset ucomplex fmtbcd winevent video mouse keyboard sharemem exeinfo -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=$(LOADERS) endif @@ -639,9 +569,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_LOADERS+=$(LOADERS) endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_LOADERS+=$(LOADERS) -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_LOADERS+=$(LOADERS) endif @@ -744,9 +671,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_LOADERS+=$(LOADERS) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_LOADERS+=$(LOADERS) -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_LOADERS+=$(LOADERS) endif @@ -759,9 +683,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_LOADERS+=$(LOADERS) endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_LOADERS+=$(LOADERS) -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_LOADERS+=$(LOADERS) endif @@ -780,21 +701,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_LOADERS+=$(LOADERS) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_LOADERS+=$(LOADERS) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_LOADERS+=$(LOADERS) endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_LOADERS+=$(LOADERS) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_LOADERS+=$(LOADERS) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_LOADERS+=$(LOADERS) -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst endif @@ -813,9 +722,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst endif @@ -918,9 +824,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst endif @@ -933,9 +836,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst endif @@ -954,21 +854,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) @@ -988,9 +876,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -1093,9 +978,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -1108,9 +990,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -1129,21 +1008,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) endif @@ -1162,9 +1029,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) endif @@ -1267,9 +1131,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) endif @@ -1282,9 +1143,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) endif @@ -1303,21 +1161,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1607,11 +1453,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -2071,20 +1912,20 @@ TAREXT=.tar.gz endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2216,13 +2057,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_loaders ifneq ($(TARGET_LOADERS),) override ALLTARGET+=fpc_loaders @@ -2251,7 +2088,7 @@ $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR) endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/rtl/beos/Makefile +++ fpc-2.2.2/fpcsrc/rtl/beos/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -110,11 +104,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -169,17 +159,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -201,7 +180,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -241,20 +220,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -291,9 +263,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=system baseunix unixtype ctypes objpas macpas strings errors dos dl objects sysconst sysutils types charset ucomplex typinfo classes fgl math varutils cpu mmx getopts heaptrc lineinfo lnfodwrf variants rtlconsts syscall unix unixutil strutils termio initc cmem crt video mouse keyboard dateutils fmtbcd sockets dynlibs cwstring endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=system baseunix unixtype ctypes objpas macpas strings errors dos dl objects sysconst sysutils types charset ucomplex typinfo classes fgl math varutils cpu mmx getopts heaptrc lineinfo lnfodwrf variants rtlconsts syscall unix unixutil strutils termio initc cmem crt video mouse keyboard dateutils fmtbcd sockets dynlibs cwstring -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=system baseunix unixtype ctypes objpas macpas strings errors dos dl objects sysconst sysutils types charset ucomplex typinfo classes fgl math varutils cpu mmx getopts heaptrc lineinfo lnfodwrf variants rtlconsts syscall unix unixutil strutils termio initc cmem crt video mouse keyboard dateutils fmtbcd sockets dynlibs cwstring endif @@ -396,9 +365,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=system baseunix unixtype ctypes objpas macpas strings errors dos dl objects sysconst sysutils types charset ucomplex typinfo classes fgl math varutils cpu mmx getopts heaptrc lineinfo lnfodwrf variants rtlconsts syscall unix unixutil strutils termio initc cmem crt video mouse keyboard dateutils fmtbcd sockets dynlibs cwstring endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=system baseunix unixtype ctypes objpas macpas strings errors dos dl objects sysconst sysutils types charset ucomplex typinfo classes fgl math varutils cpu mmx getopts heaptrc lineinfo lnfodwrf variants rtlconsts syscall unix unixutil strutils termio initc cmem crt video mouse keyboard dateutils fmtbcd sockets dynlibs cwstring -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=system baseunix unixtype ctypes objpas macpas strings errors dos dl objects sysconst sysutils types charset ucomplex typinfo classes fgl math varutils cpu mmx getopts heaptrc lineinfo lnfodwrf variants rtlconsts syscall unix unixutil strutils termio initc cmem crt video mouse keyboard dateutils fmtbcd sockets dynlibs cwstring endif @@ -411,9 +377,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=system baseunix unixtype ctypes objpas macpas strings errors dos dl objects sysconst sysutils types charset ucomplex typinfo classes fgl math varutils cpu mmx getopts heaptrc lineinfo lnfodwrf variants rtlconsts syscall unix unixutil strutils termio initc cmem crt video mouse keyboard dateutils fmtbcd sockets dynlibs cwstring endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=system baseunix unixtype ctypes objpas macpas strings errors dos dl objects sysconst sysutils types charset ucomplex typinfo classes fgl math varutils cpu mmx getopts heaptrc lineinfo lnfodwrf variants rtlconsts syscall unix unixutil strutils termio initc cmem crt video mouse keyboard dateutils fmtbcd sockets dynlibs cwstring -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=system baseunix unixtype ctypes objpas macpas strings errors dos dl objects sysconst sysutils types charset ucomplex typinfo classes fgl math varutils cpu mmx getopts heaptrc lineinfo lnfodwrf variants rtlconsts syscall unix unixutil strutils termio initc cmem crt video mouse keyboard dateutils fmtbcd sockets dynlibs cwstring endif @@ -432,21 +395,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=system baseunix unixtype ctypes objpas macpas strings errors dos dl objects sysconst sysutils types charset ucomplex typinfo classes fgl math varutils cpu mmx getopts heaptrc lineinfo lnfodwrf variants rtlconsts syscall unix unixutil strutils termio initc cmem crt video mouse keyboard dateutils fmtbcd sockets dynlibs cwstring endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=system baseunix unixtype ctypes objpas macpas strings errors dos dl objects sysconst sysutils types charset ucomplex typinfo classes fgl math varutils cpu mmx getopts heaptrc lineinfo lnfodwrf variants rtlconsts syscall unix unixutil strutils termio initc cmem crt video mouse keyboard dateutils fmtbcd sockets dynlibs cwstring -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=system baseunix unixtype ctypes objpas macpas strings errors dos dl objects sysconst sysutils types charset ucomplex typinfo classes fgl math varutils cpu mmx getopts heaptrc lineinfo lnfodwrf variants rtlconsts syscall unix unixutil strutils termio initc cmem crt video mouse keyboard dateutils fmtbcd sockets dynlibs cwstring endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=system baseunix unixtype ctypes objpas macpas strings errors dos dl objects sysconst sysutils types charset ucomplex typinfo classes fgl math varutils cpu mmx getopts heaptrc lineinfo lnfodwrf variants rtlconsts syscall unix unixutil strutils termio initc cmem crt video mouse keyboard dateutils fmtbcd sockets dynlibs cwstring -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=system baseunix unixtype ctypes objpas macpas strings errors dos dl objects sysconst sysutils types charset ucomplex typinfo classes fgl math varutils cpu mmx getopts heaptrc lineinfo lnfodwrf variants rtlconsts syscall unix unixutil strutils termio initc cmem crt video mouse keyboard dateutils fmtbcd sockets dynlibs cwstring -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=system baseunix unixtype ctypes objpas macpas strings errors dos dl objects sysconst sysutils types charset ucomplex typinfo classes fgl math varutils cpu mmx getopts heaptrc lineinfo lnfodwrf variants rtlconsts syscall unix unixutil strutils termio initc cmem crt video mouse keyboard dateutils fmtbcd sockets dynlibs cwstring -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -465,9 +416,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -570,9 +518,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -585,9 +530,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -606,21 +548,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_IMPLICITUNITS+=exeinfo -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_IMPLICITUNITS+=exeinfo -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=prt0 cprt0 func dllprt endif @@ -639,9 +569,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_LOADERS+=prt0 cprt0 func dllprt endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_LOADERS+=prt0 cprt0 func dllprt -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_LOADERS+=prt0 cprt0 func dllprt endif @@ -744,9 +671,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_LOADERS+=prt0 cprt0 func dllprt endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_LOADERS+=prt0 cprt0 func dllprt -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_LOADERS+=prt0 cprt0 func dllprt endif @@ -759,9 +683,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_LOADERS+=prt0 cprt0 func dllprt endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_LOADERS+=prt0 cprt0 func dllprt -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_LOADERS+=prt0 cprt0 func dllprt endif @@ -780,21 +701,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_LOADERS+=prt0 cprt0 func dllprt endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_LOADERS+=prt0 cprt0 func dllprt -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_LOADERS+=prt0 cprt0 func dllprt endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_LOADERS+=prt0 cprt0 func dllprt -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_LOADERS+=prt0 cprt0 func dllprt -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_LOADERS+=prt0 cprt0 func dllprt -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts dateutils endif @@ -813,9 +722,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts dateutils endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts dateutils -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts dateutils endif @@ -918,9 +824,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts dateutils endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts dateutils -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts dateutils endif @@ -933,9 +836,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts dateutils endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts dateutils -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts dateutils endif @@ -954,21 +854,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts dateutils endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts dateutils -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts dateutils endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts dateutils -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts dateutils -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts dateutils -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC) @@ -988,9 +876,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC) endif @@ -1093,9 +978,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC) endif @@ -1108,9 +990,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC) endif @@ -1129,21 +1008,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) endif @@ -1162,9 +1029,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) endif @@ -1267,9 +1131,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) endif @@ -1282,9 +1143,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) endif @@ -1303,21 +1161,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_TARGETDIR+=. endif @@ -1336,9 +1182,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_TARGETDIR+=. endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_TARGETDIR+=. -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_TARGETDIR+=. endif @@ -1441,9 +1284,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_TARGETDIR+=. endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_TARGETDIR+=. -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_TARGETDIR+=. endif @@ -1456,9 +1296,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_TARGETDIR+=. endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_TARGETDIR+=. -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_TARGETDIR+=. endif @@ -1477,21 +1314,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_TARGETDIR+=. endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_TARGETDIR+=. -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_TARGETDIR+=. endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_TARGETDIR+=. -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_TARGETDIR+=. -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_TARGETDIR+=. -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1781,11 +1606,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -2245,20 +2065,20 @@ TAREXT=.tar.gz endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2390,13 +2210,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_loaders ifneq ($(TARGET_LOADERS),) override ALLTARGET+=fpc_loaders @@ -2425,7 +2241,7 @@ $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR) endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/rtl/wince/Makefile +++ fpc-2.2.2/fpcsrc/rtl/wince/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -109,11 +103,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -168,17 +158,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -200,7 +179,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -240,20 +219,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -295,9 +267,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lineinfo lnfodwrf heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes strutils convutils math dateutils varutils variants fmtbcd matrix ucomplex charset getopts winsock winsock2 sockets cmem sharemem endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lineinfo lnfodwrf heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes strutils convutils math dateutils varutils variants fmtbcd matrix ucomplex charset getopts winsock winsock2 sockets cmem sharemem -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lineinfo lnfodwrf heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes strutils convutils math dateutils varutils variants fmtbcd matrix ucomplex charset getopts winsock winsock2 sockets cmem sharemem endif @@ -400,9 +369,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lineinfo lnfodwrf heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes strutils convutils math dateutils varutils variants fmtbcd matrix ucomplex charset getopts winsock winsock2 sockets cmem sharemem endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lineinfo lnfodwrf heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes strutils convutils math dateutils varutils variants fmtbcd matrix ucomplex charset getopts winsock winsock2 sockets cmem sharemem -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lineinfo lnfodwrf heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes strutils convutils math dateutils varutils variants fmtbcd matrix ucomplex charset getopts winsock winsock2 sockets cmem sharemem endif @@ -415,9 +381,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lineinfo lnfodwrf heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes strutils convutils math dateutils varutils variants fmtbcd matrix ucomplex charset getopts winsock winsock2 sockets cmem sharemem endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lineinfo lnfodwrf heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes strutils convutils math dateutils varutils variants fmtbcd matrix ucomplex charset getopts winsock winsock2 sockets cmem sharemem -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lineinfo lnfodwrf heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes strutils convutils math dateutils varutils variants fmtbcd matrix ucomplex charset getopts winsock winsock2 sockets cmem sharemem endif @@ -436,21 +399,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lineinfo lnfodwrf heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes strutils convutils math dateutils varutils variants fmtbcd matrix ucomplex charset getopts winsock winsock2 sockets cmem sharemem endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lineinfo lnfodwrf heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes strutils convutils math dateutils varutils variants fmtbcd matrix ucomplex charset getopts winsock winsock2 sockets cmem sharemem -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lineinfo lnfodwrf heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes strutils convutils math dateutils varutils variants fmtbcd matrix ucomplex charset getopts winsock winsock2 sockets cmem sharemem endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lineinfo lnfodwrf heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes strutils convutils math dateutils varutils variants fmtbcd matrix ucomplex charset getopts winsock winsock2 sockets cmem sharemem -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lineinfo lnfodwrf heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes strutils convutils math dateutils varutils variants fmtbcd matrix ucomplex charset getopts winsock winsock2 sockets cmem sharemem -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lineinfo lnfodwrf heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes strutils convutils math dateutils varutils variants fmtbcd matrix ucomplex charset getopts winsock winsock2 sockets cmem sharemem -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -469,9 +420,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -574,9 +522,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -589,9 +534,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -610,21 +552,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_IMPLICITUNITS+=exeinfo -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_IMPLICITUNITS+=exeinfo -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_IMPLICITUNITS+=exeinfo -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/win @@ -644,9 +574,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/win endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/win -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/win endif @@ -749,9 +676,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/win endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/win -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/win endif @@ -764,9 +688,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/win endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/win -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/win endif @@ -785,21 +706,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/win endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/win -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/win endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/win -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/win -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/win -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -818,9 +727,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -923,9 +829,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -938,9 +841,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -959,21 +859,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1263,11 +1151,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1727,20 +1610,20 @@ TAREXT=.tar.gz endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1872,15 +1755,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/rtl/freebsd/Makefile +++ fpc-2.2.2/fpcsrc/rtl/freebsd/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -109,11 +103,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -168,17 +158,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -200,7 +179,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -240,20 +219,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -305,9 +277,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconsts initc cmem matrix dl termio printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd freebsd video mouse keyboard console serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring clocale endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconsts initc cmem matrix dl termio printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd freebsd video mouse keyboard console serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring clocale -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconsts initc cmem matrix dl termio printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd freebsd video mouse keyboard console serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring clocale endif @@ -410,9 +379,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconsts initc cmem matrix dl termio printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd freebsd video mouse keyboard console serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring clocale endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconsts initc cmem matrix dl termio printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd freebsd video mouse keyboard console serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring clocale -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconsts initc cmem matrix dl termio printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd freebsd video mouse keyboard console serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring clocale endif @@ -425,9 +391,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconsts initc cmem matrix dl termio printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd freebsd video mouse keyboard console serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring clocale endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconsts initc cmem matrix dl termio printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd freebsd video mouse keyboard console serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring clocale -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconsts initc cmem matrix dl termio printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd freebsd video mouse keyboard console serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring clocale endif @@ -446,21 +409,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconsts initc cmem matrix dl termio printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd freebsd video mouse keyboard console serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring clocale endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconsts initc cmem matrix dl termio printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd freebsd video mouse keyboard console serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring clocale -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconsts initc cmem matrix dl termio printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd freebsd video mouse keyboard console serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring clocale endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconsts initc cmem matrix dl termio printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd freebsd video mouse keyboard console serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring clocale -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconsts initc cmem matrix dl termio printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd freebsd video mouse keyboard console serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring clocale -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconsts initc cmem matrix dl termio printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd freebsd video mouse keyboard console serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring clocale -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -479,9 +430,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -584,9 +532,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -599,9 +544,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -620,21 +562,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_IMPLICITUNITS+=exeinfo -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_IMPLICITUNITS+=exeinfo -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=prt0 cprt0 gprt0 endif @@ -653,9 +583,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_LOADERS+=prt0 cprt0 gprt0 endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_LOADERS+=prt0 cprt0 gprt0 -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_LOADERS+=prt0 cprt0 gprt0 endif @@ -758,9 +685,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_LOADERS+=prt0 cprt0 gprt0 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_LOADERS+=prt0 cprt0 gprt0 -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_LOADERS+=prt0 cprt0 gprt0 endif @@ -773,9 +697,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_LOADERS+=prt0 cprt0 gprt0 endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_LOADERS+=prt0 cprt0 gprt0 -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_LOADERS+=prt0 cprt0 gprt0 endif @@ -794,21 +715,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_LOADERS+=prt0 cprt0 gprt0 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_LOADERS+=prt0 cprt0 gprt0 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_LOADERS+=prt0 cprt0 gprt0 endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_LOADERS+=prt0 cprt0 gprt0 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_LOADERS+=prt0 cprt0 gprt0 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_LOADERS+=prt0 cprt0 gprt0 -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst endif @@ -827,9 +736,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst endif @@ -932,9 +838,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst endif @@ -947,9 +850,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst endif @@ -968,21 +868,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst -endif override INSTALL_FPCPACKAGE=y y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) @@ -1002,9 +890,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) endif @@ -1107,9 +992,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) endif @@ -1122,9 +1004,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) endif @@ -1143,21 +1022,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) endif @@ -1176,9 +1043,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) endif @@ -1281,9 +1145,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) endif @@ -1296,9 +1157,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) endif @@ -1317,21 +1175,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1621,11 +1467,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -2085,20 +1926,20 @@ TAREXT=.tar.gz endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2230,13 +2071,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_loaders ifneq ($(TARGET_LOADERS),) override ALLTARGET+=fpc_loaders @@ -2265,7 +2102,7 @@ $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR) endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/rtl/macos/Makefile +++ fpc-2.2.2/fpcsrc/rtl/macos/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -109,11 +103,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -168,17 +158,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -200,7 +179,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -240,20 +219,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -294,9 +266,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=system strings objpas macpas heaptrc getopts macostp macutils unixutil dos objects matrix cmem charset ctypes endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=system strings objpas macpas heaptrc getopts macostp macutils unixutil dos objects matrix cmem charset ctypes -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=system strings objpas macpas heaptrc getopts macostp macutils unixutil dos objects matrix cmem charset ctypes endif @@ -399,9 +368,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=system strings objpas macpas heaptrc getopts macostp macutils unixutil dos objects matrix cmem charset ctypes endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=system strings objpas macpas heaptrc getopts macostp macutils unixutil dos objects matrix cmem charset ctypes -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=system strings objpas macpas heaptrc getopts macostp macutils unixutil dos objects matrix cmem charset ctypes endif @@ -414,9 +380,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=system strings objpas macpas heaptrc getopts macostp macutils unixutil dos objects matrix cmem charset ctypes endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=system strings objpas macpas heaptrc getopts macostp macutils unixutil dos objects matrix cmem charset ctypes -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=system strings objpas macpas heaptrc getopts macostp macutils unixutil dos objects matrix cmem charset ctypes endif @@ -435,21 +398,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=system strings objpas macpas heaptrc getopts macostp macutils unixutil dos objects matrix cmem charset ctypes endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=system strings objpas macpas heaptrc getopts macostp macutils unixutil dos objects matrix cmem charset ctypes -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=system strings objpas macpas heaptrc getopts macostp macutils unixutil dos objects matrix cmem charset ctypes endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=system strings objpas macpas heaptrc getopts macostp macutils unixutil dos objects matrix cmem charset ctypes -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=system strings objpas macpas heaptrc getopts macostp macutils unixutil dos objects matrix cmem charset ctypes -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=system strings objpas macpas heaptrc getopts macostp macutils unixutil dos objects matrix cmem charset ctypes -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) @@ -469,9 +420,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -574,9 +522,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -589,9 +534,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -610,21 +552,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -643,9 +573,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -748,9 +675,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -763,9 +687,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -784,21 +705,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1088,11 +997,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1552,20 +1456,20 @@ TAREXT=.tar.gz endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1697,15 +1601,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/rtl/nds/Makefile +++ fpc-2.2.2/fpcsrc/rtl/nds/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -110,11 +104,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -169,17 +159,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -201,7 +180,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -241,20 +220,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -291,9 +263,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil fgl endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil fgl -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil fgl endif @@ -396,9 +365,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil fgl endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil fgl -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil fgl endif @@ -411,9 +377,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil fgl endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil fgl -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil fgl endif @@ -432,21 +395,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil fgl endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil fgl -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil fgl endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil fgl -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil fgl -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil fgl -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=prt07 prt09 cprt07 cprt09 endif @@ -465,9 +416,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_LOADERS+=prt07 prt09 cprt07 cprt09 endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_LOADERS+=prt07 prt09 cprt07 cprt09 -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_LOADERS+=prt07 prt09 cprt07 cprt09 endif @@ -570,9 +518,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_LOADERS+=prt07 prt09 cprt07 cprt09 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_LOADERS+=prt07 prt09 cprt07 cprt09 -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_LOADERS+=prt07 prt09 cprt07 cprt09 endif @@ -585,9 +530,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_LOADERS+=prt07 prt09 cprt07 cprt09 endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_LOADERS+=prt07 prt09 cprt07 cprt09 -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_LOADERS+=prt07 prt09 cprt07 cprt09 endif @@ -606,21 +548,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_LOADERS+=prt07 prt09 cprt07 cprt09 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_LOADERS+=prt07 prt09 cprt07 cprt09 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_LOADERS+=prt07 prt09 cprt07 cprt09 endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_LOADERS+=prt07 prt09 cprt07 cprt09 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_LOADERS+=prt07 prt09 cprt07 cprt09 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_LOADERS+=prt07 prt09 cprt07 cprt09 -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) @@ -640,9 +570,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -745,9 +672,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -760,9 +684,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -781,21 +702,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -814,9 +723,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -919,9 +825,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -934,9 +837,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -955,21 +855,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1259,11 +1147,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1723,20 +1606,20 @@ TAREXT=.tar.gz endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1868,13 +1751,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_loaders ifneq ($(TARGET_LOADERS),) override ALLTARGET+=fpc_loaders @@ -1903,7 +1782,7 @@ $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR) endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/rtl/netware/Makefile +++ fpc-2.2.2/fpcsrc/rtl/netware/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -109,11 +103,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -168,17 +158,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -200,7 +179,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -240,20 +219,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -297,9 +269,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo lnfodwrf winsock heaptrc matrix dos crt objects sysconst initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem sockets aio nwsnut nwserv nwnit nwprot netware nwcalls ctypes endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo lnfodwrf winsock heaptrc matrix dos crt objects sysconst initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem sockets aio nwsnut nwserv nwnit nwprot netware nwcalls ctypes -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo lnfodwrf winsock heaptrc matrix dos crt objects sysconst initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem sockets aio nwsnut nwserv nwnit nwprot netware nwcalls ctypes endif @@ -402,9 +371,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo lnfodwrf winsock heaptrc matrix dos crt objects sysconst initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem sockets aio nwsnut nwserv nwnit nwprot netware nwcalls ctypes endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo lnfodwrf winsock heaptrc matrix dos crt objects sysconst initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem sockets aio nwsnut nwserv nwnit nwprot netware nwcalls ctypes -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo lnfodwrf winsock heaptrc matrix dos crt objects sysconst initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem sockets aio nwsnut nwserv nwnit nwprot netware nwcalls ctypes endif @@ -417,9 +383,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo lnfodwrf winsock heaptrc matrix dos crt objects sysconst initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem sockets aio nwsnut nwserv nwnit nwprot netware nwcalls ctypes endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo lnfodwrf winsock heaptrc matrix dos crt objects sysconst initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem sockets aio nwsnut nwserv nwnit nwprot netware nwcalls ctypes -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo lnfodwrf winsock heaptrc matrix dos crt objects sysconst initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem sockets aio nwsnut nwserv nwnit nwprot netware nwcalls ctypes endif @@ -438,21 +401,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo lnfodwrf winsock heaptrc matrix dos crt objects sysconst initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem sockets aio nwsnut nwserv nwnit nwprot netware nwcalls ctypes endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo lnfodwrf winsock heaptrc matrix dos crt objects sysconst initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem sockets aio nwsnut nwserv nwnit nwprot netware nwcalls ctypes -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo lnfodwrf winsock heaptrc matrix dos crt objects sysconst initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem sockets aio nwsnut nwserv nwnit nwprot netware nwcalls ctypes endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo lnfodwrf winsock heaptrc matrix dos crt objects sysconst initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem sockets aio nwsnut nwserv nwnit nwprot netware nwcalls ctypes -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo lnfodwrf winsock heaptrc matrix dos crt objects sysconst initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem sockets aio nwsnut nwserv nwnit nwprot netware nwcalls ctypes -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo lnfodwrf winsock heaptrc matrix dos crt objects sysconst initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem sockets aio nwsnut nwserv nwnit nwprot netware nwcalls ctypes -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -471,9 +422,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -576,9 +524,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -591,9 +536,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -612,21 +554,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_IMPLICITUNITS+=exeinfo -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_IMPLICITUNITS+=exeinfo -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=nwpre prelude endif @@ -645,9 +575,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_LOADERS+=nwpre prelude endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_LOADERS+=nwpre prelude -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_LOADERS+=nwpre prelude endif @@ -750,9 +677,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_LOADERS+=nwpre prelude endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_LOADERS+=nwpre prelude -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_LOADERS+=nwpre prelude endif @@ -765,9 +689,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_LOADERS+=nwpre prelude endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_LOADERS+=nwpre prelude -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_LOADERS+=nwpre prelude endif @@ -786,21 +707,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_LOADERS+=nwpre prelude endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_LOADERS+=nwpre prelude -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_LOADERS+=nwpre prelude endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_LOADERS+=nwpre prelude -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_LOADERS+=nwpre prelude -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_LOADERS+=nwpre prelude -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=math varutils variants typinfo classes dateutils sysconst convutils rtlconsts endif @@ -819,9 +728,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=math varutils variants typinfo classes dateutils sysconst convutils rtlconsts endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=math varutils variants typinfo classes dateutils sysconst convutils rtlconsts -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=math varutils variants typinfo classes dateutils sysconst convutils rtlconsts endif @@ -924,9 +830,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=math varutils variants typinfo classes dateutils sysconst convutils rtlconsts endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=math varutils variants typinfo classes dateutils sysconst convutils rtlconsts -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=math varutils variants typinfo classes dateutils sysconst convutils rtlconsts endif @@ -939,9 +842,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=math varutils variants typinfo classes dateutils sysconst convutils rtlconsts endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=math varutils variants typinfo classes dateutils sysconst convutils rtlconsts -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=math varutils variants typinfo classes dateutils sysconst convutils rtlconsts endif @@ -960,21 +860,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=math varutils variants typinfo classes dateutils sysconst convutils rtlconsts endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=math varutils variants typinfo classes dateutils sysconst convutils rtlconsts -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=math varutils variants typinfo classes dateutils sysconst convutils rtlconsts endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=math varutils variants typinfo classes dateutils sysconst convutils rtlconsts -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=math varutils variants typinfo classes dateutils sysconst convutils rtlconsts -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=math varutils variants typinfo classes dateutils sysconst convutils rtlconsts -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) @@ -994,9 +882,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -1099,9 +984,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -1114,9 +996,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -1135,21 +1014,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1168,9 +1035,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1273,9 +1137,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1288,9 +1149,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1309,21 +1167,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1613,11 +1459,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -2077,20 +1918,20 @@ TAREXT=.tar.gz endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2222,13 +2063,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_loaders ifneq ($(TARGET_LOADERS),) override ALLTARGET+=fpc_loaders @@ -2257,7 +2094,7 @@ $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR) endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/rtl/palmos/Makefile +++ fpc-2.2.2/fpcsrc/rtl/palmos/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -109,11 +103,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -168,17 +158,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -200,7 +179,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -240,20 +219,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -291,9 +263,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lnfodwrf lineinfo heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes fmtbcd strutils convutils math dateutils varutils variants matrix ucomplex charset getopts winsock sockets endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lnfodwrf lineinfo heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes fmtbcd strutils convutils math dateutils varutils variants matrix ucomplex charset getopts winsock sockets -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lnfodwrf lineinfo heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes fmtbcd strutils convutils math dateutils varutils variants matrix ucomplex charset getopts winsock sockets endif @@ -396,9 +365,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lnfodwrf lineinfo heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes fmtbcd strutils convutils math dateutils varutils variants matrix ucomplex charset getopts winsock sockets endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lnfodwrf lineinfo heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes fmtbcd strutils convutils math dateutils varutils variants matrix ucomplex charset getopts winsock sockets -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lnfodwrf lineinfo heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes fmtbcd strutils convutils math dateutils varutils variants matrix ucomplex charset getopts winsock sockets endif @@ -411,9 +377,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lnfodwrf lineinfo heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes fmtbcd strutils convutils math dateutils varutils variants matrix ucomplex charset getopts winsock sockets endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lnfodwrf lineinfo heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes fmtbcd strutils convutils math dateutils varutils variants matrix ucomplex charset getopts winsock sockets -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lnfodwrf lineinfo heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes fmtbcd strutils convutils math dateutils varutils variants matrix ucomplex charset getopts winsock sockets endif @@ -432,21 +395,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lnfodwrf lineinfo heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes fmtbcd strutils convutils math dateutils varutils variants matrix ucomplex charset getopts winsock sockets endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lnfodwrf lineinfo heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes fmtbcd strutils convutils math dateutils varutils variants matrix ucomplex charset getopts winsock sockets -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lnfodwrf lineinfo heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes fmtbcd strutils convutils math dateutils varutils variants matrix ucomplex charset getopts winsock sockets endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lnfodwrf lineinfo heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes fmtbcd strutils convutils math dateutils varutils variants matrix ucomplex charset getopts winsock sockets -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lnfodwrf lineinfo heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes fmtbcd strutils convutils math dateutils varutils variants matrix ucomplex charset getopts winsock sockets -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lnfodwrf lineinfo heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes fmtbcd strutils convutils math dateutils varutils variants matrix ucomplex charset getopts winsock sockets -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -465,9 +416,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -570,9 +518,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -585,9 +530,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -606,21 +548,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_IMPLICITUNITS+=exeinfo -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_IMPLICITUNITS+=exeinfo -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=prt0 endif @@ -639,9 +569,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_LOADERS+=prt0 endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_LOADERS+=prt0 -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_LOADERS+=prt0 endif @@ -744,9 +671,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_LOADERS+=prt0 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_LOADERS+=prt0 -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_LOADERS+=prt0 endif @@ -759,9 +683,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_LOADERS+=prt0 endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_LOADERS+=prt0 -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_LOADERS+=prt0 endif @@ -780,21 +701,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_LOADERS+=prt0 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_LOADERS+=prt0 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_LOADERS+=prt0 endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_LOADERS+=prt0 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_LOADERS+=prt0 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_LOADERS+=prt0 -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/palmos @@ -814,9 +723,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/palmos endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/palmos -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/palmos endif @@ -919,9 +825,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/palmos endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/palmos -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/palmos endif @@ -934,9 +837,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/palmos endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/palmos -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/palmos endif @@ -955,21 +855,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/palmos endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/palmos -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/palmos endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/palmos -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/palmos -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/palmos -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -988,9 +876,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1093,9 +978,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1108,9 +990,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1129,21 +1008,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1433,11 +1300,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1897,20 +1759,20 @@ TAREXT=.tar.gz endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2042,13 +1904,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_loaders ifneq ($(TARGET_LOADERS),) override ALLTARGET+=fpc_loaders @@ -2077,7 +1935,7 @@ $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR) endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/rtl/amiga/Makefile +++ fpc-2.2.2/fpcsrc/rtl/amiga/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -110,11 +104,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -169,17 +159,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -201,7 +180,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -241,20 +220,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -291,9 +263,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos heaptrc sysutils fgl classes strutils math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil objects endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos heaptrc sysutils fgl classes strutils math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil objects -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos heaptrc sysutils fgl classes strutils math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil objects endif @@ -396,9 +365,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos heaptrc sysutils fgl classes strutils math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil objects endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos heaptrc sysutils fgl classes strutils math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil objects -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos heaptrc sysutils fgl classes strutils math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil objects endif @@ -411,9 +377,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos heaptrc sysutils fgl classes strutils math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil objects endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos heaptrc sysutils fgl classes strutils math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil objects -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos heaptrc sysutils fgl classes strutils math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil objects endif @@ -432,21 +395,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos heaptrc sysutils fgl classes strutils math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil objects endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos heaptrc sysutils fgl classes strutils math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil objects -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos heaptrc sysutils fgl classes strutils math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil objects endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos heaptrc sysutils fgl classes strutils math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil objects -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos heaptrc sysutils fgl classes strutils math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil objects -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos heaptrc sysutils fgl classes strutils math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil objects -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=prt0 endif @@ -465,9 +416,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_LOADERS+=prt0 endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_LOADERS+=prt0 -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_LOADERS+=prt0 endif @@ -570,9 +518,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_LOADERS+=prt0 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_LOADERS+=prt0 -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_LOADERS+=prt0 endif @@ -585,9 +530,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_LOADERS+=prt0 endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_LOADERS+=prt0 -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_LOADERS+=prt0 endif @@ -606,21 +548,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_LOADERS+=prt0 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_LOADERS+=prt0 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_LOADERS+=prt0 endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_LOADERS+=prt0 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_LOADERS+=prt0 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_LOADERS+=prt0 -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil endif @@ -639,9 +569,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil endif @@ -744,9 +671,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil endif @@ -759,9 +683,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil endif @@ -780,21 +701,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) @@ -814,9 +723,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) endif @@ -919,9 +825,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) endif @@ -934,9 +837,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) endif @@ -955,21 +855,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(COMMON) endif @@ -988,9 +876,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(COMMON) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(COMMON) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(COMMON) endif @@ -1093,9 +978,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(COMMON) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(COMMON) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(COMMON) endif @@ -1108,9 +990,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(COMMON) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(COMMON) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(COMMON) endif @@ -1129,21 +1008,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(COMMON) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(COMMON) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(COMMON) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(COMMON) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1433,11 +1300,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1897,20 +1759,20 @@ TAREXT=.tar.gz endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2042,13 +1904,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_loaders ifneq ($(TARGET_LOADERS),) override ALLTARGET+=fpc_loaders @@ -2077,7 +1935,7 @@ $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR) endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/rtl/darwin/Makefile +++ fpc-2.2.2/fpcsrc/rtl/darwin/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -109,11 +103,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -168,17 +158,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -200,7 +179,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -240,20 +219,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -308,9 +280,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs $(CPU_UNITS) dos dl objects printer sockets sysutils typinfo fgl classes math varutils types charset ucomplex getopts heaptrc lineinfo lnfodwrf errors terminfo termio video crt mouse keyboard console variants dateutils convutils stdconvs sysconst cthreads strutils rtlconsts cwstring bsd fmtbcd clocale endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs $(CPU_UNITS) dos dl objects printer sockets sysutils typinfo fgl classes math varutils types charset ucomplex getopts heaptrc lineinfo lnfodwrf errors terminfo termio video crt mouse keyboard console variants dateutils convutils stdconvs sysconst cthreads strutils rtlconsts cwstring bsd fmtbcd clocale -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs $(CPU_UNITS) dos dl objects printer sockets sysutils typinfo fgl classes math varutils types charset ucomplex getopts heaptrc lineinfo lnfodwrf errors terminfo termio video crt mouse keyboard console variants dateutils convutils stdconvs sysconst cthreads strutils rtlconsts cwstring bsd fmtbcd clocale endif @@ -413,9 +382,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs $(CPU_UNITS) dos dl objects printer sockets sysutils typinfo fgl classes math varutils types charset ucomplex getopts heaptrc lineinfo lnfodwrf errors terminfo termio video crt mouse keyboard console variants dateutils convutils stdconvs sysconst cthreads strutils rtlconsts cwstring bsd fmtbcd clocale endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs $(CPU_UNITS) dos dl objects printer sockets sysutils typinfo fgl classes math varutils types charset ucomplex getopts heaptrc lineinfo lnfodwrf errors terminfo termio video crt mouse keyboard console variants dateutils convutils stdconvs sysconst cthreads strutils rtlconsts cwstring bsd fmtbcd clocale -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs $(CPU_UNITS) dos dl objects printer sockets sysutils typinfo fgl classes math varutils types charset ucomplex getopts heaptrc lineinfo lnfodwrf errors terminfo termio video crt mouse keyboard console variants dateutils convutils stdconvs sysconst cthreads strutils rtlconsts cwstring bsd fmtbcd clocale endif @@ -428,9 +394,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs $(CPU_UNITS) dos dl objects printer sockets sysutils typinfo fgl classes math varutils types charset ucomplex getopts heaptrc lineinfo lnfodwrf errors terminfo termio video crt mouse keyboard console variants dateutils convutils stdconvs sysconst cthreads strutils rtlconsts cwstring bsd fmtbcd clocale endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs $(CPU_UNITS) dos dl objects printer sockets sysutils typinfo fgl classes math varutils types charset ucomplex getopts heaptrc lineinfo lnfodwrf errors terminfo termio video crt mouse keyboard console variants dateutils convutils stdconvs sysconst cthreads strutils rtlconsts cwstring bsd fmtbcd clocale -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs $(CPU_UNITS) dos dl objects printer sockets sysutils typinfo fgl classes math varutils types charset ucomplex getopts heaptrc lineinfo lnfodwrf errors terminfo termio video crt mouse keyboard console variants dateutils convutils stdconvs sysconst cthreads strutils rtlconsts cwstring bsd fmtbcd clocale endif @@ -449,21 +412,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs $(CPU_UNITS) dos dl objects printer sockets sysutils typinfo fgl classes math varutils types charset ucomplex getopts heaptrc lineinfo lnfodwrf errors terminfo termio video crt mouse keyboard console variants dateutils convutils stdconvs sysconst cthreads strutils rtlconsts cwstring bsd fmtbcd clocale endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs $(CPU_UNITS) dos dl objects printer sockets sysutils typinfo fgl classes math varutils types charset ucomplex getopts heaptrc lineinfo lnfodwrf errors terminfo termio video crt mouse keyboard console variants dateutils convutils stdconvs sysconst cthreads strutils rtlconsts cwstring bsd fmtbcd clocale -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs $(CPU_UNITS) dos dl objects printer sockets sysutils typinfo fgl classes math varutils types charset ucomplex getopts heaptrc lineinfo lnfodwrf errors terminfo termio video crt mouse keyboard console variants dateutils convutils stdconvs sysconst cthreads strutils rtlconsts cwstring bsd fmtbcd clocale endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs $(CPU_UNITS) dos dl objects printer sockets sysutils typinfo fgl classes math varutils types charset ucomplex getopts heaptrc lineinfo lnfodwrf errors terminfo termio video crt mouse keyboard console variants dateutils convutils stdconvs sysconst cthreads strutils rtlconsts cwstring bsd fmtbcd clocale -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs $(CPU_UNITS) dos dl objects printer sockets sysutils typinfo fgl classes math varutils types charset ucomplex getopts heaptrc lineinfo lnfodwrf errors terminfo termio video crt mouse keyboard console variants dateutils convutils stdconvs sysconst cthreads strutils rtlconsts cwstring bsd fmtbcd clocale -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs $(CPU_UNITS) dos dl objects printer sockets sysutils typinfo fgl classes math varutils types charset ucomplex getopts heaptrc lineinfo lnfodwrf errors terminfo termio video crt mouse keyboard console variants dateutils convutils stdconvs sysconst cthreads strutils rtlconsts cwstring bsd fmtbcd clocale -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -482,9 +433,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -587,9 +535,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -602,9 +547,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -623,21 +565,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_IMPLICITUNITS+=exeinfo -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_IMPLICITUNITS+=exeinfo -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconsts endif @@ -656,9 +586,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconsts endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconsts -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconsts endif @@ -761,9 +688,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconsts endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconsts -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconsts endif @@ -776,9 +700,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconsts endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconsts -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconsts endif @@ -797,21 +718,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconsts endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconsts -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconsts endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconsts -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconsts -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconsts -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) @@ -831,9 +740,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) endif @@ -936,9 +842,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) endif @@ -951,9 +854,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) endif @@ -972,21 +872,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) endif @@ -1005,9 +893,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) endif @@ -1110,9 +995,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) endif @@ -1125,9 +1007,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) endif @@ -1146,21 +1025,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1450,11 +1317,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1914,20 +1776,20 @@ TAREXT=.tar.gz endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2059,15 +1921,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/rtl/netbsd/Makefile +++ fpc-2.2.2/fpcsrc/rtl/netbsd/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -109,11 +103,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -168,17 +158,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -200,7 +179,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -240,20 +219,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -305,9 +277,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings syscall baseunix $(LINUXUNIT) unix rtlconsts initc dos crt objects printer matrix sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard serial variants types sysctl sysconst fpmkunit $(CPU_UNITS) endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings syscall baseunix $(LINUXUNIT) unix rtlconsts initc dos crt objects printer matrix sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard serial variants types sysctl sysconst fpmkunit $(CPU_UNITS) -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings syscall baseunix $(LINUXUNIT) unix rtlconsts initc dos crt objects printer matrix sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard serial variants types sysctl sysconst fpmkunit $(CPU_UNITS) endif @@ -410,9 +379,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings syscall baseunix $(LINUXUNIT) unix rtlconsts initc dos crt objects printer matrix sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard serial variants types sysctl sysconst fpmkunit $(CPU_UNITS) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings syscall baseunix $(LINUXUNIT) unix rtlconsts initc dos crt objects printer matrix sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard serial variants types sysctl sysconst fpmkunit $(CPU_UNITS) -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings syscall baseunix $(LINUXUNIT) unix rtlconsts initc dos crt objects printer matrix sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard serial variants types sysctl sysconst fpmkunit $(CPU_UNITS) endif @@ -425,9 +391,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings syscall baseunix $(LINUXUNIT) unix rtlconsts initc dos crt objects printer matrix sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard serial variants types sysctl sysconst fpmkunit $(CPU_UNITS) endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings syscall baseunix $(LINUXUNIT) unix rtlconsts initc dos crt objects printer matrix sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard serial variants types sysctl sysconst fpmkunit $(CPU_UNITS) -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings syscall baseunix $(LINUXUNIT) unix rtlconsts initc dos crt objects printer matrix sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard serial variants types sysctl sysconst fpmkunit $(CPU_UNITS) endif @@ -446,21 +409,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings syscall baseunix $(LINUXUNIT) unix rtlconsts initc dos crt objects printer matrix sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard serial variants types sysctl sysconst fpmkunit $(CPU_UNITS) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings syscall baseunix $(LINUXUNIT) unix rtlconsts initc dos crt objects printer matrix sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard serial variants types sysctl sysconst fpmkunit $(CPU_UNITS) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings syscall baseunix $(LINUXUNIT) unix rtlconsts initc dos crt objects printer matrix sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard serial variants types sysctl sysconst fpmkunit $(CPU_UNITS) endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings syscall baseunix $(LINUXUNIT) unix rtlconsts initc dos crt objects printer matrix sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard serial variants types sysctl sysconst fpmkunit $(CPU_UNITS) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings syscall baseunix $(LINUXUNIT) unix rtlconsts initc dos crt objects printer matrix sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard serial variants types sysctl sysconst fpmkunit $(CPU_UNITS) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings syscall baseunix $(LINUXUNIT) unix rtlconsts initc dos crt objects printer matrix sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard serial variants types sysctl sysconst fpmkunit $(CPU_UNITS) -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -479,9 +430,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -584,9 +532,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -599,9 +544,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -620,21 +562,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_IMPLICITUNITS+=exeinfo -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_IMPLICITUNITS+=exeinfo -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=prt0 cprt0 endif @@ -653,9 +583,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_LOADERS+=prt0 cprt0 endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_LOADERS+=prt0 cprt0 -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_LOADERS+=prt0 cprt0 endif @@ -758,9 +685,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_LOADERS+=prt0 cprt0 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_LOADERS+=prt0 cprt0 -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_LOADERS+=prt0 cprt0 endif @@ -773,9 +697,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_LOADERS+=prt0 cprt0 endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_LOADERS+=prt0 cprt0 -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_LOADERS+=prt0 cprt0 endif @@ -794,21 +715,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_LOADERS+=prt0 cprt0 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_LOADERS+=prt0 cprt0 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_LOADERS+=prt0 cprt0 endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_LOADERS+=prt0 cprt0 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_LOADERS+=prt0 cprt0 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_LOADERS+=prt0 cprt0 -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit endif @@ -827,9 +736,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit endif @@ -932,9 +838,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit endif @@ -947,9 +850,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit endif @@ -968,21 +868,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit -endif override INSTALL_FPCPACKAGE=y y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC) @@ -1002,9 +890,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC) endif @@ -1107,9 +992,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC) endif @@ -1122,9 +1004,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC) endif @@ -1143,21 +1022,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) endif @@ -1176,9 +1043,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) endif @@ -1281,9 +1145,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) endif @@ -1296,9 +1157,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) endif @@ -1317,21 +1175,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1621,11 +1467,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -2085,20 +1926,20 @@ TAREXT=.tar.gz endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2230,13 +2071,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_loaders ifneq ($(TARGET_LOADERS),) override ALLTARGET+=fpc_loaders @@ -2265,7 +2102,7 @@ $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR) endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/rtl/os2/Makefile +++ fpc-2.2.2/fpcsrc/rtl/os2/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -110,11 +104,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -169,17 +159,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -201,7 +180,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -241,20 +220,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -295,9 +267,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils fgl classes math typinfo varutils winsock charset ucomplex cpu mmx getopts heaptrc lineinfo lnfodwrf dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil stdconvs fmtbcd so32dll sockets endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils fgl classes math typinfo varutils winsock charset ucomplex cpu mmx getopts heaptrc lineinfo lnfodwrf dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil stdconvs fmtbcd so32dll sockets -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils fgl classes math typinfo varutils winsock charset ucomplex cpu mmx getopts heaptrc lineinfo lnfodwrf dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil stdconvs fmtbcd so32dll sockets endif @@ -400,9 +369,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils fgl classes math typinfo varutils winsock charset ucomplex cpu mmx getopts heaptrc lineinfo lnfodwrf dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil stdconvs fmtbcd so32dll sockets endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils fgl classes math typinfo varutils winsock charset ucomplex cpu mmx getopts heaptrc lineinfo lnfodwrf dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil stdconvs fmtbcd so32dll sockets -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils fgl classes math typinfo varutils winsock charset ucomplex cpu mmx getopts heaptrc lineinfo lnfodwrf dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil stdconvs fmtbcd so32dll sockets endif @@ -415,9 +381,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils fgl classes math typinfo varutils winsock charset ucomplex cpu mmx getopts heaptrc lineinfo lnfodwrf dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil stdconvs fmtbcd so32dll sockets endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils fgl classes math typinfo varutils winsock charset ucomplex cpu mmx getopts heaptrc lineinfo lnfodwrf dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil stdconvs fmtbcd so32dll sockets -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils fgl classes math typinfo varutils winsock charset ucomplex cpu mmx getopts heaptrc lineinfo lnfodwrf dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil stdconvs fmtbcd so32dll sockets endif @@ -436,21 +399,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils fgl classes math typinfo varutils winsock charset ucomplex cpu mmx getopts heaptrc lineinfo lnfodwrf dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil stdconvs fmtbcd so32dll sockets endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils fgl classes math typinfo varutils winsock charset ucomplex cpu mmx getopts heaptrc lineinfo lnfodwrf dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil stdconvs fmtbcd so32dll sockets -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils fgl classes math typinfo varutils winsock charset ucomplex cpu mmx getopts heaptrc lineinfo lnfodwrf dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil stdconvs fmtbcd so32dll sockets endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils fgl classes math typinfo varutils winsock charset ucomplex cpu mmx getopts heaptrc lineinfo lnfodwrf dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil stdconvs fmtbcd so32dll sockets -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils fgl classes math typinfo varutils winsock charset ucomplex cpu mmx getopts heaptrc lineinfo lnfodwrf dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil stdconvs fmtbcd so32dll sockets -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils fgl classes math typinfo varutils winsock charset ucomplex cpu mmx getopts heaptrc lineinfo lnfodwrf dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil stdconvs fmtbcd so32dll sockets -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -469,9 +420,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -574,9 +522,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -589,9 +534,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -610,21 +552,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_IMPLICITUNITS+=exeinfo -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_IMPLICITUNITS+=exeinfo -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=prt0 endif @@ -643,9 +573,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_LOADERS+=prt0 endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_LOADERS+=prt0 -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_LOADERS+=prt0 endif @@ -748,9 +675,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_LOADERS+=prt0 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_LOADERS+=prt0 -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_LOADERS+=prt0 endif @@ -763,9 +687,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_LOADERS+=prt0 endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_LOADERS+=prt0 -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_LOADERS+=prt0 endif @@ -784,21 +705,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_LOADERS+=prt0 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_LOADERS+=prt0 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_LOADERS+=prt0 endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_LOADERS+=prt0 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_LOADERS+=prt0 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_LOADERS+=prt0 -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil stdconvs endif @@ -817,9 +726,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil stdconvs endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil stdconvs -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil stdconvs endif @@ -922,9 +828,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil stdconvs endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil stdconvs -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil stdconvs endif @@ -937,9 +840,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil stdconvs endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil stdconvs -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil stdconvs endif @@ -958,21 +858,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil stdconvs endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil stdconvs -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil stdconvs endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil stdconvs -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil stdconvs -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil stdconvs -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) @@ -992,9 +880,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -1097,9 +982,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -1112,9 +994,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -1133,21 +1012,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1166,9 +1033,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1271,9 +1135,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1286,9 +1147,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1307,21 +1165,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1611,11 +1457,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -2075,20 +1916,20 @@ TAREXT=.tar.gz endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2220,13 +2061,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_loaders ifneq ($(TARGET_LOADERS),) override ALLTARGET+=fpc_loaders @@ -2255,7 +2092,7 @@ $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR) endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/rtl/linux/Makefile +++ fpc-2.2.2/fpcsrc/rtl/linux/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -109,11 +103,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -168,17 +158,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -200,7 +179,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -240,20 +219,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -308,9 +280,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) unixtype ctypes baseunix strings objpas macpas syscall unixutil heaptrc lineinfo lnfodwrf termio unix linux initc cmem $(CPU_UNITS) crt printer linuxvcs sysutils typinfo math matrix varutils charset ucomplex getopts errors sockets gpm ipc serial terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst fmtbcd cthreads classes fgl convutils stdconvs strutils rtlconsts dos objects cwstring fpcylix clocale endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) unixtype ctypes baseunix strings objpas macpas syscall unixutil heaptrc lineinfo lnfodwrf termio unix linux initc cmem $(CPU_UNITS) crt printer linuxvcs sysutils typinfo math matrix varutils charset ucomplex getopts errors sockets gpm ipc serial terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst fmtbcd cthreads classes fgl convutils stdconvs strutils rtlconsts dos objects cwstring fpcylix clocale -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) unixtype ctypes baseunix strings objpas macpas syscall unixutil heaptrc lineinfo lnfodwrf termio unix linux initc cmem $(CPU_UNITS) crt printer linuxvcs sysutils typinfo math matrix varutils charset ucomplex getopts errors sockets gpm ipc serial terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst fmtbcd cthreads classes fgl convutils stdconvs strutils rtlconsts dos objects cwstring fpcylix clocale endif @@ -413,9 +382,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) unixtype ctypes baseunix strings objpas macpas syscall unixutil heaptrc lineinfo lnfodwrf termio unix linux initc cmem $(CPU_UNITS) crt printer linuxvcs sysutils typinfo math matrix varutils charset ucomplex getopts errors sockets gpm ipc serial terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst fmtbcd cthreads classes fgl convutils stdconvs strutils rtlconsts dos objects cwstring fpcylix clocale endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) unixtype ctypes baseunix strings objpas macpas syscall unixutil heaptrc lineinfo lnfodwrf termio unix linux initc cmem $(CPU_UNITS) crt printer linuxvcs sysutils typinfo math matrix varutils charset ucomplex getopts errors sockets gpm ipc serial terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst fmtbcd cthreads classes fgl convutils stdconvs strutils rtlconsts dos objects cwstring fpcylix clocale -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) unixtype ctypes baseunix strings objpas macpas syscall unixutil heaptrc lineinfo lnfodwrf termio unix linux initc cmem $(CPU_UNITS) crt printer linuxvcs sysutils typinfo math matrix varutils charset ucomplex getopts errors sockets gpm ipc serial terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst fmtbcd cthreads classes fgl convutils stdconvs strutils rtlconsts dos objects cwstring fpcylix clocale endif @@ -428,9 +394,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) unixtype ctypes baseunix strings objpas macpas syscall unixutil heaptrc lineinfo lnfodwrf termio unix linux initc cmem $(CPU_UNITS) crt printer linuxvcs sysutils typinfo math matrix varutils charset ucomplex getopts errors sockets gpm ipc serial terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst fmtbcd cthreads classes fgl convutils stdconvs strutils rtlconsts dos objects cwstring fpcylix clocale endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) unixtype ctypes baseunix strings objpas macpas syscall unixutil heaptrc lineinfo lnfodwrf termio unix linux initc cmem $(CPU_UNITS) crt printer linuxvcs sysutils typinfo math matrix varutils charset ucomplex getopts errors sockets gpm ipc serial terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst fmtbcd cthreads classes fgl convutils stdconvs strutils rtlconsts dos objects cwstring fpcylix clocale -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) unixtype ctypes baseunix strings objpas macpas syscall unixutil heaptrc lineinfo lnfodwrf termio unix linux initc cmem $(CPU_UNITS) crt printer linuxvcs sysutils typinfo math matrix varutils charset ucomplex getopts errors sockets gpm ipc serial terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst fmtbcd cthreads classes fgl convutils stdconvs strutils rtlconsts dos objects cwstring fpcylix clocale endif @@ -449,21 +412,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) unixtype ctypes baseunix strings objpas macpas syscall unixutil heaptrc lineinfo lnfodwrf termio unix linux initc cmem $(CPU_UNITS) crt printer linuxvcs sysutils typinfo math matrix varutils charset ucomplex getopts errors sockets gpm ipc serial terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst fmtbcd cthreads classes fgl convutils stdconvs strutils rtlconsts dos objects cwstring fpcylix clocale endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) unixtype ctypes baseunix strings objpas macpas syscall unixutil heaptrc lineinfo lnfodwrf termio unix linux initc cmem $(CPU_UNITS) crt printer linuxvcs sysutils typinfo math matrix varutils charset ucomplex getopts errors sockets gpm ipc serial terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst fmtbcd cthreads classes fgl convutils stdconvs strutils rtlconsts dos objects cwstring fpcylix clocale -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) unixtype ctypes baseunix strings objpas macpas syscall unixutil heaptrc lineinfo lnfodwrf termio unix linux initc cmem $(CPU_UNITS) crt printer linuxvcs sysutils typinfo math matrix varutils charset ucomplex getopts errors sockets gpm ipc serial terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst fmtbcd cthreads classes fgl convutils stdconvs strutils rtlconsts dos objects cwstring fpcylix clocale endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) unixtype ctypes baseunix strings objpas macpas syscall unixutil heaptrc lineinfo lnfodwrf termio unix linux initc cmem $(CPU_UNITS) crt printer linuxvcs sysutils typinfo math matrix varutils charset ucomplex getopts errors sockets gpm ipc serial terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst fmtbcd cthreads classes fgl convutils stdconvs strutils rtlconsts dos objects cwstring fpcylix clocale -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) unixtype ctypes baseunix strings objpas macpas syscall unixutil heaptrc lineinfo lnfodwrf termio unix linux initc cmem $(CPU_UNITS) crt printer linuxvcs sysutils typinfo math matrix varutils charset ucomplex getopts errors sockets gpm ipc serial terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst fmtbcd cthreads classes fgl convutils stdconvs strutils rtlconsts dos objects cwstring fpcylix clocale -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) unixtype ctypes baseunix strings objpas macpas syscall unixutil heaptrc lineinfo lnfodwrf termio unix linux initc cmem $(CPU_UNITS) crt printer linuxvcs sysutils typinfo math matrix varutils charset ucomplex getopts errors sockets gpm ipc serial terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst fmtbcd cthreads classes fgl convutils stdconvs strutils rtlconsts dos objects cwstring fpcylix clocale -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -482,9 +433,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -587,9 +535,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -602,9 +547,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -623,21 +565,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_IMPLICITUNITS+=exeinfo -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_IMPLICITUNITS+=exeinfo -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=$(LOADERS) endif @@ -656,9 +586,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_LOADERS+=$(LOADERS) endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_LOADERS+=$(LOADERS) -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_LOADERS+=$(LOADERS) endif @@ -761,9 +688,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_LOADERS+=$(LOADERS) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_LOADERS+=$(LOADERS) -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_LOADERS+=$(LOADERS) endif @@ -776,9 +700,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_LOADERS+=$(LOADERS) endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_LOADERS+=$(LOADERS) -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_LOADERS+=$(LOADERS) endif @@ -797,21 +718,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_LOADERS+=$(LOADERS) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_LOADERS+=$(LOADERS) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_LOADERS+=$(LOADERS) endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_LOADERS+=$(LOADERS) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_LOADERS+=$(LOADERS) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_LOADERS+=$(LOADERS) -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts stdconvs endif @@ -830,9 +739,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts stdconvs endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts stdconvs -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts stdconvs endif @@ -935,9 +841,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts stdconvs endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts stdconvs -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts stdconvs endif @@ -950,9 +853,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts stdconvs endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts stdconvs -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts stdconvs endif @@ -971,21 +871,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts stdconvs endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts stdconvs -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts stdconvs endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts stdconvs -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts stdconvs -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts stdconvs -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=syslinux linux endif @@ -1004,9 +892,6 @@ ifeq ($(FULL_TARGET),i386-beos) override CLEAN_UNITS+=syslinux linux endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=syslinux linux -endif ifeq ($(FULL_TARGET),i386-netbsd) override CLEAN_UNITS+=syslinux linux endif @@ -1109,9 +994,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override CLEAN_UNITS+=syslinux linux endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=syslinux linux -endif ifeq ($(FULL_TARGET),x86_64-win64) override CLEAN_UNITS+=syslinux linux endif @@ -1124,9 +1006,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override CLEAN_UNITS+=syslinux linux endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=syslinux linux -endif ifeq ($(FULL_TARGET),arm-wince) override CLEAN_UNITS+=syslinux linux endif @@ -1145,21 +1024,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=syslinux linux endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=syslinux linux -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override CLEAN_UNITS+=syslinux linux endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=syslinux linux -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=syslinux linux -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=syslinux linux -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) @@ -1179,9 +1046,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) endif @@ -1284,9 +1148,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) endif @@ -1299,9 +1160,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) endif @@ -1320,21 +1178,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(COMMON) endif @@ -1353,9 +1199,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(COMMON) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(COMMON) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(COMMON) endif @@ -1458,9 +1301,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(COMMON) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(COMMON) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(COMMON) endif @@ -1473,9 +1313,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(COMMON) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(COMMON) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(COMMON) endif @@ -1494,21 +1331,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(COMMON) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(COMMON) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(COMMON) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(COMMON) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_TARGETDIR+=. endif @@ -1527,9 +1352,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_TARGETDIR+=. endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_TARGETDIR+=. -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_TARGETDIR+=. endif @@ -1632,9 +1454,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_TARGETDIR+=. endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_TARGETDIR+=. -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_TARGETDIR+=. endif @@ -1647,9 +1466,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_TARGETDIR+=. endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_TARGETDIR+=. -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_TARGETDIR+=. endif @@ -1668,21 +1484,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_TARGETDIR+=. endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_TARGETDIR+=. -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_TARGETDIR+=. endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_TARGETDIR+=. -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_TARGETDIR+=. -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_TARGETDIR+=. -endif override SHARED_LIBUNITS=$(SYSTEMUNIT) objpas strings dos unix baseunix unixtype unixutil sysutils typinfo math $(CPU_UNITS) getopts errors sockets varutils classes fgl variants sysconst rtlconsts ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1973,11 +1777,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -2437,20 +2236,20 @@ TAREXT=.tar.gz endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2582,13 +2381,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_loaders ifneq ($(TARGET_LOADERS),) override ALLTARGET+=fpc_loaders @@ -2617,7 +2412,7 @@ $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR) endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/rtl/solaris/Makefile +++ fpc-2.2.2/fpcsrc/rtl/solaris/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -109,11 +103,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -168,17 +158,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -200,7 +179,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -240,20 +219,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -296,9 +268,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes strings objpas macpas heaptrc lineinfo lnfodwrf baseunix unixutil termio unix initc cmem crt printer sysutils typinfo math fgl classes matrix varutils charset ucomplex getopts errors sockets terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst strutils fmtbcd rtlconsts cthreads dos objects cwstring endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes strings objpas macpas heaptrc lineinfo lnfodwrf baseunix unixutil termio unix initc cmem crt printer sysutils typinfo math fgl classes matrix varutils charset ucomplex getopts errors sockets terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst strutils fmtbcd rtlconsts cthreads dos objects cwstring -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes strings objpas macpas heaptrc lineinfo lnfodwrf baseunix unixutil termio unix initc cmem crt printer sysutils typinfo math fgl classes matrix varutils charset ucomplex getopts errors sockets terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst strutils fmtbcd rtlconsts cthreads dos objects cwstring endif @@ -401,9 +370,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes strings objpas macpas heaptrc lineinfo lnfodwrf baseunix unixutil termio unix initc cmem crt printer sysutils typinfo math fgl classes matrix varutils charset ucomplex getopts errors sockets terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst strutils fmtbcd rtlconsts cthreads dos objects cwstring endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes strings objpas macpas heaptrc lineinfo lnfodwrf baseunix unixutil termio unix initc cmem crt printer sysutils typinfo math fgl classes matrix varutils charset ucomplex getopts errors sockets terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst strutils fmtbcd rtlconsts cthreads dos objects cwstring -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes strings objpas macpas heaptrc lineinfo lnfodwrf baseunix unixutil termio unix initc cmem crt printer sysutils typinfo math fgl classes matrix varutils charset ucomplex getopts errors sockets terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst strutils fmtbcd rtlconsts cthreads dos objects cwstring endif @@ -416,9 +382,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes strings objpas macpas heaptrc lineinfo lnfodwrf baseunix unixutil termio unix initc cmem crt printer sysutils typinfo math fgl classes matrix varutils charset ucomplex getopts errors sockets terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst strutils fmtbcd rtlconsts cthreads dos objects cwstring endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes strings objpas macpas heaptrc lineinfo lnfodwrf baseunix unixutil termio unix initc cmem crt printer sysutils typinfo math fgl classes matrix varutils charset ucomplex getopts errors sockets terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst strutils fmtbcd rtlconsts cthreads dos objects cwstring -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes strings objpas macpas heaptrc lineinfo lnfodwrf baseunix unixutil termio unix initc cmem crt printer sysutils typinfo math fgl classes matrix varutils charset ucomplex getopts errors sockets terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst strutils fmtbcd rtlconsts cthreads dos objects cwstring endif @@ -437,21 +400,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes strings objpas macpas heaptrc lineinfo lnfodwrf baseunix unixutil termio unix initc cmem crt printer sysutils typinfo math fgl classes matrix varutils charset ucomplex getopts errors sockets terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst strutils fmtbcd rtlconsts cthreads dos objects cwstring endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes strings objpas macpas heaptrc lineinfo lnfodwrf baseunix unixutil termio unix initc cmem crt printer sysutils typinfo math fgl classes matrix varutils charset ucomplex getopts errors sockets terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst strutils fmtbcd rtlconsts cthreads dos objects cwstring -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes strings objpas macpas heaptrc lineinfo lnfodwrf baseunix unixutil termio unix initc cmem crt printer sysutils typinfo math fgl classes matrix varutils charset ucomplex getopts errors sockets terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst strutils fmtbcd rtlconsts cthreads dos objects cwstring endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes strings objpas macpas heaptrc lineinfo lnfodwrf baseunix unixutil termio unix initc cmem crt printer sysutils typinfo math fgl classes matrix varutils charset ucomplex getopts errors sockets terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst strutils fmtbcd rtlconsts cthreads dos objects cwstring -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes strings objpas macpas heaptrc lineinfo lnfodwrf baseunix unixutil termio unix initc cmem crt printer sysutils typinfo math fgl classes matrix varutils charset ucomplex getopts errors sockets terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst strutils fmtbcd rtlconsts cthreads dos objects cwstring -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes strings objpas macpas heaptrc lineinfo lnfodwrf baseunix unixutil termio unix initc cmem crt printer sysutils typinfo math fgl classes matrix varutils charset ucomplex getopts errors sockets terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst strutils fmtbcd rtlconsts cthreads dos objects cwstring -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -470,9 +421,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -575,9 +523,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -590,9 +535,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -611,21 +553,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_IMPLICITUNITS+=exeinfo endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_IMPLICITUNITS+=exeinfo -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_IMPLICITUNITS+=exeinfo -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_IMPLICITUNITS+=exeinfo -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif @@ -644,9 +574,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif @@ -749,9 +676,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif @@ -764,9 +688,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif @@ -785,21 +706,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(OSPROCINC) @@ -819,9 +728,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(OSPROCINC) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(OSPROCINC) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(OSPROCINC) endif @@ -924,9 +830,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(OSPROCINC) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(OSPROCINC) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(OSPROCINC) endif @@ -939,9 +842,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(OSPROCINC) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(OSPROCINC) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(OSPROCINC) endif @@ -960,21 +860,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(OSPROCINC) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(OSPROCINC) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(OSPROCINC) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(OSPROCINC) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(OSPROCINC) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(OSPROCINC) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(COMMON) endif @@ -993,9 +881,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(COMMON) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(COMMON) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(COMMON) endif @@ -1098,9 +983,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(COMMON) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(COMMON) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(COMMON) endif @@ -1113,9 +995,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(COMMON) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(COMMON) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(COMMON) endif @@ -1134,21 +1013,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(COMMON) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(COMMON) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(COMMON) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(COMMON) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1438,11 +1305,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1902,20 +1764,20 @@ TAREXT=.tar.gz endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2047,15 +1909,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/rtl/morphos/Makefile +++ fpc-2.2.2/fpcsrc/rtl/morphos/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -110,11 +104,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -169,17 +159,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -201,7 +180,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -241,20 +220,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -291,9 +263,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos heaptrc ctypes sysutils classes fgl strutils math typinfo varutils charset ucomplex getopts matrix fmtbcd variants types rtlconsts sysconst dateutil objects exec timer doslib utility hardware inputevent keymap graphics layers intuition aboxlib mui kvm video keyboard mouse sockets clipboard datatypes asl ahi tinygl get9 muihelper endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos heaptrc ctypes sysutils classes fgl strutils math typinfo varutils charset ucomplex getopts matrix fmtbcd variants types rtlconsts sysconst dateutil objects exec timer doslib utility hardware inputevent keymap graphics layers intuition aboxlib mui kvm video keyboard mouse sockets clipboard datatypes asl ahi tinygl get9 muihelper -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos heaptrc ctypes sysutils classes fgl strutils math typinfo varutils charset ucomplex getopts matrix fmtbcd variants types rtlconsts sysconst dateutil objects exec timer doslib utility hardware inputevent keymap graphics layers intuition aboxlib mui kvm video keyboard mouse sockets clipboard datatypes asl ahi tinygl get9 muihelper endif @@ -396,9 +365,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos heaptrc ctypes sysutils classes fgl strutils math typinfo varutils charset ucomplex getopts matrix fmtbcd variants types rtlconsts sysconst dateutil objects exec timer doslib utility hardware inputevent keymap graphics layers intuition aboxlib mui kvm video keyboard mouse sockets clipboard datatypes asl ahi tinygl get9 muihelper endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos heaptrc ctypes sysutils classes fgl strutils math typinfo varutils charset ucomplex getopts matrix fmtbcd variants types rtlconsts sysconst dateutil objects exec timer doslib utility hardware inputevent keymap graphics layers intuition aboxlib mui kvm video keyboard mouse sockets clipboard datatypes asl ahi tinygl get9 muihelper -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos heaptrc ctypes sysutils classes fgl strutils math typinfo varutils charset ucomplex getopts matrix fmtbcd variants types rtlconsts sysconst dateutil objects exec timer doslib utility hardware inputevent keymap graphics layers intuition aboxlib mui kvm video keyboard mouse sockets clipboard datatypes asl ahi tinygl get9 muihelper endif @@ -411,9 +377,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos heaptrc ctypes sysutils classes fgl strutils math typinfo varutils charset ucomplex getopts matrix fmtbcd variants types rtlconsts sysconst dateutil objects exec timer doslib utility hardware inputevent keymap graphics layers intuition aboxlib mui kvm video keyboard mouse sockets clipboard datatypes asl ahi tinygl get9 muihelper endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos heaptrc ctypes sysutils classes fgl strutils math typinfo varutils charset ucomplex getopts matrix fmtbcd variants types rtlconsts sysconst dateutil objects exec timer doslib utility hardware inputevent keymap graphics layers intuition aboxlib mui kvm video keyboard mouse sockets clipboard datatypes asl ahi tinygl get9 muihelper -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos heaptrc ctypes sysutils classes fgl strutils math typinfo varutils charset ucomplex getopts matrix fmtbcd variants types rtlconsts sysconst dateutil objects exec timer doslib utility hardware inputevent keymap graphics layers intuition aboxlib mui kvm video keyboard mouse sockets clipboard datatypes asl ahi tinygl get9 muihelper endif @@ -432,21 +395,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos heaptrc ctypes sysutils classes fgl strutils math typinfo varutils charset ucomplex getopts matrix fmtbcd variants types rtlconsts sysconst dateutil objects exec timer doslib utility hardware inputevent keymap graphics layers intuition aboxlib mui kvm video keyboard mouse sockets clipboard datatypes asl ahi tinygl get9 muihelper endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos heaptrc ctypes sysutils classes fgl strutils math typinfo varutils charset ucomplex getopts matrix fmtbcd variants types rtlconsts sysconst dateutil objects exec timer doslib utility hardware inputevent keymap graphics layers intuition aboxlib mui kvm video keyboard mouse sockets clipboard datatypes asl ahi tinygl get9 muihelper -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos heaptrc ctypes sysutils classes fgl strutils math typinfo varutils charset ucomplex getopts matrix fmtbcd variants types rtlconsts sysconst dateutil objects exec timer doslib utility hardware inputevent keymap graphics layers intuition aboxlib mui kvm video keyboard mouse sockets clipboard datatypes asl ahi tinygl get9 muihelper endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos heaptrc ctypes sysutils classes fgl strutils math typinfo varutils charset ucomplex getopts matrix fmtbcd variants types rtlconsts sysconst dateutil objects exec timer doslib utility hardware inputevent keymap graphics layers intuition aboxlib mui kvm video keyboard mouse sockets clipboard datatypes asl ahi tinygl get9 muihelper -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos heaptrc ctypes sysutils classes fgl strutils math typinfo varutils charset ucomplex getopts matrix fmtbcd variants types rtlconsts sysconst dateutil objects exec timer doslib utility hardware inputevent keymap graphics layers intuition aboxlib mui kvm video keyboard mouse sockets clipboard datatypes asl ahi tinygl get9 muihelper -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos heaptrc ctypes sysutils classes fgl strutils math typinfo varutils charset ucomplex getopts matrix fmtbcd variants types rtlconsts sysconst dateutil objects exec timer doslib utility hardware inputevent keymap graphics layers intuition aboxlib mui kvm video keyboard mouse sockets clipboard datatypes asl ahi tinygl get9 muihelper -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=prt0 endif @@ -465,9 +416,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_LOADERS+=prt0 endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_LOADERS+=prt0 -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_LOADERS+=prt0 endif @@ -570,9 +518,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_LOADERS+=prt0 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_LOADERS+=prt0 -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_LOADERS+=prt0 endif @@ -585,9 +530,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_LOADERS+=prt0 endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_LOADERS+=prt0 -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_LOADERS+=prt0 endif @@ -606,21 +548,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_LOADERS+=prt0 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_LOADERS+=prt0 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_LOADERS+=prt0 endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_LOADERS+=prt0 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_LOADERS+=prt0 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_LOADERS+=prt0 -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil endif @@ -639,9 +569,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil endif @@ -744,9 +671,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil endif @@ -759,9 +683,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil endif @@ -780,21 +701,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) @@ -814,9 +723,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -919,9 +825,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -934,9 +837,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -955,21 +855,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -988,9 +876,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1093,9 +978,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1108,9 +990,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1129,21 +1008,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1433,11 +1300,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1897,20 +1759,20 @@ TAREXT=.tar.gz endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2042,13 +1904,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_loaders ifneq ($(TARGET_LOADERS),) override ALLTARGET+=fpc_loaders @@ -2077,7 +1935,7 @@ $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR) endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/rtl/gba/Makefile +++ fpc-2.2.2/fpcsrc/rtl/gba/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -110,11 +104,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -169,17 +159,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -201,7 +180,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -241,20 +220,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -291,9 +263,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil fgl endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil fgl -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil fgl endif @@ -396,9 +365,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil fgl endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil fgl -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil fgl endif @@ -411,9 +377,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil fgl endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil fgl -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil fgl endif @@ -432,21 +395,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil fgl endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil fgl -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil fgl endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil fgl -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil fgl -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil fgl -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=prt0 cprt0 endif @@ -465,9 +416,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_LOADERS+=prt0 cprt0 endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_LOADERS+=prt0 cprt0 -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_LOADERS+=prt0 cprt0 endif @@ -570,9 +518,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_LOADERS+=prt0 cprt0 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_LOADERS+=prt0 cprt0 -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_LOADERS+=prt0 cprt0 endif @@ -585,9 +530,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_LOADERS+=prt0 cprt0 endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_LOADERS+=prt0 cprt0 -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_LOADERS+=prt0 cprt0 endif @@ -606,21 +548,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_LOADERS+=prt0 cprt0 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_LOADERS+=prt0 cprt0 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_LOADERS+=prt0 cprt0 endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_LOADERS+=prt0 cprt0 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_LOADERS+=prt0 cprt0 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_LOADERS+=prt0 cprt0 -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) @@ -640,9 +570,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -745,9 +672,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -760,9 +684,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -781,21 +702,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -814,9 +723,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -919,9 +825,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -934,9 +837,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -955,21 +855,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1259,11 +1147,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1723,20 +1606,20 @@ TAREXT=.tar.gz endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1868,13 +1751,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_loaders ifneq ($(TARGET_LOADERS),) override ALLTARGET+=fpc_loaders @@ -1903,7 +1782,7 @@ $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR) endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcsrc/installer/Makefile +++ fpc-2.2.2/fpcsrc/installer/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -290,9 +262,6 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=installer writeidx endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=installer writeidx -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=scroll insthelp endif @@ -311,9 +280,6 @@ ifeq ($(FULL_TARGET),i386-beos) override CLEAN_UNITS+=scroll insthelp endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=scroll insthelp -endif ifeq ($(FULL_TARGET),i386-netbsd) override CLEAN_UNITS+=scroll insthelp endif @@ -416,9 +382,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override CLEAN_UNITS+=scroll insthelp endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=scroll insthelp -endif ifeq ($(FULL_TARGET),x86_64-win64) override CLEAN_UNITS+=scroll insthelp endif @@ -431,9 +394,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override CLEAN_UNITS+=scroll insthelp endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=scroll insthelp -endif ifeq ($(FULL_TARGET),arm-wince) override CLEAN_UNITS+=scroll insthelp endif @@ -452,21 +412,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=scroll insthelp endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=scroll insthelp -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override CLEAN_UNITS+=scroll insthelp endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=scroll insthelp -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=scroll insthelp -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=scroll insthelp -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=installer.pas endif @@ -488,9 +436,6 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=installer.pas endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_FILES+=installer.pas -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITDIR+=../ide @@ -510,9 +455,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_UNITDIR+=../ide endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_UNITDIR+=../ide -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_UNITDIR+=../ide endif @@ -615,9 +557,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_UNITDIR+=../ide endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_UNITDIR+=../ide -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_UNITDIR+=../ide endif @@ -630,9 +569,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_UNITDIR+=../ide endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_UNITDIR+=../ide -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_UNITDIR+=../ide endif @@ -651,21 +587,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITDIR+=../ide endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_UNITDIR+=../ide -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_UNITDIR+=../ide endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_UNITDIR+=../ide -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_UNITDIR+=../ide -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_UNITDIR+=../ide -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -955,11 +879,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1449,11 +1368,6 @@ REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FV=1 -REQUIRE_PACKAGES_UNZIP=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FV=1 @@ -1624,11 +1538,6 @@ REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FV=1 -REQUIRE_PACKAGES_UNZIP=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FV=1 @@ -1649,11 +1558,6 @@ REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FV=1 -REQUIRE_PACKAGES_UNZIP=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FV=1 @@ -1684,31 +1588,11 @@ REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FV=1 -REQUIRE_PACKAGES_UNZIP=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FV=1 -REQUIRE_PACKAGES_UNZIP=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FV=1 -REQUIRE_PACKAGES_UNZIP=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FV=1 -REQUIRE_PACKAGES_UNZIP=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1788,20 +1672,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1933,13 +1817,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) @@ -2172,12 +2052,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/fpcsrc/ide/Makefile +++ fpc-2.2.2/fpcsrc/ide/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -305,9 +277,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_DIRS+=compiler endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_DIRS+=compiler -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_DIRS+=compiler endif @@ -410,9 +379,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_DIRS+=compiler endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_DIRS+=compiler -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_DIRS+=compiler endif @@ -425,9 +391,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_DIRS+=compiler endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_DIRS+=compiler -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_DIRS+=compiler endif @@ -446,21 +409,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=compiler endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_DIRS+=compiler -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_DIRS+=compiler endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_DIRS+=compiler -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_DIRS+=compiler -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_DIRS+=compiler -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=fp endif @@ -479,9 +430,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=fp endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=fp -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=fp endif @@ -584,9 +532,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=fp endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=fp -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=fp endif @@ -599,9 +544,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=fp endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=fp -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=fp endif @@ -620,21 +562,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=fp endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=fp -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=fp endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=fp -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=fp -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=fp -endif override INSTALL_DATADIR=$(INSTALL_BASEDIR)/ide override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) @@ -655,9 +585,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-Sg endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-Sg -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-Sg endif @@ -760,9 +687,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-Sg endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-Sg -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-Sg endif @@ -775,9 +699,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-Sg endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-Sg -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-Sg endif @@ -796,21 +717,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-Sg endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-Sg -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-Sg endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-Sg -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1131,11 +1040,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1632,12 +1536,6 @@ REQUIRE_PACKAGES_GDBINT=1 REQUIRE_PACKAGES_REGEXPR=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FV=1 -REQUIRE_PACKAGES_GDBINT=1 -REQUIRE_PACKAGES_REGEXPR=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FV=1 @@ -1842,12 +1740,6 @@ REQUIRE_PACKAGES_GDBINT=1 REQUIRE_PACKAGES_REGEXPR=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FV=1 -REQUIRE_PACKAGES_GDBINT=1 -REQUIRE_PACKAGES_REGEXPR=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FV=1 @@ -1872,12 +1764,6 @@ REQUIRE_PACKAGES_GDBINT=1 REQUIRE_PACKAGES_REGEXPR=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FV=1 -REQUIRE_PACKAGES_GDBINT=1 -REQUIRE_PACKAGES_REGEXPR=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FV=1 @@ -1914,36 +1800,12 @@ REQUIRE_PACKAGES_GDBINT=1 REQUIRE_PACKAGES_REGEXPR=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FV=1 -REQUIRE_PACKAGES_GDBINT=1 -REQUIRE_PACKAGES_REGEXPR=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_GDBINT=1 REQUIRE_PACKAGES_REGEXPR=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FV=1 -REQUIRE_PACKAGES_GDBINT=1 -REQUIRE_PACKAGES_REGEXPR=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FV=1 -REQUIRE_PACKAGES_GDBINT=1 -REQUIRE_PACKAGES_REGEXPR=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FV=1 -REQUIRE_PACKAGES_GDBINT=1 -REQUIRE_PACKAGES_REGEXPR=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2075,20 +1937,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2226,13 +2088,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) @@ -2465,12 +2323,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) @@ -2675,9 +2529,6 @@ ifeq ($(FULL_TARGET),i386-beos) TARGET_DIRS_COMPILER=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -TARGET_DIRS_COMPILER=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) TARGET_DIRS_COMPILER=1 endif @@ -2780,9 +2631,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) TARGET_DIRS_COMPILER=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_DIRS_COMPILER=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) TARGET_DIRS_COMPILER=1 endif @@ -2795,9 +2643,6 @@ ifeq ($(FULL_TARGET),arm-palmos) TARGET_DIRS_COMPILER=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_DIRS_COMPILER=1 -endif ifeq ($(FULL_TARGET),arm-wince) TARGET_DIRS_COMPILER=1 endif @@ -2816,21 +2661,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_COMPILER=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_DIRS_COMPILER=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) TARGET_DIRS_COMPILER=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -TARGET_DIRS_COMPILER=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -TARGET_DIRS_COMPILER=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -TARGET_DIRS_COMPILER=1 -endif ifdef TARGET_DIRS_COMPILER compiler_all: $(MAKE) -C compiler all --- fpc-2.2.2.orig/fpcsrc/ide/compiler/Makefile +++ fpc-2.2.2/fpcsrc/ide/compiler/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -108,11 +102,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -167,17 +157,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -199,7 +178,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -239,20 +218,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -303,9 +275,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_UNITS+=compunit endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=compunit -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=compunit endif @@ -408,9 +377,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=compunit endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=compunit -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=compunit endif @@ -423,9 +389,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=compunit endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=compunit -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=compunit endif @@ -444,21 +407,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=compunit endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=compunit -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=compunit endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=compunit -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=compunit -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=compunit -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-Ur -dNOCATCH @@ -478,9 +429,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_OPTIONS+=-Ur -dNOCATCH endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-Ur -dNOCATCH -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_OPTIONS+=-Ur -dNOCATCH endif @@ -583,9 +531,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-Ur -dNOCATCH endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-Ur -dNOCATCH -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-Ur -dNOCATCH endif @@ -598,9 +543,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-Ur -dNOCATCH endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-Ur -dNOCATCH -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-Ur -dNOCATCH endif @@ -619,21 +561,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-Ur -dNOCATCH endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-Ur -dNOCATCH -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-Ur -dNOCATCH endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-Ur -dNOCATCH -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-Ur -dNOCATCH -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-Ur -dNOCATCH -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) endif @@ -652,9 +582,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) endif @@ -757,9 +684,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) endif @@ -772,9 +696,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) endif @@ -793,21 +714,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems endif @@ -826,9 +735,6 @@ ifeq ($(FULL_TARGET),i386-beos) override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems -endif ifeq ($(FULL_TARGET),i386-netbsd) override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems endif @@ -931,9 +837,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems -endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems endif @@ -946,9 +849,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems endif @@ -967,21 +867,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1271,11 +1159,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1753,9 +1636,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 endif @@ -1858,9 +1738,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif @@ -1873,9 +1750,6 @@ ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1894,21 +1768,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1936,20 +1798,20 @@ endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2081,15 +1943,11 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) --- fpc-2.2.2.orig/fpcdocs/Makefile +++ fpc-2.2.2/fpcdocs/Makefile @@ -1,12 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/20] # 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 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-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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -57,11 +56,6 @@ SRCBATCHEXT=.bat endif endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -RUNBATCH=$(COMSPEC) /C -endif -endif ifdef inUnix PATHSEP=/ else @@ -107,11 +101,7 @@ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else FPC:=$(shell $(FPCPROG) -PB) -endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif @@ -166,17 +156,6 @@ endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -198,7 +177,7 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -238,20 +217,13 @@ ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -279,9 +251,6 @@ ifeq ($(FULL_TARGET),i386-beos) override TARGET_PROGRAMS+=cleanxml endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=cleanxml -endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_PROGRAMS+=cleanxml endif @@ -384,9 +353,6 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=cleanxml endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=cleanxml -endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_PROGRAMS+=cleanxml endif @@ -399,9 +365,6 @@ ifeq ($(FULL_TARGET),arm-palmos) override TARGET_PROGRAMS+=cleanxml endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=cleanxml -endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_PROGRAMS+=cleanxml endif @@ -420,21 +383,9 @@ ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=cleanxml endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=cleanxml -endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=cleanxml endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=cleanxml -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=cleanxml -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=cleanxml -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -724,11 +675,6 @@ EXEEXT= SHORTSUFFIX=be endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= @@ -1188,20 +1134,20 @@ TAREXT=.tar.gz endif ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) +override FPCOPTDEF=$(CPU_TARGET) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) +override FPCOPT+=-P$(CPU_TARGET) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -1333,13 +1279,9 @@ EXECPPAS= else ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_exes ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) @@ -1572,12 +1514,8 @@ ifdef inUnix /bin/sh $(ZIPWRAPPER) else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else $(ZIPWRAPPER) endif -endif $(DEL) $(ZIPWRAPPER) else $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) --- fpc-2.2.2.orig/debian/control +++ fpc-2.2.2/debian/control @@ -0,0 +1,352 @@ +Source: fpc +Section: devel +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Carlos Laviola +Uploaders: Torsten Werner , Mazen Neifer +Standards-Version: 3.8.0 +Build-Depends: debhelper (>= 5), quilt, fp-compiler (>= 2.0.4), fp-units-base, + fp-utils, mawk | awk, gs-common, libncurses5-dev, binutils, libreadline5-dev +Build-Depends-Indep: hevea +Vcs-Svn: https://bollin.googlecode.com/svn/fpc/trunk/ +Vcs-Browser: http://bollin.googlecode.com/svn/fpc/trunk/ +Homepage: http://www.freepascal.org/ + +Package: fpc +Architecture: all +Pre-Depends: dpkg (>= 1.10.24) +Depends: fp-units-rtl, fp-compiler, fp-units-base, fp-ide, fp-units-fcl, fp-units-fv, fp-units-gtk, fp-units-gtk2, fp-units-gnome1, fp-units-db, fp-units-gfx, fp-units-net, fp-units-misc, fp-units-multimedia +Recommends: fp-utils +Suggests: lazarus, fp-docs (>= ${source:Upstream-Version}) +Description: Free Pascal Compiler - Meta Package + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + Some extensions are added to the language, like function overloading. Shared + libraries can be linked and created. Delphi language extentions like classes, + exceptions, ansi strings and open arrays are also supported. + . + This package contains dependency on all FPC packages provided on your + architecture. Experienced users may want to install only packages they need, + and can skip installing this metapackage. + +Package: fpc-source +Section: devel +Architecture: all +Pre-Depends: dpkg (>= 1.10.24) +Description: Free Pascal Compiler - Source Code + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains Free Pascal's own source code. It is meant to be used by + the Lazarus IDE. + +Package: fp-compiler +Architecture: i386 powerpc sparc amd64 arm +Pre-Depends: dpkg (>= 1.10.24) +Depends: fp-units-rtl (= ${binary:Version}) +Suggests: fp-utils, fp-docs (>= ${source:Upstream-Version}) +Description: Free Pascal - Compiler + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + Some extensions are added to the language, like function overloading. Shared + libraries can be linked and created. Delphi language extentions like classes, + exceptions, ansi strings and open arrays are also supported. + . + This package contains the command line compiler. + +Package: fp-ide +Architecture: i386 powerpc sparc amd64 arm +Pre-Depends: dpkg (>= 1.10.24) +Depends: fp-units-rtl (= ${binary:Version}), ${shlibs:Depends} +Suggests: fp-utils, fp-docs (>= ${source:Upstream-Version}) +Description: Free Pascal - IDE + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + Some extensions are added to the language, like function overloading. Shared + libraries can be linked and created. Delphi language extentions like classes, + exceptions, ansi strings and open arrays are also supported. + . + This package contains the Integrated Development Environment (IDE). The IDE + has an internal compiler. + +Package: fp-utils +Architecture: i386 powerpc sparc amd64 arm +Pre-Depends: dpkg (>= 1.10.24) +Recommends: fp-compiler (= ${binary:Version}) +Description: Free Pascal - Utils + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains some handy utils for usage with the Free Pascal + Compiler: + - ppumove Place multiple units in a shared library + - ppufiles Show needed files for units + - ppudump Dump the information stored in a .ppu (unit) file + - fpcmake Create Makefile from Makefile.fpc + - h2pas Convert .h files to pascal units + - ppdep Create a dependency file which can be used with Makefiles + - ptop Source beautifier + - data2inc Convert binary/text data to include files + - plex/pyacc Pascal Lex/Yacc implementation + +Package: fp-docs +Section: doc +Architecture: all +Pre-Depends: dpkg (>= 1.10.24) +Description: Free Pascal - Documentation + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains the documentation for the Free Pascal Compiler. + The documentation is available in HTML and in PDF. + +Package: fp-units-rtl +Architecture: i386 powerpc sparc amd64 arm +Pre-Depends: dpkg (>= 1.10.24) +Recommends: fp-compiler (= ${binary:Version}) +Provides: fpc-abi-${source:Upstream-Version} +Description: Free Pascal - Runtime Library + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains the Runtime Libraries for the Free Pascal Compiler. + +Package: fp-units-base +Architecture: i386 powerpc sparc amd64 arm +Pre-Depends: dpkg (>= 1.10.24) +Depends: fp-units-rtl (= ${binary:Version}) +Description: Free Pascal - base units + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains Free Pascal units for common libraries. Some of these + units are also required by the Free Component Library: + - X11 (Xlib, Xutil) + - NCurses + - ZLib + +Package: fp-units-fcl +Architecture: i386 powerpc sparc amd64 arm +Pre-Depends: dpkg (>= 1.10.24) +Depends: fp-units-rtl (= ${binary:Version}), fp-units-base (= ${binary:Version}) +Description: Free Pascal - Free Component Library + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains the Free Component Library for the Free Pascal Compiler. + +Package: fp-units-fv +Architecture: i386 powerpc sparc amd64 arm +Pre-Depends: dpkg (>= 1.10.24) +Depends: fp-units-rtl (= ${binary:Version}) +Description: Free Pascal - Free Vision units + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains the Free Vision units for the Free Pascal Compiler. + +Package: fp-units-gtk +Architecture: i386 powerpc sparc amd64 arm +Pre-Depends: dpkg (>= 1.10.24) +Depends: fp-units-rtl (= ${binary:Version}), fp-units-fcl (= ${binary:Version}), libgtk2.0-dev +Description: Free Pascal - GTK+ 1.2 units + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains Free Pascal units and examples to create + programs with GTK+ 1.2. + +Package: fp-units-gtk2 +Architecture: i386 powerpc sparc amd64 arm +Pre-Depends: dpkg (>= 1.10.24) +Depends: fp-units-rtl (= ${binary:Version}), fp-units-fcl (= ${binary:Version}) +Description: Free Pascal - GTK+ 2.x units + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains Free Pascal units and examples to create + programs with GTK+ 2.x. + +Package: fp-units-gnome1 +Architecture: i386 powerpc sparc amd64 arm +Pre-Depends: dpkg (>= 1.10.24) +Depends: fp-units-rtl (= ${binary:Version}), fp-units-gtk (= ${binary:Version}) +Description: Free Pascal - GNOME 1 units + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains Free Pascal units and examples to create + programs for GNOME 1. + +Package: fp-units-db +Architecture: i386 powerpc sparc amd64 arm +Pre-Depends: dpkg (>= 1.10.24) +Depends: fp-units-rtl (= ${binary:Version}) +Description: Free Pascal - database libraries units + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains Free Pascal units with bindings for: + - MySQL + - Interbase + - PostgreSQL + - Oracle + - ODBC + - GDBM + - SQLite + +Package: fp-units-gfx +Architecture: i386 powerpc sparc amd64 arm +Pre-Depends: dpkg (>= 1.10.24) +Depends: fp-units-rtl (= ${binary:Version}), fp-units-base (= ${binary:Version}) +Description: Free Pascal - graphics libraries units + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains Free Pascal units with bindings for: + - opengl :OpenGL + - forms : Forms 0.88 + - svgalib : Svgalib + - ggi : General Graphical Interface + - libgd + - libpng + - graph + - openal + - cairo + +Package: fp-units-net +Architecture: i386 powerpc sparc amd64 arm +Pre-Depends: dpkg (>= 1.10.24) +Depends: fp-units-rtl (= ${binary:Version}) +Description: Free Pascal - networking units + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains Free Pascal units for creating network tools: + - netdb : NetDB unit for TCP/IP handling + - libasync : LibAsync unit for easy Asynchronous IO + - libcurl + - dbus: D-Bus + - httpd-1.3 + - httpd-2.0 + - httpd-2.2 + - ldap + - openssl : Open SSL + - pcap + +Package: fp-units-misc +Architecture: i386 powerpc sparc amd64 arm +Pre-Depends: dpkg (>= 1.10.24) +Depends: fp-units-rtl (= ${binary:Version}) +Description: Free Pascal - miscellaneous units + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains Free Pascal miscellaneous units for: + - Utmp + - PasZLib (Pascal-only zlib implementation) + +Package: fp-units-multimedia +Architecture: i386 powerpc sparc amd64 arm +Pre-Depends: dpkg (>= 1.10.24) +Depends: fp-units-rtl (= ${binary:Version}), libogg-dev, libvorbis-dev, a52dec-dev, libdts-dev, libmad0-dev, libmodplug-dev +Description: Free Pascal - miscellaneous units + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains Free Pascal multimedia interfacing units for: + - oggvorbis + - a52 + - dts + - mad + - modplug + +Package: fp-units-i386 +Architecture: i386 +Pre-Depends: dpkg (>= 1.10.24) +Depends: fp-units-rtl (= ${binary:Version}) +Description: Free Pascal - miscellaneous units + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains Free Pascal specific units for the i386 architecture: + - libc: used for compatibility with kylix, deprecated. --- fpc-2.2.2.orig/debian/fixdeb +++ fpc-2.2.2/debian/fixdeb @@ -0,0 +1,32 @@ +#!/bin/bash +# +# Create debian files from *.in files +# +# $1 = path to debian files +# $2 = fpc target (i386-linux) +# $3 = ppcXXX binary name (ppc386) +# +if [ $# != 3 ]; then + echo 'Usage : fixdeb path fpctarget ppcbin' + exit 1 +fi + +PACKAGEVERSION=`dpkg-parsechangelog | sed -ne's,^Version: \(.*\),\1,p'` +FPCVERSION=`echo $PACKAGEVERSION | sed -ne's,^\([0-9.]*\).*,\1,p'` +DEBVERSION=`echo $PACKAGEVERSION | awk -F '-' '{ print $NF }'` +FPCSVNPATH=`echo $FPCVERSION | awk -F '.' '{ print "release_"$1"_"$2"_"$3 }'` +FPCTARGET="$2" +PPCBIN="$3" + +echo 'PackageVersion: ' $PACKAGEVERSION +echo 'FPCVersion : ' $FPCVERSION +echo 'FPCTarget : ' $FPCTARGET +echo 'DebVersion : ' $DEBVERSION +echo 'PPCBin : ' $PPCBIN +echo 'SVNPath : ' $FPCSVNPATH + +for i in $1/*.in +do + j=$1/$(basename $i .in) + sed -e 's/%{fpcversion}/'$FPCVERSION'/g;s/%{packageversion}/'$PACKAGEVERSION'/g;s/%{ppcbin}/'$PPCBIN'/g;s/%{fpctarget}/'$FPCTARGET'/g;s/%{fpcsvnpath}/'$FPCSVNPATH'/g' $i > $j +done --- fpc-2.2.2.orig/debian/fpc-source.install.in +++ fpc-2.2.2/debian/fpc-source.install.in @@ -0,0 +1,3 @@ +/usr/share/fpcsrc/%{fpcversion}/compiler +/usr/share/fpcsrc/%{fpcversion}/packages +/usr/share/fpcsrc/%{fpcversion}/rtl --- fpc-2.2.2.orig/debian/README.Debian.in +++ fpc-2.2.2/debian/README.Debian.in @@ -0,0 +1,47 @@ +The Free Pascal Compiler for Debian +----------------------------------- + +The source tree was checked out from the subversion repository at +svn.freepascal.org with + 'svn co http://svn.freepascal.org/svn/fpcbuild/tags/%{fpcsvnpath}' + +Only PDF docs are built as shipped. You may want to make the HTML files with +tex4ht by yourself and eventually adapt the doc-base file. + +To create a new config file for fpc (/etc/fpc.cfg) use the command: + /usr/lib/fpc/%{fpcversion}/samplecfg /usr/lib/fpc/%{fpcversion} +However, you should be aware that said file (/etc/fpc.cfg) is +declared as a conffile since version 1.0.2. + +And, yes - this is a i386/amd64/powerpc/sparc/arm only package currently. + + +Web site and download information: +---------------------------------- + +The Original site is + http://www.freepascal.org/ + ftp://ftp.freepascal.org/ + +HTTP Mirrored at + http://www.nl.freepascal.org/ + http://www.de.freepascal.org/ + http://www.freepascal.sk/ + http://gd.tuwien.ac.at/languages/pascal/fpc/www/ + http://www.atlasz.com/freepascal/ + +FTP Mirrored at + http://fpc.planetmirror.com/pub/fpc/ + ftp://gd.tuwien.ac.at/languages/pascal/fpc/ + ftp://ftp.hu.freepascal.org/pub/fpc/ + ftp://ftp.uni-erlangen.de/pub/mirrors/freepascal/ + http://mirror.mirimar.net/freepascal/ + http://cdn.mirror.garr.it/mirrors/freepascal/ + ftp://ftpsv1.u-aizu.ac.jp/pub/lang/pascal/freepascal/ + ftp://ftp.nl.freepascal.org/pub/fpc/ + ftp://freepascal.stack.nl/pub/fpc/ + ftp://ftp.no.freepascal.org/pub/fpc/ + ftp://ftp.chg.ru/pub/lang/pascal/fpc/ + ftp://ftp.us.freepascal.org/pub/fpc/ + + -- Varun Hiremath , Sat, 20 Jan 2007 01:28:28 +0530 --- fpc-2.2.2.orig/debian/fp-units-gtk2.install.in +++ fpc-2.2.2/debian/fp-units-gtk2.install.in @@ -0,0 +1,3 @@ +/usr/share/doc/fp-units-gtk2 + +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/gtk2 --- fpc-2.2.2.orig/debian/fp-compiler.install.in +++ fpc-2.2.2/debian/fp-compiler.install.in @@ -0,0 +1,16 @@ +/etc/fpc.cfg +/usr/bin/fpc +/usr/bin/fpcsubst +/usr/bin/fpcmkcfg +/usr/bin/grab_vcsa +/usr/lib/fpc/%{fpcversion}/ppc* +/usr/lib/fpc/%{fpcversion}/samplecfg +/usr/lib/fpc/%{fpcversion}/msg +/usr/share/doc/fp-compiler +/usr/share/man/man1/fpc.1 +/usr/share/man/man1/fpcsubst.1 +/usr/share/man/man1/fpcmkcfg.1 +/usr/share/man/man1/ppc*.1 +/usr/share/man/man1/grab_vcsa.1 +/usr/share/man/man5/fpc.cfg.5 +/usr/bin/fpc-depends --- fpc-2.2.2.orig/debian/fp-units-gnome1.install.in +++ fpc-2.2.2/debian/fp-units-gnome1.install.in @@ -0,0 +1,4 @@ +/usr/share/doc/fp-units-gnome1 + +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/imlib +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/gnome1 --- fpc-2.2.2.orig/debian/fp-units-gfx.install.in +++ fpc-2.2.2/debian/fp-units-gfx.install.in @@ -0,0 +1,13 @@ +/usr/share/doc/fp-units-gfx +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/opengl +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/xforms +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/svgalib +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/ggi +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/libgd +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/libpng +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/graph +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/openal +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/cairo +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/imagemagick +/usr/bin/fd2pascal +/usr/share/man/man1/fd2pascal.1 --- fpc-2.2.2.orig/debian/fp-units-db.install.in +++ fpc-2.2.2/debian/fp-units-db.install.in @@ -0,0 +1,10 @@ +/usr/share/doc/fp-units-db + +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/mysql +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/ibase +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/postgres +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/oracle +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/odbc +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/gdbm +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/sqlite +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/pxlib --- fpc-2.2.2.orig/debian/changelog +++ fpc-2.2.2/debian/changelog @@ -0,0 +1,524 @@ +fpc (2.2.2-4ubuntu1) jaunty; urgency=low + + * Added patch to fix fp-units-gtk2 undefined references + (closes LP: #260464). The fix is included in upstream from + version 2.3.1. + + -- Paul Gevers Sat, 22 Nov 2008 18:41:47 -0600 + +fpc (2.2.2-4) unstable; urgency=low + + [ Torsten Werner ] + * Update ABI version in fpc-depends automatically. + * Remove empty directories from binary package fpc-source. + + [ Mazen Neifer ] + * Removed leading path when calling update-alternatives to remove a Linitian + error. + * Fixed clean target. + * Improved description of packages. (Closes: #498882) + + -- Mazen Neifer Thu, 09 Oct 2008 23:29:00 +0200 + +fpc (2.2.2-3) unstable; urgency=low + + * Add *.fpc files to the binary package fpc-source. + + -- Torsten Werner Wed, 20 Aug 2008 01:07:06 +0200 + +fpc (2.2.2-2) unstable; urgency=low + + * Add patch manpages.diff that fixes various errors in the man pages. + * Switch from dpatch to quilt. + * Yak shaving to make lintian happy: remove unneeded files from binary + package fpc-source. + * Fix Provides: field of fp-unit-rtl. + + -- Torsten Werner Sun, 17 Aug 2008 15:10:22 +0200 + +fpc (2.2.2-1) unstable; urgency=low + + [ Mazen Neifer ] + * new upstream release + - shlobj changes + - fix for wince library support + - fix for windows 64 bit support for >2GB memory + - Documentation was updated completely to conform to the actual state of + the compiler and RTL. + - Possible CodeGear Copyright infringements in the source were reworked + using cleanroom approach. + * Remove all patches that are now obsolete. + + [ Torsten Werner ] + * Bump up Standards-Version: 3.8.0 (no changes needed). + * Do not install extra license files. + * Fix some other lintian warnings. + + -- Torsten Werner Tue, 12 Aug 2008 16:55:14 +0200 + +fpc (2.2.0-dfsg1-9) unstable; urgency=low + + [ Torsten Werner ] + * Add Mazen Neifer to Uploaders field. + + [ Mazen Neifer ] + * Moved FPC sources into a version dependent directory from /usr/share/fpcsrc + to /usr/share/fpcsrc/${FPCVERSION}. This allow installing more than on FPC + release. + * Fixed far call issue in compiler preventing building huge binearies. + (closes: #477743) + * Updated building dependencies, recomennded and suggested packages. + * Moved fppkg to fp-utils as it is just a helper tool and is not required by + compiler. + + -- Mazen Neifer Sat, 17 May 2008 17:12:11 +0200 + +fpc (2.2.0-dfsg1-8) unstable; urgency=low + + [ Mazen Neifer ] + * Fixed build of fpc-source package cased by accidental remove of + fpc-source.install file during clean-patched target execution. + * Fixed Build-Depend clause (needs binutils instead of binutils-dev and no + need for libgpmg1-dev). + * Added man pages to the same packages including corresponding binaries. + * Removed from fpc-source code which isn't required by Lazarus code tool. + + -- Mazen Neifer Thu, 08 May 2008 17:45:19 +0200 + +fpc (2.2.0-dfsg1-7) unstable; urgency=low + + [ Mazen Neifer ] + * Added make files to source package. This required by fpcmake tool to succeed + cross platform compilation. + * Added man pages for fpcmkcfg, fpcsubst, fpcres, mkxmlrpc and rmcvsdir + binaries. + + -- Mazen Neifer Wed, 30 Apr 2008 16:01:50 +0200 + +fpc (2.2.0-dfsg1-6) unstable; urgency=medium + + * Remove the patch 09_powerpc again because the bug is in libgdb-dev and + will be fixed there. + * Disable Build-Depends: libexpat1-dev, libgdb-dev because fpc is + incompatible to gdb 6.8. (Closes: #473955) + * Set urgency to medium because we are fixing a FTBFS bug only. + + -- Torsten Werner Sat, 29 Mar 2008 23:31:44 +0100 + +fpc (2.2.0-dfsg1-5) unstable; urgency=low + + [ Mazen Neifer ] + * Applied fixes from upstream to packages/fcl-xml + + [ Torsten Werner ] + * Add a new patch 09_powerpc to make the package builds on powerpc + architecture. + + -- Torsten Werner Sat, 29 Mar 2008 10:39:26 +0100 + +fpc (2.2.0-dfsg1-4) unstable; urgency=low + + * Build fp-ide with debugger support. (Closes: #328701) + * Remove unneeded Build-Depends: findutils. + * Update Standards-Version: 3.7.3. + * Change Depends: mawk | awk. + * Clean up some lintian errors and warnings. + + -- Torsten Werner Sat, 15 Mar 2008 19:18:23 +0100 + +fpc (2.2.0-dfsg1-3) unstable; urgency=low + + * Add files matching *.inc to package fpc-source. + + -- Torsten Werner Sat, 29 Dec 2007 22:29:07 +0100 + +fpc (2.2.0-dfsg1-2) unstable; urgency=low + + [ Torsten Werner ] + * Set Architecture: all for fpc package. + * Fix bug in debian/rules: it's $(FPCVERSION) not $(FPC_VERSION). + (Closes: #457951) + + [ Mazen Neifer ] + * New patch from upstream fixes non-deterministic register allocation on + sparc + * Modified rules to apply patches before building compiler + + -- Torsten Werner Sat, 29 Dec 2007 15:49:57 +0100 + +fpc (2.2.0-dfsg1-1) unstable; urgency=low + + * Remove all files matching *.o from upstream's tarball. + * Change fpc-source package: + - Do not copy directories installer and tests because they are not needed + by lazarus. + - Install only files matching *.pas and *.pp. + * Clean up the XXXVERSION cruft in debian/rules and debian/fixdeb. + * Update FSF address in debian/copyright. + + -- Torsten Werner Thu, 20 Dec 2007 18:46:55 +0100 + +fpc (2.2.0-3) unstable; urgency=low + + * Create binary package fpc-source again after having some discussion on + debian-devel. (Closes: #413805) + * Use bzip2 when creating binary packages and add + Pre-Depends: dpkg (>= 1.10.24). + * Add the fpc-depends tool. + + -- Torsten Werner Sun, 09 Dec 2007 22:35:01 +0100 + +fpc (2.2.0-2) unstable; urgency=low + + [ Mazen Neifer ] + * Added dbase to fcl-db packaged units for arch other than i386. + * Fixed build issue for sparc and powerpc arch. + + -- Torsten Werner Fri, 07 Dec 2007 09:22:17 +0100 + +fpc (2.2.0-1) unstable; urgency=low + + [ Carlos Laviola ] + * New upstream release. (Closes: #442206) + * Added arm as a supported arch. (Closes: #408693) + * fp-units-gfx depends on libggi-dev. (Closes: #423659) + * fp-ide bugs fixed in the new version. (Closes: #423099, #423601, #423602) + * general cleanup on debian/{rules,control,...} + + [ Torsten Werner ] + * Complete debian/copyright. + * Add debian/watch and get-orig-source target in debian/rules. + * Remove *.dll, *.exe, and *.log from upstream tarball. + + -- Torsten Werner Fri, 23 Nov 2007 20:30:45 +0100 + +fpc (2.0.4-5) unstable; urgency=low + + * Fixed Build-Depends. + * Add myself to Uploaders in debian/control. + * Make sure that the sources are really patched before building them. + * Build unit 'libc' on powerpc too. + + -- Torsten Werner Sat, 27 Jan 2007 20:08:50 +0100 + +fpc (2.0.4-4) unstable; urgency=low + + * debian/rules: Separate out the documentation build into build-doc to + stop the documentations from building on binary-arch builds resulting + in FTBFS. + * Add Index value in debian/fp-docs.doc-base (Closes: #407715) + + -- Varun Hiremath Sun, 21 Jan 2007 20:49:43 +0530 + +fpc (2.0.4-3) unstable; urgency=medium + + * Added dpatch as a build dependency. (Closes: #407594) + + -- Carlos Laviola Sun, 21 Jan 2007 17:08:58 -0200 + +fpc (2.0.4-2) unstable; urgency=low + + * New release fixes Bug: "fp-compiler: miscompiles multilevel + if-statement" (Closes: #403586) + * Provide html docs (Closes: #150150) + + debian/rules: Set DOCTYPE=html and use CONVERTER=hevea + + debian/control: Add hevea to Build-Depends + + -- Varun Hiremath Tue, 16 Jan 2007 21:53:01 +0530 + +fpc (2.0.4-1) unstable; urgency=low + + [ Mazen Neifer ] + * New release (Closes: #383055) + + [ Torsten Werner ] + * Fix bugs in debian/fp-compiler.pre*.in. + * Updated debian/control to use variables provides by newer versions of + dpkg. + * Add XS-X-Vcs-Svn header to debian/control. + * Add german po files from Holger Wansing. (Closes: #348408, #346247) + * Remove unneeded debian/fp-compiler.conffiles. + * Fixed debian/changelog (lintian error). + * Changed Build-Depends: gawk | awk. + + [ Varun Hiremath ] + * Bump Standards version to 3.7.2 + * Add Homepage in debian/control file. + * Add fp-units-gtk2 missing dependencies (Closes: #337990) + + -- Torsten Werner Sun, 14 Jan 2007 11:40:59 +0100 + +fpc (2.0.4-rc3) unstable; urgency=low + + * New release candidate + + -- Mazen Neifer Sun, 06 Aug 2006 19:00:00 +0200 + +fpc (2.0.4-rc2) unstable; urgency=low + + * New release candidate + + -- Mazen Neifer Tue, 18 Jul 2006 21:23:26 +0200 + +fpc (2.0.4-rc1) unstable; urgency=low + + * New release + + -- Peter Vreman Thu, 07 Jul 2006 12:00:00 +0100 + +fpc (2.0.0-4) unstable; urgency=low + + * debian/control.in: add amd64 to the Architecture field. + + -- Carlos Laviola Fri, 9 Sep 2005 18:38:26 -0300 + +fpc (2.0.0-3) unstable; urgency=medium + + * Created a prerm and preinst for fp-compiler, as /usr/bin/fpc needs to + be removed from the list of 'pc' alternatives. (Closes: #311436) + * Added amd64 to the architecture list. (Closes: #315220) + + -- Carlos Laviola Fri, 2 Sep 2005 10:27:21 -0300 + +fpc (2.0.0-2) unstable; urgency=low + + * debian/fp-compiler.postinst.in: forgot to reapply the patch that + correctly creates the slave link to pc(1). (Closes: #310907) + + -- Carlos Laviola Mon, 30 May 2005 11:59:10 -0300 + +fpc (2.0.0-1) unstable; urgency=low + + * As I couldn't upload 1.9.8 on all supported architectures before 2.0.0 + was released, I'm rehashing its changelog now. + * New upstream release. + Bugs fixed on CVS before 1.9.8: + * man/man1/fpc.1: -OPn changed to -Opn in rev 1.8 (Closes: #255960) + * debian/fp-compiler.postinst.in: fixed in rev 1.5 (Closes: #269853) + Bugs fixed on CVS before 1.9.6: + * rtl/unix/crt.pp: fixed in rev 1.20 (Closes: #216060) + * rtl/i386/strings.inc: fixed in rev 1.16 (Closes: #288955) + * compiler/nadd.pas: fixed in rev 1.126 (Closes: #297881) + * debian/control: Added missing build dependencies on libgpmg1-dev and + libncurses5-dev and set save_size at build time, which finally makes + the package build without manual intervention. (Closes: #304633) + + -- Carlos Laviola Fri, 20 May 2005 19:07:00 -0300 + +fpc (1.9.6-2) unstable; urgency=low + + * debian/control: Oops -- fp-units-fv had the wrong description. + + -- Carlos Laviola Fri, 14 Jan 2005 13:15:50 -0200 + +fpc (1.9.6-1) unstable; urgency=low + + * New upstream release. + * debian/control: Added build dependency on libgpmg1-dev. + + -- Carlos Laviola Fri, 31 Dec 2004 21:16:25 -0200 + +fpc (1.9.4-5) unstable; urgency=low + + * fp-compiler: needs ld, adding dependency on binutils. (Closes: #265265) + + -- Carlos Laviola Thu, 12 Aug 2004 16:29:37 -0300 + +fpc (1.9.4-4) unstable; urgency=low + + * debian/control.in: Oops, forgot to update the Build-Deps for this file, + which generates debian/control per se. (Closes: #263942) + + -- Carlos Laviola Sun, 8 Aug 2004 22:12:41 -0300 + +fpc (1.9.4-3) unstable; urgency=low + + * Package needs fpcmake to build pretty much everything, so we need to + build-dep on fp-utils. Thanks to Daniel Schepler for finding the bug + and for Jurij Smakov's aid. (Closes: #263942) + * debian/README.Debian: removes mentions to old problems with tetex, fixes + spelling mistakes and other minor issues. + + -- Carlos Laviola Fri, 6 Aug 2004 19:46:51 -0300 + +fpc (1.9.4-2) unstable; urgency=low + + * The following fixes are the work of Marco van de Voort from CVS HEAD: + - man/man1/ppc386.1: typo fix. (Closes: #255960) + - rtl/unix/crt.pp: gotoxy/XY2Ansi fixes from. + (Closes: #216057, #216060) + - docs/linuxex, docs/dosex, docs/refex: various examples ported to + fpc 1.9.x's new API. + + -- Carlos Laviola Tue, 20 Jul 2004 15:12:05 -0300 + +fpc (1.9.4-1) unstable; urgency=low + + * This release is partly the work of Peter Vreman . + * Acknowledging NMU. (Closes: #221316) + * Made the description for the units packages more informative. + (Closes: #209518, #209581, #209613) + * Applied some patches from Marco van de Voort to CVS HEAD that fixed + compiling the documentation on powerpc with some adaptations of mine. + + -- Carlos Laviola Sat, 17 Jul 2004 21:53:03 -0300 + +fpc (1.0.10-1.2) unstable; urgency=low + + * NMU + * debian/control: Also had to remove build dependency on latex2html here + (Closes: #221316) + + -- Roland Stigge Thu, 12 Feb 2004 10:27:20 +0100 + +fpc (1.0.10-1.1) unstable; urgency=low + + * NMU + * debian/control.in: Removed Build-Depends: latex2html which moved to + non-free (Closes: #221316) + + -- Roland Stigge Sat, 20 Dec 2003 20:45:41 +0100 + +fpc (1.0.10-1) unstable; urgency=low + + * New upstream release. + * Acknowledging Amaya's NMU. Thanks for the hand. (Closes: #141439) + * Package dependency lists corrected. (Closes: #84863, #155158) + * Example compiles correctly now. (Closes: #174371) + * Fixed vanishing fpc(1) manpage if gpc is installed. (Closes: #136283) + * Fixed manpage error. (Closes: #191695) + * Spelling mistakes are gone. (Closes: #124637, #124638) + * Both bugs (doc-base-file-references-usr-doc and debian-changelog-file- + contains-obsolete-user-emacs-settings, in lintian tags) were corrected + long ago. (Closes: #127092) + * Upstream have added the AddDisk function. (Closes: #103163) + + -- Carlos Laviola Sat, 2 Aug 2003 04:35:51 -0300 + +fpc (1.0.6-2) unstable; urgency=low + + * NMU for Debcamp BSP. + * Apply a very silly patch (Closes: #141439), which was RC. The PDF file now + builds. + * Updated versioned-build-depends-on-debhelper. + + -- Amaya Rodrigo Sastre Sat, 12 Jul 2003 17:58:50 +0200 + +fpc (1.0.6-1) unstable; urgency=low + + * New upstream version. (Closes: #154199) + + -- Carlos Laviola Sat, 10 Aug 2002 04:26:15 -0300 + +fpc (1.0.4+1.0.6cvs20020228-1) unstable; urgency=low + + * New upstream version. + + -- Peter Vreman Tue, 1 Mar 2002 11:01:50 +0100 + +fpc (1.0.4-2) unstable; urgency=low + + * New maintainer. + * debian/README.Debian: Added a note on building 'pdflatex.fmt', which is + needed by pdflatex, in order to build the documentation in PDF format. + * debian/control: added latex2html, dvipdfm and tetex-extra to the + build-deps list. + + -- Carlos Laviola Wed, 29 Aug 2001 23:15:17 -0300 + +fpc (1.0.4-1) unstable; urgency=low + + * New upstream version. + + -- Ulf Jaenicke-Roessler Tue, 2 Jan 2001 11:01:50 +0100 + +fpc (1.0.3-0.20001206.1) unstable; urgency=low + + * Snapshot release from CVS 2000/12/06. + * Fixes internal compiler error on (buggy) appearance of + array of Date (Closes:#60720). + * ppc386 can be called more intuitively as fpc (Closes:#74810). + * Help option '-h' is (somewhat) more propagated than '-?' + (Closes:#74811). Furthermore, help is displayed when fpc + is called without any parameter. + * Package supports alternatives now, in order to be used as + "Pascal compiler" (pc) from Makefile(s) (Closes:#76615). + + -- Ulf Jaenicke-Roessler Wed, 6 Dec 2000 11:29:28 +0100 + +fpc (1.0.2-1) unstable; urgency=low + + * New upstream version. + * Maintainer field changed. + * Bug#60720 had already been fixed in the development tree some + time ago after the last upload (hence, this Closes: #60720). + + -- Ulf Jaenicke-Roessler Fri, 13 Oct 2000 13:11:34 +0200 + +fpc (1.0.1-0.20000811.1) unstable; urgency=low + + * Built for `official' upload. CVS as of 2000/08/11 - NMU. + * Update to latest version, thus Closes: #56873. + * Removes /usr/bin/ppc386 link upon package removal. Closes: #64403. + * This upload also Closes: #68801. + * Added Build-Depends. Hmmm, 'fp-compiler' is somehow like `the chicken + and the egg' story... + + -- Ulf Jaenicke-Roessler Fri, 11 Aug 2000 22:49:37 +0200 + +fpc (1.0.1-0) unstable; urgency=low + + * New Upstream Release + + -- Peter Vreman Sun, 09 Jun 2000 12:00:00 +0200 + +fpc (0.99.13-19991013-4) unstable; urgency=low + + * Fixed bashism in samplecfg (Closes: Bug#50636) + * Changed source-arch to 'i386' (Closes: Bug#50438) + + -- Mika Fischer Sat, 20 Nov 1999 22:18:11 +0100 + +fpc (0.99.13-19991013-3) unstable; urgency=low + + * Fixed bug which overwrote existing config files during an update + (Closes: Bug#50278) + + -- Mika Fischer Tue, 16 Nov 1999 23:57:36 +0100 + +fpc (0.99.13-19991013-2) unstable; urgency=low + + * Fixed bug in debian/rules (Fixes: #50096) + + -- Mika Fischer Sat, 13 Nov 1999 20:31:20 +0100 + +fpc (0.99.13-19991013-1) unstable; urgency=low + + * Removed fp-fv due to licensing issues. + + -- Mika Fischer Wed, 13 Oct 1999 19:33:30 +0200 + +fpc (0.99.13-19991005-1) unstable; urgency=low + + * New maintainer + + -- Mika Fischer Wed, 13 Oct 1999 19:33:13 +0200 + +fpc (0.99.13-19991001-1) unstable; urgency=low + + * New maintainer + * Updated to policy 3.0.1 + + -- Joseph Carter Tue, 27 Jul 1999 18:05:05 -0700 + +fpc (0.99.12b-1) unstable; urgency=low + + * New Upstream Release + + -- Peter Vreman Thu, 10 Jun 1999 12:00:00 +0200 + +fpc (0.99.12a-1) unstable; urgency=low + + * Initial Release + + -- Peter Vreman Thu, 10 Jun 1999 12:00:00 +0200 --- fpc-2.2.2.orig/debian/watch +++ fpc-2.2.2/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/freepascal/ fpcbuild-(.*).tar.gz debian debian/orig-tar.sh --- fpc-2.2.2.orig/debian/fp-compiler.postinst.in +++ fpc-2.2.2/debian/fp-compiler.postinst.in @@ -0,0 +1,16 @@ +#! /bin/sh + +set -e + +FPCDIR=/usr/lib/fpc/%{fpcversion} + +# add alternative +update-alternatives \ + --install /usr/bin/pc pc /usr/bin/fpc 20 \ + --slave /usr/share/man/man1/pc.1.gz pc.1.gz /usr/share/man/man1/fpc.1.gz + +# create link +ln -sf $FPCDIR/%{ppcbin} /usr/bin/%{ppcbin} + +# Debhelper code +#DEBHELPER# --- fpc-2.2.2.orig/debian/fp-compiler.preinst.in +++ fpc-2.2.2/debian/fp-compiler.preinst.in @@ -0,0 +1,12 @@ +#! /bin/sh + +set -e + +# Remove fpc from pc alternative if buggy 2.0.0-{1,2} versions are upgraded + +if [ "$1" = "upgrade" ] && [ "$2" = "2.0.0-1" ] || [ "$2" = "2.0.0-2" ]; then + update-alternatives --remove pc /usr/bin/fpc +fi + +# Debhelper code +#DEBHELPER# --- fpc-2.2.2.orig/debian/moveexamples +++ fpc-2.2.2/debian/moveexamples @@ -0,0 +1,52 @@ +#!/bin/bash + +set -e + +EXAMPLE_TEMP=$1 +DOC_DIR=$2 + +function move_examples() +{ + # Make examples dir + install -d -m 755 $DOC_DIR/fp-units-$1/examples/ + + for package in $2 + do + if [ -d $EXAMPLE_TEMP/$package/examples ]; then + echo "Moving examples of $package" + EXAMPLE_TEMP_DIR="$EXAMPLE_TEMP/$package/examples" + EXAMPLE_INSTALL_DIR="$DOC_DIR/fp-units-$1/examples/$package" + # Move dir renaming it + if [ -e "${EXAMPLE_INSTALL_DIR}" ] + then + echo "#### \"${EXAMPLE_INSTALL_DIR}\" is in the way, please remove it first ####" + exit 255 + else + mv -v -f "${EXAMPLE_TEMP_DIR}" "${EXAMPLE_INSTALL_DIR}" + rmdir $EXAMPLE_TEMP/$package + # Remove empty directories: + rmdir --ignore-fail-on-non-empty "${EXAMPLE_INSTALL_DIR}" + fi + fi + done + + # Remove empty directories: + rmdir --ignore-fail-on-non-empty $DOC_DIR/fp-units-$1/examples +} + +echo '**** Copying examples ****' +PACKAGE_LIST='debian/fp-units-'*'.install.in' + +for PACKAGE_FILE in ${PACKAGE_LIST} +do + PACKAGE_NAME=`basename "${PACKAGE_FILE}" '.install.in' | sed -e 's/fp-units-//'` + PACKAGE_CONTENT=`grep '/usr/lib/fpc' "${PACKAGE_FILE}" | sed -e 's@.*/\([^/]\)/\?@\1@'` + echo ' **** PACKAGE_NAME = "'${PACKAGE_NAME}'"' + echo ' **** PACKAGE_CONTENT = "'${PACKAGE_CONTENT}'"' + move_examples "${PACKAGE_NAME}" "${PACKAGE_CONTENT}" +done + +echo '**** Examples copyed ****' + +rmdir $EXAMPLE_TEMP + --- fpc-2.2.2.orig/debian/fp-compiler.postrm.in +++ fpc-2.2.2/debian/fp-compiler.postrm.in @@ -0,0 +1,11 @@ +#! /bin/sh + +set -e + +FPCDIR=/usr/lib/fpc/%{fpcversion} + +# remove link +rm -f /usr/bin/%{ppcbin} + +# Debhelper code +#DEBHELPER# --- fpc-2.2.2.orig/debian/fp-compiler.prerm.in +++ fpc-2.2.2/debian/fp-compiler.prerm.in @@ -0,0 +1,9 @@ +#! /bin/sh + +set -e + +# remove alternative +update-alternatives --remove pc /usr/bin/fpc + +# Debhelper code +#DEBHELPER# --- fpc-2.2.2.orig/debian/compat +++ fpc-2.2.2/debian/compat @@ -0,0 +1 @@ +5 --- fpc-2.2.2.orig/debian/fp-docs.install.in +++ fpc-2.2.2/debian/fp-docs.install.in @@ -0,0 +1 @@ +/usr/share/doc/fp-docs --- fpc-2.2.2.orig/debian/fp-units-multimedia.install.in +++ fpc-2.2.2/debian/fp-units-multimedia.install.in @@ -0,0 +1,8 @@ +/usr/share/doc/fp-units-multimedia + +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/oggvorbis +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/a52 +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/dts +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/mad +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/modplug +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/sdl --- fpc-2.2.2.orig/debian/fp-ide.install.in +++ fpc-2.2.2/debian/fp-ide.install.in @@ -0,0 +1,5 @@ +/usr/bin/fp +/usr/lib/fpc/%{fpcversion}/ide +/usr/share/doc/fp-ide +/usr/share/man/man1/fp.1 + --- fpc-2.2.2.orig/debian/fp-units-fcl.install.in +++ fpc-2.2.2/debian/fp-units-fcl.install.in @@ -0,0 +1,13 @@ +/usr/share/doc/fp-units-fcl +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fcl-base +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fcl-db +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fcl-fpcunit +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fcl-image +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fcl-net +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fcl-passrc +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fcl-registry +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fcl-web +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fcl-xml +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fcl-async +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fcl-json +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fcl-process --- fpc-2.2.2.orig/debian/rules +++ fpc-2.2.2/debian/rules @@ -0,0 +1,293 @@ +#!/usr/bin/make -f +# debian/rules for Free Pascal + +DEB_DH_BUILDDEB_ARGS := -- -Z bzip2 +export DH_ALWAYS_EXCLUDE := COPYING:LICENSE + +# Documentation type to use pdf/html +ifeq (${DEBDOCTYPE},) +DOCTYPE=html +# HTML Converter l2h/4ht/hevea or html for (default) +CONVERTER=hevea +else +DOCTYPE=${DEBDOCTYPE} +CONVERTER=${DOCTYPE} +endif + +# Detect name of new compiler, take care that debian uses amd64 instead of x86_64 +CPU_SOURCE=$(subst amd64,x86_64,$(shell dpkg-architecture -qDEB_BUILD_ARCH)) +CPU_TARGET=$(subst amd64,x86_64,$(shell dpkg-architecture -qDEB_HOST_ARCH)) + +ifeq ($(CPU_TARGET),m68k) +PPSUF=68k +endif +ifeq ($(CPU_TARGET),i386) +PPSUF=386 +endif +ifeq ($(CPU_TARGET),x86_64) +PPSUF=x64 +endif +ifeq ($(CPU_TARGET),powerpc) +PPSUF=ppc +endif +ifeq ($(CPU_TARGET),alpha) +PPSUF=axp +endif +ifeq ($(CPU_TARGET),arm) +PPSUF=arm +endif +ifeq ($(CPU_TARGET),sparc) +PPSUF=sparc +endif + +ifneq ($(CPU_SOURCE),$(CPU_TARGET)) +PPPRE=ppcross +else +PPPRE=ppc +endif + +PPNEW=$(PPPRE)$(PPSUF) + +# Reset FPC and FPCDIR if it was set +FPC= +FPCDIR= +# Get Package version and FPC version out of changelog file +FPCMAINVERSION:=$(shell dpkg-parsechangelog | sed -ne's,^Version: \([0-9.]*\).*,\1,p') +FPCFULLVERSION:=$(shell dpkg-parsechangelog | sed -ne's,^Version: \([0-9.rc]*\).*,\1,p') +FPCTARGET=$(CPU_TARGET)-linux +# Get directories +CURDIR:=$(shell pwd) +BUILD_DIR=$(CURDIR)/debian/build +INSTALL_DIR=$(CURDIR)/debian/tmp +DOC_DIR=$(INSTALL_DIR)/usr/share/doc +EXAMPLE_TEMP=$(DOC_DIR)/fpc-$(FPCMAINVERSION) +SRC_DIR=$(INSTALL_DIR)/usr/share/fpcsrc/${FPCMAINVERSION} +# Get utils +ifndef MKDIR +MKDIR=mkdir -p +endif +NEWPP=$(CURDIR)/fpcsrc/compiler/$(PPNEW) +NEWFPDOC=$(CURDIR)/fpcsrc/utils/fpdoc/fpdoc +NEWFPCMAKE=$(CURDIR)/fpcsrc/utils/fpcm/fpcmake +# Create default options +BUILDOPTS=PP=$(NEWPP) +INSTALLOPTS=PP=$(NEWPP) FPCMAKE=$(NEWFPCMAKE) INSTALL_PREFIX=$(INSTALL_DIR)/usr +# Get fpcmake from path if none is specified. +ifndef FPCMAKE +FPCMAKE=fpcmake +endif + +export GDBLIBDIR := /usr/lib + +# export DH_VERBOSE=1 + +################### +# Clean +# + +clean: patch configure clean-patched unpatch +clean-patched: + @echo "--- Cleaning" + dh_testdir + dh_testroot + rm -f build-arch-stamp install-arch-stamp arrange-arch-stamp configure-stamp + rm -f build-doc-stamp install-doc-stamp + rm -f build-indep-stamp install-indep-stamp + rm -f debian-files-stamp + rm -f debian/*.files debian/*.docs debian/*.examples debian/*.postinst debian/*.postrm + rm -f debian/fpc-depends.1 + $(MAKE) -C fpcsrc compiler_distclean + $(MAKE) -C fpcsrc rtl_distclean + $(MAKE) -C fpcsrc packages_distclean + $(MAKE) -C fpcsrc ide_distclean + $(MAKE) -C fpcsrc utils_distclean + $(MAKE) -C fpcdocs clean + find '(' -name '*.a' -or -name '*.o' -or -name '*.so' -or -name '*.ppu' ')' -exec rm -f '{}' ';' + dh_clean + +patch: patch-stamp + +patch-stamp: + QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 + touch patch-stamp + +unpatch: + QUILT_PATCHES=debian/patches quilt pop -a || test $$? = 2 + rm -rf patch-stamp debian/patched + +################### +# Debian files +# + +debian-files: debian-files-stamp +debian-files-stamp: patch + @echo "--- Creating/fixing *.install files" + /bin/bash debian/fixdeb debian $(FPCTARGET) $(PPNEW) + touch debian-files-stamp + +################### +# Arch packages +# + +configure: configure-stamp +configure-stamp: + dh_testdir + # Remove auto-generated make files. + find -name Makefile.fpc -execdir 'sh' '-c' '${RM} $$(basename {} .fpc)' ';' + # Regenrate make files using fpcmake. + ${FPCMAKE} -r -Tall */Makefile.fpc + touch configure-stamp + +build-arch: build-arch-stamp +build-arch-stamp: debian-files-stamp configure-stamp + @echo "--- Building" + dh_testdir +# First make a new Compiler and RTL using a make cycle + $(MAKE) -C fpcsrc compiler_cycle + $(MAKE) -C fpcsrc rtl_clean rtl_smart $(BUILDOPTS) + $(MAKE) -C fpcsrc packages_smart $(BUILDOPTS) + $(MAKE) -C fpcsrc ide_all $(BUILDOPTS) + $(MAKE) -C fpcsrc utils_all $(BUILDOPTS) + touch build-arch-stamp + +install-arch: install-arch-stamp +install-arch-stamp: build-arch-stamp debian-files-stamp + @echo "--- Installing" + dh_testdir + dh_testroot + dh_clean -k +# Specify the compiler to use so installing will use the correct versioned dir + $(MAKE) -C fpcsrc compiler_distinstall $(INSTALLOPTS) + $(MAKE) -C fpcsrc rtl_distinstall $(INSTALLOPTS) + $(MAKE) -C fpcsrc packages_distinstall $(INSTALLOPTS) + $(MAKE) -C fpcsrc ide_distinstall $(INSTALLOPTS) INSTALL_DOCDIR=$(DOC_DIR)/fp-ide + $(MAKE) -C fpcsrc utils_distinstall $(INSTALLOPTS) +# Copy examples to the correct doc dir + /bin/bash debian/moveexamples $(EXAMPLE_TEMP) $(DOC_DIR) +# Install man pages + $(MAKE) -C install/man installman $(INSTALLOPTS) INSTALL_PREFIX=$(INSTALL_DIR)/usr/share +# Install RTL demos + $(MAKE) -C demo sourceinstall $(INSTALLOPTS) INSTALL_SOURCEDIR=$(DOC_DIR)/fp-compiler +# Install whatsnew and readme + $(MAKE) -C install/doc installdoc $(INSTALLOPTS) INSTALL_DOCDIR=$(DOC_DIR)/fp-compiler +# Create fpc.cfg which is included as conffile + /bin/bash fpcsrc/compiler/utils/samplecfg \ + /usr/lib/fpc/$(FPCFULLVERSION) $(INSTALL_DIR)/etc + install -D debian/fpc-depends debian/tmp/usr/bin/ + set -x; for PACKAGE in fp-compiler fp-ide fp-units-gfx fp-units-misc fp-units-net fp-utils; do \ + install -m644 -D debian/overrides/$$PACKAGE \ + debian/$$PACKAGE/usr/share/lintian/overrides/$$PACKAGE; \ + done + touch install-arch-stamp + +arrange-arch: arrange-arch-stamp +arrange-arch-stamp: install-arch-stamp debian-files-stamp + dh_testdir + dh_testroot + dh_install -s --sourcedir=debian/tmp --list-missing + + touch arrange-arch-stamp + +build-indep: patch +install-indep: + touch install-indep-stamp + +################### +# Documentation +# + +build-doc: patch build-doc-stamp +build-doc-stamp: debian-files-stamp + @echo "--- Building Documentation" + dh_testdir + $(MAKE) -C fpcdocs $(CONVERTER) $(BUILDOPTS) FPDOC=$(NEWFPDOC) LANG=C + touch build-indep-stamp + +install-doc: install-doc-stamp +install-doc-stamp: build-doc-stamp debian-files-stamp + @echo "--- Installing Documentation" + dh_testdir + dh_testroot + dh_clean -k + $(MAKE) -C fpcdocs $(DOCTYPE)install $(INSTALLOPTS) INSTALL_DOCDIR=$(INSTALL_DIR)/usr/share/doc/fp-docs + touch install-doc-stamp + +################### +# Source +# + +install-source: install-source-stamp +install-source-stamp: + @echo "--- Cleaning the tree and copying the source code" + dh_testdir + dh_testroot + $(MAKE) -C fpcsrc compiler_distclean + $(MAKE) -C fpcsrc rtl_distclean + $(MAKE) -C fpcsrc packages_distclean + $(MAKE) -C fpcsrc ide_distclean + $(MAKE) -C fpcsrc utils_distclean + ${MKDIR} ${SRC_DIR} + cp -Rfpl -t ${SRC_DIR} \ + $(CURDIR)/fpcsrc/compiler \ + $(CURDIR)/fpcsrc/packages \ + $(CURDIR)/fpcsrc/rtl + touch install-source-stamp + +################### +# Generic +# + +build: build-arch build-indep +install: install-arch install-indep +binary: binary-arch binary-indep + + +################### +# Deb building +# + +binary-indep: build-doc install-doc install-source debian-files + @echo "--- Building: arch-indep packages" + dh_testdir + dh_testroot + dh_installdocs -i + dh_installchangelogs -i + dh_install -i --sourcedir=debian/tmp --list-missing + find debian/fpc-source/usr/share/fpcsrc/ -type f \ + -not -regex '.*\.\(fpc\|inc\|pas\|pp\)' -delete + find debian/fpc-source/usr/share/fpcsrc/ -type d \ + -empty -delete + dh_compress -i -X.pdf + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS) + +binary-arch: build-arch arrange-arch debian-files + @echo "--- Building: arch packages" + dh_testdir + dh_testroot + dh_link + dh_installdocs -a + dh_installchangelogs -a + dh_installexamples -a + pod2man -c 'Free pascal for Debian GNU/Linux' \ + debian/fpc-depends > debian/fpc-depends.1 + dh_installman -s + dh_strip -s + dh_compress -a + dh_fixperms -a + dh_installdeb -s + dh_shlibdeps -s + dh_gencontrol -s + dh_md5sums -s + dh_builddeb -s $(DEB_DH_BUILDDEB_ARGS) + +.PHONY: build clean binary binary-arch \ + binary-indep debian-files build-arch \ + install install-indep install-arch \ + configure + +get-orig-source: + -uscan --upstream-version=0 --rename --- fpc-2.2.2.orig/debian/orig-tar.sh +++ fpc-2.2.2/debian/orig-tar.sh @@ -0,0 +1,17 @@ +#!/bin/sh -e + +# called by uscan with '--upstream-version' +TAR=$3 +DIR=fpcbuild-$2 + +# clean up the upstream tarball +tar -x -z -f $TAR +tar -c -z -f $TAR --exclude '*.dll' --exclude '*.exe' --exclude '*.log' --exclude '*.o' $DIR +rm -rf $DIR + +# move to directory 'tarballs' +if [ -r .svn/deb-layout ]; then + . .svn/deb-layout + mv $TAR $origDir + echo "moved $TAR to $origDir" +fi --- fpc-2.2.2.orig/debian/fp-units-base.install.in +++ fpc-2.2.2/debian/fp-units-base.install.in @@ -0,0 +1,10 @@ +/usr/share/doc/fp-units-base + +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fpmkunit +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/paszlib +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/pasjpeg +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/ncurses +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/x11 +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/regexpr +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/hash +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/uuid --- fpc-2.2.2.orig/debian/fp-units-fv.install.in +++ fpc-2.2.2/debian/fp-units-fv.install.in @@ -0,0 +1,2 @@ +/usr/share/doc/fp-units-fv +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fv --- fpc-2.2.2.orig/debian/fpc-depends.in +++ fpc-2.2.2/debian/fpc-depends.in @@ -0,0 +1,65 @@ +#!/usr/bin/perl + +# Copyright (c) 2005 Rafael Laboissiere +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +=head1 NAME + +fpc-depends - calculates free pascal dependencies + +=cut + +use strict; +use warnings; +use Debian::Debhelper::Dh_Lib; + +=head1 SYNOPSIS + +B [S>] + +=head1 DESCRIPTION + +fpc-depends is a debhelper-like program that is responsible for +generating the ${fpc-abi:Depends} substitutions and adding them to +substvars files. + +If you use this program, your package must build-depend on fp-compiler +(>= 2.2.0-3). + + +=cut + +init (); + +foreach my $package (@{$dh{DOPACKAGES}}) { + delsubstvar($package, "fpc-abi:Depends"); + addsubstvar($package, "fpc-abi:Depends", "fpc-abi-%{fpcversion}"); +} + +=head1 SEE ALSO + +L + +This program is not part of debhelper. + +=head1 AUTHOR + +Torsten Werner + +Most ideas borrowed from octave-depends by Rafael Laboissiere +. + +=cut --- fpc-2.2.2.orig/debian/fp-units-gtk.install.in +++ fpc-2.2.2/debian/fp-units-gtk.install.in @@ -0,0 +1,4 @@ +/usr/share/doc/fp-units-gtk + +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/gtk1 +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fpgtk --- fpc-2.2.2.orig/debian/fp-units-net.install.in +++ fpc-2.2.2/debian/fp-units-net.install.in @@ -0,0 +1,10 @@ +/usr/share/doc/fp-units-net + +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/libcurl +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/dbus +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/httpd13 +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/httpd20 +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/httpd22 +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/ldap +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/openssl +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/pcap --- fpc-2.2.2.orig/debian/fp-units-i386.install.in +++ fpc-2.2.2/debian/fp-units-i386.install.in @@ -0,0 +1,4 @@ +/usr/share/doc/fp-units-i386 + +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/libc +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/unixutil --- fpc-2.2.2.orig/debian/fp-compiler.manpages +++ fpc-2.2.2/debian/fp-compiler.manpages @@ -0,0 +1 @@ +debian/fpc-depends.1 --- fpc-2.2.2.orig/debian/fp-docs.doc-base +++ fpc-2.2.2/debian/fp-docs.doc-base @@ -0,0 +1,10 @@ +Document: fpc-docs +Title: Free Pascal Documentation +Author: Michael van Canneyt +Abstract: Documentation for the Free Pascal Compiler. + . +Section: Programming + +Format: html +Files: /usr/share/doc/fp-docs/* +Index: /usr/share/doc/fp-docs/fpctoc.html --- fpc-2.2.2.orig/debian/fp-units-misc.install.in +++ fpc-2.2.2/debian/fp-units-misc.install.in @@ -0,0 +1,20 @@ +/usr/share/doc/fp-units-misc + +/usr/bin/chmcmd +/usr/bin/chmls + +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/chm +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/utmp +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/pthreads +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/zlib +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/tcl +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/cdrom +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/bfd +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/syslog +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/gdbint +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/unzip +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/newt +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fftw +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/aspell +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/users +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/numlib --- fpc-2.2.2.orig/debian/copyright +++ fpc-2.2.2/debian/copyright @@ -0,0 +1,71 @@ +The packages were originally put together by: + Peter Vreman + +Debian maintainer: + Carlos Laviola + +With sources obtained from: + 'svn co http://svn.freepascal.org/svn/fpcbuild/tags/release_2_2_2' + +The files and libraries are released under the terms of the GNU Library +General Public License, which can be found in the file +/usr/share/common-licenses/GPL-2 on a Debian system. + +- object files and libraries linked into an application may be + distributed without source code. + +---------- + +djgpp: + +Copyright (C) DJ Delorie + 24 Kirsten Ave + Rochester NH 03867-2954 + + Source code copyright DJ Delorie is distributed under the terms of the + GNU General Public Licence, with the following exceptions: + + * Any existing copyright or authorship information in any given source + file must remain intact. If you modify a source file, a notice to that + effect must be added to the authorship information in the source file. + + * binaries provided in djgpp may be distributed without sources ONLY if + the recipient is given sufficient information to obtain a copy of djgpp + themselves. This primarily applies to go32.exe, emu387, stub.exe, and + the graphics drivers. + + * modified versions of the binaries provided in djgpp must be + distributed under the terms of the GPL. + + * objects and libraries linked into an application may be distributed + without sources. + +---------- + +emx: + + emx is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + +---------- + +rsx: + +Copyright (C) 1993-1998 Rainer Schnither + email to rainer@mathematik.uni-bielefeld.de + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + --- fpc-2.2.2.orig/debian/fp-utils.install.in +++ fpc-2.2.2/debian/fp-utils.install.in @@ -0,0 +1,51 @@ +/usr/bin/fppkg +/usr/bin/ppufiles +/usr/bin/ppudump +/usr/bin/ppumove +/usr/bin/ppdep +/usr/bin/ptop +/usr/bin/rstconv +/usr/bin/data2inc +/usr/bin/bin2obj +/usr/bin/delp +/usr/bin/plex +/usr/bin/pyacc +/usr/bin/h2pas +/usr/bin/h2paspp +/usr/bin/postw32 +/usr/bin/fpcmake +/usr/bin/fpcres +/usr/bin/fprcp +/usr/bin/fpdoc +/usr/bin/makeskel +/usr/bin/unitdiff +/usr/bin/mkxmlrpc +/usr/bin/rmcvsdir +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/lexyacc +/usr/lib/fpc/lexyacc/yylex.cod +/usr/lib/fpc/lexyacc/yyparse.cod +/usr/share/man/man1/fppkg.1 +/usr/share/man/man1/bin2obj.1 +/usr/share/man/man1/data2inc.1 +/usr/share/man/man1/fprcp.1 +/usr/share/man/man1/h2paspp.1 +/usr/share/man/man1/makeskel.1 +/usr/share/man/man1/mkxmlrpc.1 +/usr/share/man/man1/postw32.1 +/usr/share/man/man1/rmcvsdir.1 +/usr/share/man/man1/unitdiff.1 +/usr/share/man/man1/delp.1 +/usr/share/man/man1/fpcmake.1 +/usr/share/man/man1/fpcres.1 +/usr/share/man/man1/h2pas.1 +/usr/share/man/man1/plex.1 +/usr/share/man/man1/ppdep.1 +/usr/share/man/man1/ppudump.1 +/usr/share/man/man1/ppufiles.1 +/usr/share/man/man1/ppumove.1 +/usr/share/man/man1/ptop.1 +/usr/share/man/man1/pyacc.1 +/usr/share/man/man1/rstconv.1 +/usr/share/man/man1/fpdoc.1 +/usr/share/man/man5/fpcmake.5 +/usr/share/man/man5/ptop.cfg.5 --- fpc-2.2.2.orig/debian/fp-units-rtl.install.in +++ fpc-2.2.2/debian/fp-units-rtl.install.in @@ -0,0 +1 @@ +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/rtl --- fpc-2.2.2.orig/debian/patches/manpages.diff +++ fpc-2.2.2/debian/patches/manpages.diff @@ -0,0 +1,134 @@ +fixes various errors in the manpages + +Index: fpc-2.2.2/install/man/man1/fp.1 +=================================================================== +--- fpc-2.2.2.orig/install/man/man1/fp.1 2006-07-16 20:06:14.000000000 +0200 ++++ fpc-2.2.2/install/man/man1/fp.1 2008-08-12 23:34:27.000000000 +0200 +@@ -57,8 +57,8 @@ + + No help files are provided by default. The user must download the Free Pascal documentation + in HTML format and install it into the IDE using the Help->Files menu. Turbo Pascal .tph +-files can also be installed in this menu and can be usefull for source code that ships with +-.tph files as documentation. ++files can also be installed in this menu and can be usefull for source code that ships ++with .tph files as documentation. + + .SH Character sets + +Index: fpc-2.2.2/install/man/man1/h2paspp.1 +=================================================================== +--- fpc-2.2.2.orig/install/man/man1/h2paspp.1 2005-05-30 21:05:23.000000000 +0200 ++++ fpc-2.2.2/install/man/man1/h2paspp.1 2008-08-12 23:34:27.000000000 +0200 +@@ -16,8 +16,8 @@ + .TP + .I #define symbol + Defines the new symbol +-.I symbol +-. Note that macros are not supported. ++.I symbol. ++Note that macros are not supported. + .TP + .I #if symbol + The text following this directive is included if +@@ -69,8 +69,8 @@ + .TP + .B \-ooutfile + If this option is given, the output will be written to a file named +-.I outfile +-. Note that only one output file can be given. ++.I outfile. ++Note that only one output file can be given. + + .SH SEE ALSO + .IP +Index: fpc-2.2.2/install/man/man1/plex.1 +=================================================================== +--- fpc-2.2.2.orig/install/man/man1/plex.1 2005-05-30 21:05:23.000000000 +0200 ++++ fpc-2.2.2/install/man/man1/plex.1 2008-08-12 23:34:27.000000000 +0200 +@@ -23,12 +23,12 @@ + + .SH DESCRIPTION + +-TP Lex is a program generator that is used to generate the Turbo Pascal source ++Lex is a program generator that is used to generate the Turbo Pascal source + code for a lexical analyzer subroutine from the specification of an input + language by a regular expression grammar. + +-TP Lex parses the source grammar contained in lex-file (with default suffix +-.l) and writes the constructed lexical analyzer subroutine to the specified ++Lex parses the source grammar contained in lex-file (with default suffix .l) ++and writes the constructed lexical analyzer subroutine to the specified + output-file (with default suffix .pas); if no output file is specified, output + goes to lex-file with new suffix .pas. If any errors are found during + compilation, error messages are written to the list file (lex-file with new +Index: fpc-2.2.2/install/man/man1/postw32.1 +=================================================================== +--- fpc-2.2.2.orig/install/man/man1/postw32.1 2005-05-30 21:05:23.000000000 +0200 ++++ fpc-2.2.2/install/man/man1/postw32.1 2008-08-12 23:34:27.000000000 +0200 +@@ -35,9 +35,9 @@ + .TP + .B \-m subsystem + Set the subsystem (the application type) to either +-.i gui ++.I gui + or +-.i console ++.I console. + Note that a gui application which writes to the command-line will cause an + error. This option is a short notation for the + .B \-\-subsystem +Index: fpc-2.2.2/install/man/man1/ppdep.1 +=================================================================== +--- fpc-2.2.2.orig/install/man/man1/ppdep.1 2005-05-30 21:05:23.000000000 +0200 ++++ fpc-2.2.2/install/man/man1/ppdep.1 2008-08-12 23:34:27.000000000 +0200 +@@ -11,8 +11,8 @@ + .B ppdep + dumps the dependencies of a unit in a format that can be + understood by GNU +-.B make +-. It writes these dependencies to standard ++.B make. ++It writes these dependencies to standard + output. It takes care of dependencies both in the interface and + implementation section of the unit, and it can handle conditional defines. + +Index: fpc-2.2.2/install/man/man5/fpcmake.5 +=================================================================== +--- fpc-2.2.2.orig/install/man/man5/fpcmake.5 2005-05-30 21:05:23.000000000 +0200 ++++ fpc-2.2.2/install/man/man5/fpcmake.5 2008-08-12 23:48:09.000000000 +0200 +@@ -51,9 +51,9 @@ + argument to GNU + .I configure + It is used for the installation of programs and units. By default, this is +-. /usr ++.B /usr + on linux, and +-. /pp ++.B /pp + on all other platforms. + .TP + .I dirbase +@@ -118,7 +118,7 @@ + the makefile rules that are generated by fpcmake, but + .I before + the general configuration rules. +-. In it, you cannot use variables that are defined by fpcmake rules, but you ++In it, you cannot use variables that are defined by fpcmake rules, but you + can define additional rules and configuration variables. + .TP + .B presettings +Index: fpc-2.2.2/install/man/man1/grab_vcsa.1 +=================================================================== +--- fpc-2.2.2.orig/install/man/man1/grab_vcsa.1 2006-07-16 20:06:14.000000000 +0200 ++++ fpc-2.2.2/install/man/man1/grab_vcsa.1 2008-08-12 23:34:27.000000000 +0200 +@@ -11,8 +11,8 @@ + The + .I Linux + console allows text mode +-.I video buffer access +-. For each tty device ++.I video buffer access. ++For each tty device + (/dev/tty0..31) there exist two devices (/dev/vcs0..31) and (/dev/vcsa0..31). + These devices are two different representations of the content of the console. + --- fpc-2.2.2.orig/debian/patches/series +++ fpc-2.2.2/debian/patches/series @@ -0,0 +1,2 @@ +gtk_has_filesystem_LP260464 +manpages.diff --- fpc-2.2.2.orig/debian/patches/gtk_has_filesystem_LP260464 +++ fpc-2.2.2/debian/patches/gtk_has_filesystem_LP260464 @@ -0,0 +1,60 @@ +diff -U 3 -dHrN -- fpc-2.2.2.orig/fpcsrc/packages/gtk2/src/gtk+/gtk/gtk2.pas fpc-2.2.2/fpcsrc/packages/gtk2/src/gtk+/gtk/gtk2.pas +--- fpc-2.2.2.orig/fpcsrc/packages/gtk2/src/gtk+/gtk/gtk2.pas 2008-02-02 09:48:09.000000000 -0600 ++++ fpc-2.2.2/fpcsrc/packages/gtk2/src/gtk+/gtk/gtk2.pas 2008-11-22 18:11:49.000000000 -0600 +@@ -63,6 +63,8 @@ + {$DEFINE HasGTK2_8} + {$ENDIF} + ++// {$define HasGTK_FileSystem} ++ + interface + + uses +diff -U 3 -dHrN -- fpc-2.2.2.orig/fpcsrc/packages/gtk2/src/gtk+/gtk/gtkfilesystem.inc fpc-2.2.2/fpcsrc/packages/gtk2/src/gtk+/gtk/gtkfilesystem.inc +--- fpc-2.2.2.orig/fpcsrc/packages/gtk2/src/gtk+/gtk/gtkfilesystem.inc 2008-02-02 09:48:09.000000000 -0600 ++++ fpc-2.2.2/fpcsrc/packages/gtk2/src/gtk+/gtk/gtkfilesystem.inc 2008-11-22 18:11:49.000000000 -0600 +@@ -115,17 +115,14 @@ + + {$IFDEF read_interface_rest} + ++{$ifdef HasGTK_FileSystem} + + { GError enumeration for GtkFileSystem } + + function GTK_FILE_SYSTEM_ERROR : TGQuark; + +- +- + function gtk_file_system_error_quark:TGQuark;cdecl;external gtklib name 'gtk_file_system_error_quark'; + +- +- + { Boxed-type for gtk_file_folder_get_info() results } + + function GTK_TYPE_FILE_INFO : GType; +@@ -244,11 +241,16 @@ + { GtkFileSystem modules support } + + function _gtk_file_system_create(file_system_name:Pchar):PGtkFileSystem;cdecl;external gtklib name '_gtk_file_system_create'; ++ ++{$endif HasGTK_FileSystem} ++ + {$endif} {read_interface_rest} + + + {$ifdef read_implementation} + ++{$ifdef HasGTK_FileSystem} ++ + function GTK_FILE_SYSTEM_ERROR : TGQuark; + begin + GTK_FILE_SYSTEM_ERROR:=gtk_file_system_error_quark; +@@ -307,6 +309,8 @@ + GTK_FILE_FOLDER_GET_IFACE:=G_TYPE_INSTANCE_GET_INTERFACE(inst,GTK_TYPE_FILE_FOLDER); + end; + ++{$endif HasGTK_FileSystem} ++ + function gtk_file_path_new_dup(str : Pgchar) : PGtkFilePath; + begin + gtk_file_path_new_dup:=PGtkFilePath(g_strdup(str)); --- fpc-2.2.2.orig/debian/overrides/fp-units-gfx +++ fpc-2.2.2/debian/overrides/fp-units-gfx @@ -0,0 +1,2 @@ +# Free pascal binaries are often statically linked. +fp-units-gfx binary: statically-linked-binary --- fpc-2.2.2.orig/debian/overrides/fp-utils +++ fpc-2.2.2/debian/overrides/fp-utils @@ -0,0 +1,2 @@ +# Free pascal binaries are often statically linked. +fp-utils binary: statically-linked-binary --- fpc-2.2.2.orig/debian/overrides/fp-ide +++ fpc-2.2.2/debian/overrides/fp-ide @@ -0,0 +1,2 @@ +# Free pascal binaries are often statically linked. +fp-ide binary: statically-linked-binary --- fpc-2.2.2.orig/debian/overrides/fp-units-misc +++ fpc-2.2.2/debian/overrides/fp-units-misc @@ -0,0 +1,2 @@ +# Free pascal binaries are often statically linked. +fp-units-misc binary: statically-linked-binary --- fpc-2.2.2.orig/debian/overrides/fp-units-net +++ fpc-2.2.2/debian/overrides/fp-units-net @@ -0,0 +1,2 @@ +# The name of the unit is dbus not D-Bus. +fp-units-net binary: spelling-error-in-description dbus D-Bus --- fpc-2.2.2.orig/debian/overrides/fp-compiler +++ fpc-2.2.2/debian/overrides/fp-compiler @@ -0,0 +1,2 @@ +# Free pascal binaries are often statically linked. +fp-compiler binary: statically-linked-binary --- fpc-2.2.2.orig/.pc/.version +++ fpc-2.2.2/.pc/.version @@ -0,0 +1 @@ +2