diff --git a/.gitattributes b/.gitattributes index f5b4bd50f6..d9113633cc 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1977,6 +1977,7 @@ packages/fcl-db/src/sqldb/mysql/mysql41conn.pas svneol=native#text/plain packages/fcl-db/src/sqldb/mysql/mysql4conn.pas svneol=native#text/plain packages/fcl-db/src/sqldb/mysql/mysql50conn.pas svneol=native#text/plain packages/fcl-db/src/sqldb/mysql/mysql51conn.pas svneol=native#text/plain +packages/fcl-db/src/sqldb/mysql/mysql55conn.pas svneol=native#text/plain packages/fcl-db/src/sqldb/mysql/mysqlconn.inc svneol=native#text/plain packages/fcl-db/src/sqldb/odbc/Makefile svneol=native#text/plain packages/fcl-db/src/sqldb/odbc/Makefile.fpc svneol=native#text/plain @@ -5129,6 +5130,8 @@ packages/mysql/src/mysql50dyn.pp svneol=native#text/plain packages/mysql/src/mysql51.pp svneol=native#text/plain packages/mysql/src/mysql51dyn.pp svneol=native#text/plain packages/mysql/src/mysql51emb.pp svneol=native#text/plain +packages/mysql/src/mysql55.pp svneol=native#text/plain +packages/mysql/src/mysql55dyn.pp svneol=native#text/plain packages/ncurses/Makefile svneol=native#text/plain packages/ncurses/Makefile.fpc svneol=native#text/plain packages/ncurses/Makefile.fpc.fpcmake svneol=native#text/plain diff --git a/packages/fcl-db/fpmake.pp b/packages/fcl-db/fpmake.pp index 0d240ccdf1..29675a4238 100644 --- a/packages/fcl-db/fpmake.pp +++ b/packages/fcl-db/fpmake.pp @@ -596,6 +596,17 @@ begin AddUnit('dbconst'); end; + T:=P.Targets.AddUnit('mysql55conn.pas', SqldbConnectionOSes); + T.ResourceStrings:=true; + with T.Dependencies do + begin + AddInclude('mysqlconn.inc'); + AddUnit('bufdataset'); + AddUnit('sqldb'); + AddUnit('db'); + AddUnit('dbconst'); + end; + T:=P.Targets.AddUnit('odbcconn.pas', SqldbConnectionOSes); with T.Dependencies do begin diff --git a/packages/fcl-db/src/sqldb/mysql/Makefile b/packages/fcl-db/src/sqldb/mysql/Makefile index 5daf1dfc7a..55db256e5f 100644 --- a/packages/fcl-db/src/sqldb/mysql/Makefile +++ b/packages/fcl-db/src/sqldb/mysql/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/03/17] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -295,382 +295,388 @@ endif override PACKAGE_NAME=fcl-db PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-db/Makefile.fpc,$(PACKAGESDIR)))))) ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),arm-gba) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),arm-nds) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn +endif +ifeq ($(FULL_TARGET),mips-linux) +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-linux) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-win32) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-os2) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-beos) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-netware) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-emx) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-wince) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),arm-linux) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),arm-wince) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),arm-gba) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),arm-nds) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn +endif +ifeq ($(FULL_TARGET),mips-linux) +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) @@ -859,6 +865,9 @@ endif ifeq ($(FULL_TARGET),armeb-embedded) override COMPILER_OPTIONS+=-S2 endif +ifeq ($(FULL_TARGET),mips-linux) +override COMPILER_OPTIONS+=-S2 +endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-S2 endif @@ -1058,37 +1067,6 @@ endif else CROSSBINDIR= endif -ifeq ($(OS_SOURCE),linux) -ifndef GCCLIBDIR -ifeq ($(CPU_TARGET),i386) -ifneq ($(findstring x86_64,$(shell uname -a)),) -ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) -endif -endif -endif -ifeq ($(CPU_TARGET),powerpc64) -ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`) -endif -endif -endif -ifndef GCCLIBDIR -CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH)))) -ifneq ($(CROSSGCC),) -GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`) -endif -endif -ifndef OTHERLIBDIR -OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }') -endif -endif -ifdef inUnix -ifeq ($(OS_SOURCE),netbsd) -OTHERLIBDIR+=/usr/pkg/lib -endif -export GCCLIBDIR OTHERLIB -endif BATCHEXT=.bat LOADEREXT=.as EXEEXT=.exe @@ -1477,25 +1455,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d) else DATESTR= endif -ifndef UPXPROG -ifeq ($(OS_TARGET),go32v2) -UPXPROG:=1 -endif -ifeq ($(OS_TARGET),win32) -UPXPROG:= -endif -ifdef UPXPROG -UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(UPXPROG),) -UPXPROG= -else -UPXPROG:=$(firstword $(UPXPROG)) -endif -else -UPXPROG= -endif -endif -export UPXPROG ZIPOPT=-9 ZIPEXT=.zip ifeq ($(USETAR),bz2) @@ -1508,651 +1467,577 @@ endif override REQUIRE_PACKAGES=rtl fcl-xml mysql ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=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 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-XML=1 +REQUIRE_PACKAGES_MYSQL=1 +endif +ifeq ($(FULL_TARGET),mips-linux) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif @@ -2194,44 +2079,6 @@ ifdef UNITDIR_FPMAKE_RTL override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) endif endif -ifdef REQUIRE_PACKAGES_HASH -PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_HASH),) -ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),) -UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) -else -UNITDIR_HASH=$(PACKAGEDIR_HASH) -endif -ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_HASH)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE) -endif -else -PACKAGEDIR_HASH= -UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_HASH),) -UNITDIR_HASH:=$(firstword $(UNITDIR_HASH)) -else -UNITDIR_HASH= -endif -endif -ifdef UNITDIR_HASH -override COMPILER_UNITDIR+=$(UNITDIR_HASH) -endif -ifdef UNITDIR_FPMAKE_HASH -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) -endif -endif ifdef REQUIRE_PACKAGES_PASZLIB PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_PASZLIB),) @@ -2308,6 +2155,44 @@ ifdef UNITDIR_FPMAKE_FCL-PROCESS override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS) endif endif +ifdef REQUIRE_PACKAGES_HASH +PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_HASH),) +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),) +UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) +else +UNITDIR_HASH=$(PACKAGEDIR_HASH) +endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_HASH)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE) +endif +else +PACKAGEDIR_HASH= +UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_HASH),) +UNITDIR_HASH:=$(firstword $(UNITDIR_HASH)) +else +UNITDIR_HASH= +endif +endif +ifdef UNITDIR_HASH +override COMPILER_UNITDIR+=$(UNITDIR_HASH) +endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif +endif ifdef REQUIRE_PACKAGES_FPMKUNIT PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_FPMKUNIT),) @@ -2346,82 +2231,6 @@ ifdef UNITDIR_FPMAKE_FPMKUNIT override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) endif 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),) -ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX)),) -UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) -else -UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) -endif -ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_FCL-BASE)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-BASE)/$(FPCMADE) -endif -else -PACKAGEDIR_FCL-BASE= -UNITDIR_FCL-BASE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_FCL-BASE),) -UNITDIR_FCL-BASE:=$(firstword $(UNITDIR_FCL-BASE)) -else -UNITDIR_FCL-BASE= -endif -endif -ifdef UNITDIR_FCL-BASE -override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) -endif -ifdef UNITDIR_FPMAKE_FCL-BASE -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) -endif -endif -ifdef REQUIRE_PACKAGES_ICONVENC -PACKAGEDIR_ICONVENC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_ICONVENC),) -ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX)),) -UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX) -else -UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC) -endif -ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_ICONVENC)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_ICONVENC) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_ICONVENC)/$(FPCMADE) -endif -else -PACKAGEDIR_ICONVENC= -UNITDIR_ICONVENC:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_ICONVENC),) -UNITDIR_ICONVENC:=$(firstword $(UNITDIR_ICONVENC)) -else -UNITDIR_ICONVENC= -endif -endif -ifdef UNITDIR_ICONVENC -override COMPILER_UNITDIR+=$(UNITDIR_ICONVENC) -endif -ifdef UNITDIR_FPMAKE_ICONVENC -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ICONVENC) -endif -endif ifdef REQUIRE_PACKAGES_FCL-XML PACKAGEDIR_FCL-XML:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-xml/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_FCL-XML),) @@ -2514,12 +2323,16 @@ endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-XP$(BINUTILSPREFIX) -override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) endif endif +ifndef CROSSCOMPILE +ifneq ($(BINUTILSPREFIX),) +override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif @@ -2619,12 +2432,6 @@ endif endif ifdef LINKSHARED endif -ifdef GCCLIBDIR -override FPCOPT+=-Fl$(GCCLIBDIR) -endif -ifdef OTHERLIBDIR -override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR)) -endif ifdef OPT override FPCOPT+=$(OPT) endif @@ -2769,9 +2576,6 @@ endif fpc_install: all $(INSTALLTARGET) ifdef INSTALLEXEFILES $(MKDIR) $(INSTALL_BINDIR) -ifdef UPXPROG - -$(UPXPROG) $(INSTALLEXEFILES) -endif $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR) endif ifdef INSTALL_CREATEPACKAGEFPC @@ -2944,7 +2748,6 @@ fpc_baseinfo: @$(ECHO) Date...... $(DATE) @$(ECHO) FPCMake... $(FPCMAKE) @$(ECHO) PPUMove... $(PPUMOVE) - @$(ECHO) Upx....... $(UPXPROG) @$(ECHO) Zip....... $(ZIPPROG) @$(ECHO) @$(ECHO) == Object info == diff --git a/packages/fcl-db/src/sqldb/mysql/Makefile.fpc b/packages/fcl-db/src/sqldb/mysql/Makefile.fpc index cbd2b6adc3..0f93e3c8f3 100644 --- a/packages/fcl-db/src/sqldb/mysql/Makefile.fpc +++ b/packages/fcl-db/src/sqldb/mysql/Makefile.fpc @@ -6,8 +6,8 @@ main=fcl-db [target] -units=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn -rsts=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +units=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn +rsts=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn [require] packages=fcl-xml mysql diff --git a/packages/fcl-db/src/sqldb/mysql/mysql55conn.pas b/packages/fcl-db/src/sqldb/mysql/mysql55conn.pas new file mode 100644 index 0000000000..5b6296d445 --- /dev/null +++ b/packages/fcl-db/src/sqldb/mysql/mysql55conn.pas @@ -0,0 +1,13 @@ +{ + Contains the TMysqlConnection for MySQL 5.5 +} + +unit mysql55conn; + +{$DEFINE MYSQL50_UP} +{$DEFINE MYSQL51_UP} +{$DEFINE MYSQL55} + +{$i mysqlconn.inc} + +end. diff --git a/packages/fcl-db/src/sqldb/mysql/mysqlconn.inc b/packages/fcl-db/src/sqldb/mysql/mysqlconn.inc index b32e1edc39..cdd13ff0b9 100644 --- a/packages/fcl-db/src/sqldb/mysql/mysqlconn.inc +++ b/packages/fcl-db/src/sqldb/mysql/mysqlconn.inc @@ -5,8 +5,11 @@ interface uses Classes, SysUtils,bufdataset,sqldb,db,dynlibs,ctypes, -{$IFDEF Mysql51} - mysql51dyn; + {$IFDEF mysql55} + mysql55dyn; + {$ELSE} +{$IFDEF mysql51} + mysql51dyn; {$ELSE} {$IfDef mysql50} mysql50dyn; @@ -22,9 +25,13 @@ uses {$EndIf} {$EndIf} {$endif} +{$endif} Const -{$IFDEF Mysql51} +{$IFDEF mysql55} + MySQLVersion = '5.5'; +{$else} +{$IFDEF mysql51} MySQLVersion = '5.1'; {$else} {$IfDef mysql50} @@ -41,7 +48,7 @@ Const {$EndIf} {$EndIf} {$endif} - +{$endif} Type TTransactionName = Class(TSQLHandle) protected @@ -140,39 +147,45 @@ Type EMySQLError = Class(Exception); - - {$IfDef mysql51} - TMySQL51Connection = Class(TConnectionName); - TMySQL51ConnectionDef = Class(TMySQLConnectionDef); - TMySQL51Transaction = Class(TTransactionName); - TMySQL51Cursor = Class(TCursorName); - {$ELSE} - {$IfDef mysql50} - TMySQL50Connection = Class(TConnectionName); - TMySQL50ConnectionDef = Class(TMySQLConnectionDef); - TMySQL50Transaction = Class(TTransactionName); - TMySQL50Cursor = Class(TCursorName); - {$ELSE} - {$IfDef mysql41} - TMySQL41Connection = Class(TConnectionName); - TMySQL41ConnectionDef = Class(TMySQLConnectionDef); - TMySQL41Transaction = Class(TTransactionName); - TMySQL41Cursor = Class(TCursorName); + {$ifdef mysql55} + TMySQL55Connection = Class(TConnectionName); + TMySQL55ConnectionDef = Class(TMySQLConnectionDef); + TMySQL55Transaction = Class(TTransactionName); + TMySQL55Cursor = Class(TCursorName); + {$else} + {$IfDef mysql51} + TMySQL51Connection = Class(TConnectionName); + TMySQL51ConnectionDef = Class(TMySQLConnectionDef); + TMySQL51Transaction = Class(TTransactionName); + TMySQL51Cursor = Class(TCursorName); {$ELSE} - {$IFDEF mysql4} // temporary backwards compatibility for Lazarus - TMySQLConnection = Class(TConnectionName); - TMySQL40ConnectionDef = Class(TMySQLConnectionDef); - TMySQLTransaction = Class(TTransactionName); - TMySQLCursor = Class(TCursorName); + {$IfDef mysql50} + TMySQL50Connection = Class(TConnectionName); + TMySQL50ConnectionDef = Class(TMySQLConnectionDef); + TMySQL50Transaction = Class(TTransactionName); + TMySQL50Cursor = Class(TCursorName); {$ELSE} - TMySQL40Connection = Class(TConnectionName); - TMySQL40ConnectionDef = Class(TMySQLConnectionDef); - TMySQL40Transaction = Class(TTransactionName); - TMySQL40Cursor = Class(TCursorName); - {$EndIf} + {$IfDef mysql41} + TMySQL41Connection = Class(TConnectionName); + TMySQL41ConnectionDef = Class(TMySQLConnectionDef); + TMySQL41Transaction = Class(TTransactionName); + TMySQL41Cursor = Class(TCursorName); + {$ELSE} + {$IFDEF mysql4} // temporary backwards compatibility for Lazarus + TMySQLConnection = Class(TConnectionName); + TMySQL40ConnectionDef = Class(TMySQLConnectionDef); + TMySQLTransaction = Class(TTransactionName); + TMySQLCursor = Class(TCursorName); + {$ELSE} + TMySQL40Connection = Class(TConnectionName); + TMySQL40ConnectionDef = Class(TMySQLConnectionDef); + TMySQL40Transaction = Class(TTransactionName); + TMySQL40Cursor = Class(TCursorName); + {$EndIf} + {$EndIf} + {$endif} {$EndIf} - {$EndIf} -{$ENDIF} + {$ENDIF} implementation @@ -195,6 +208,12 @@ const 'MYSQL_SECURE_AUTH' {$IFDEF MYSQL50_UP} ,'MYSQL_REPORT_DATA_TRUNCATION', 'MYSQL_OPT_RECONNECT' +{$IFDEF mysql51_UP} + ,'MYSQL_OPT_SSL_VERIFY_SERVER_CERT' +{$IFDEF mysql55} + ,'MYSQL_PLUGIN_DIR', 'MYSQL_DEFAULT_AUTH' +{$ENDIF} +{$ENDIF} {$ENDIF} ); @@ -436,23 +455,27 @@ end; function TConnectionName.AllocateCursorHandle: TSQLCursor; begin - {$IfDef mysql51} - Result:=TMySQL51Cursor.Create; + {$IfDef mysql55} + Result:=TMySQL55Cursor.Create; {$ELSE} - {$IfDef mysql50} - Result:=TMySQL50Cursor.Create; + {$IfDef mysql51} + Result:=TMySQL51Cursor.Create; {$ELSE} - {$IfDef mysql41} - Result:=TMySQL41Cursor.Create; + {$IfDef mysql50} + Result:=TMySQL50Cursor.Create; {$ELSE} - {$IFDEF mysql4} // temporary backwards compatibility for Lazarus - Result:=TMySQLCursor.Create; + {$IfDef mysql41} + Result:=TMySQL41Cursor.Create; {$ELSE} - Result:=TMySQL40Cursor.Create; + {$IFDEF mysql4} // temporary backwards compatibility for Lazarus + Result:=TMySQLCursor.Create; + {$ELSE} + Result:=TMySQL40Cursor.Create; + {$EndIf} {$EndIf} {$EndIf} {$EndIf} - {$EndIf} + {$endif} end; Procedure TConnectionName.DeAllocateCursorHandle(var cursor : TSQLCursor); @@ -1115,22 +1138,26 @@ end; class function TMySQLConnectionDef.ConnectionClass: TSQLConnectionClass; begin - {$IfDef mysql51} - Result:=TMySQL51Connection; + {$IfDef mysql55} + Result:=TMySQL55Connection; {$ELSE} - {$IfDef mysql50} - Result:=TMySQL50Connection; + {$IfDef mysql51} + Result:=TMySQL51Connection; {$ELSE} - {$IfDef mysql41} - Result:=TMySQL41Connection; + {$IfDef mysql50} + Result:=TMySQL50Connection; {$ELSE} - {$IFDEF mysql4} // temporary backwards compatibility for Lazarus - Result:=TMySQLConnection; + {$IfDef mysql41} + Result:=TMySQL41Connection; {$ELSE} - Result:=TMySQL40Connection; + {$IFDEF mysql4} // temporary backwards compatibility for Lazarus + Result:=TMySQLConnection; + {$ELSE} + Result:=TMySQL40Connection; + {$EndIf} {$EndIf} {$EndIf} - {$EndIf} + {$endif} {$endif} end; @@ -1139,37 +1166,44 @@ begin Result:='Connect to a MySQL '+MySQLVersion+'database directly via the client library'; end; -{$IfDef mysql51} +{$IfDef mysql55} initialization - RegisterConnection(TMySQL51ConnectionDef); + RegisterConnection(TMySQL55ConnectionDef); finalization - UnRegisterConnection(TMySQL51ConnectionDef); -{$ELSE} - {$IfDef mysql50} + UnRegisterConnection(TMySQL55ConnectionDef); +{$else} + {$IfDef mysql51} initialization - RegisterConnection(TMySQL50ConnectionDef); + RegisterConnection(TMySQL51ConnectionDef); finalization - UnRegisterConnection(TMySQL50ConnectionDef); + UnRegisterConnection(TMySQL51ConnectionDef); {$ELSE} - {$IfDef mysql41} + {$IfDef mysql50} initialization - RegisterConnection(TMySQL41ConnectionDef); + RegisterConnection(TMySQL50ConnectionDef); finalization - UnRegisterConnection(TMySQL41ConnectionDef); + UnRegisterConnection(TMySQL50ConnectionDef); {$ELSE} - {$IFDEF mysql4} // temporary backwards compatibility for Lazarus + {$IfDef mysql41} initialization - RegisterConnection(TMySQL40ConnectionDef); + RegisterConnection(TMySQL41ConnectionDef); finalization - UnRegisterConnection(TMySQL40ConnectionDef); + UnRegisterConnection(TMySQL41ConnectionDef); {$ELSE} - initialization - RegisterConnection(TMySQL40ConnectionDef); - finalization - UnRegisterConnection(TMySQL40ConnectionDef); + {$IFDEF mysql4} // temporary backwards compatibility for Lazarus + initialization + RegisterConnection(TMySQL40ConnectionDef); + finalization + UnRegisterConnection(TMySQL40ConnectionDef); + {$ELSE} + initialization + RegisterConnection(TMySQL40ConnectionDef); + finalization + UnRegisterConnection(TMySQL40ConnectionDef); + {$EndIf} {$EndIf} {$EndIf} - {$EndIf} -{$ENDIF} + {$ENDIF} +{$endif} end. diff --git a/packages/mysql/fpmake.pp b/packages/mysql/fpmake.pp index 3a8ced28ba..0e75b1105b 100644 --- a/packages/mysql/fpmake.pp +++ b/packages/mysql/fpmake.pp @@ -121,6 +121,16 @@ begin begin AddInclude('mysql.inc'); end; + T:=P.Targets.AddUnit('mysql55.pp'); + with T.Dependencies do + begin + AddInclude('mysql.inc'); + end; + T:=P.Targets.AddUnit('mysql55dyn.pp'); + with T.Dependencies do + begin + AddInclude('mysql.inc'); + end; T.ResourceStrings := True; P.ExamplePath.Add('examples'); diff --git a/packages/mysql/src/mysql.inc b/packages/mysql/src/mysql.inc index 65c273cb7a..253ac1d275 100644 --- a/packages/mysql/src/mysql.inc +++ b/packages/mysql/src/mysql.inc @@ -31,7 +31,9 @@ uses {$DEFINE extdecl:=cdecl} const mysqllib = 'libmysqlclient.'+sharedsuffix; - {$IF DEFINED(mysql51)} + {$IF DEFINED(mysql55)} + mysqlvlib = mysqllib+'.18'; + {$ELSEIF DEFINED(mysql51)} mysqlvlib = mysqllib+'.16'; {$ELSEIF DEFINED(mysql50)} mysqlvlib = mysqllib+'.15'; @@ -48,6 +50,10 @@ uses mysqlvlib = 'libmysql.dll'; {$ENDIF} +{$IFDEF mysql55} + {$DEFINE mysql51} +{$ENDIF mysql55} + {$IFDEF mysql51} {$DEFINE mysql50} {$ENDIF mysql51} @@ -100,6 +106,7 @@ uses NAME_LEN = 64; HOSTNAME_LENGTH = 60; USERNAME_LENGTH = 16; + MYSQL_AUTODETECT_CHARSET_NAME = 'auto'; SERVER_VERSION_LENGTH = 60; SQLSTATE_LENGTH = 5; LOCAL_HOST = 'localhost'; @@ -180,6 +187,12 @@ uses REFRESH_THREADS = 32; // Flush thread cache REFRESH_SLAVE = 64; // Reset master info and restart slave thread REFRESH_MASTER = 128; // Remove all bin logs in the index and truncate the index + REFRESH_ERROR_LOG = 256; // Rotate only the erorr log + REFRESH_ENGINE_LOG = 512; // Flush all storage engine logs + REFRESH_BINARY_LOG = 1024; // Flush the binary log + REFRESH_RELAY_LOG = 2048; // Flush the relay log + REFRESH_GENERAL_LOG = 4096; // Flush the general log + REFRESH_SLOW_LOG = 8192; // Flush the slow query log { The following can't be set with mysql_refresh() } REFRESH_READ_LOCK = 16384; // Lock tables for read @@ -208,10 +221,16 @@ uses CLIENT_SECURE_CONNECTION = 32768; // New 4.1 authentication CLIENT_MULTI_STATEMENTS = 65536; // Enable/disable multi-stmt support CLIENT_MULTI_RESULTS = 131072; // Enable/disable multi-results + CLIENT_PS_MULTI_RESULTS : cardinal = 1 shl 18; // Multi-results in PS-protocol + CLIENT_PLUGIN_AUTH : cardinal = 1 shl 19; // Client supports plugin authentication + CLIENT_SSL_VERIFY_SERVER_CERT : cardinal = 1 shl 30; CLIENT_REMEMBER_OPTIONS : cardinal = 1 shl 31; - SERVER_STATUS_IN_TRANS = 1; // Transaction has started + SERVER_STATUS_IN_TRANS = 1; // Is raised when a multi-statement transaction + // has been started, either explicitly, by means + // of BEGIN or COMMIT AND CHAIN, or implicitly, by the first transactional + // statement, when autocommit=off SERVER_STATUS_AUTOCOMMIT = 2; // Server in auto_commit mode SERVER_STATUS_MORE_RESULTS = 4; // More results on server SERVER_MORE_RESULTS_EXISTS = 8; // Multi query - next query exists @@ -238,6 +257,10 @@ uses } SERVER_STATUS_METADATA_CHANGED = 1024; {$ENDIF} +{$IFDEF mysql55} + SERVER_QUERY_WAS_SLOW = 2048; + SERVER_PS_OUT_PARAMS = 4096; // To mark ResultSet containing output parameter values. +{$ENDIF} {$IFDEF mysql41} MYSQL_ERRMSG_SIZE = 512; @@ -549,8 +572,9 @@ uses NULL_LENGTH : culong = culong(not(0)); // For net_store_length const - MYSQL_STMT_HEADER = 4; + MYSQL_STMT_HEADER = 4; MYSQL_LONG_DATA_HEADER = 6; + NOT_FIXED_DEC = 31; { ------------ Stop of declaration in "mysql_com.h" ----------------------- } @@ -742,6 +766,12 @@ uses MYSQL_SECURE_AUTH {$IFDEF MYSQL50} ,MYSQL_REPORT_DATA_TRUNCATION, MYSQL_OPT_RECONNECT +{$IFDEF mysql51} + ,MYSQL_OPT_SSL_VERIFY_SERVER_CERT +{$IFDEF mysql55} + ,MYSQL_PLUGIN_DIR, MYSQL_DEFAULT_AUTH +{$ENDIF} +{$ENDIF} {$ENDIF} ); @@ -765,6 +795,8 @@ uses DYNAMIC_ARRAY = st_dynamic_array; Pst_dynamic_array = ^st_dynamic_array; + st_mysql_options_extention = record end; + Pst_mysql_options = ^st_mysql_options; st_mysql_options = record connect_timeout : cuint; @@ -832,6 +864,9 @@ uses local_infile_end : procedure (_para1:pointer); local_infile_error : function (_para1:pointer; _para2:Pchar; _para3:cuint):cint; local_infile_userdata : pointer; +{$IFDEF mysql51} + extension : ^st_mysql_options_extention; +{$ENDIF} {$ENDIF} end; @@ -1173,6 +1208,8 @@ uses PMYSQL_BIND = ^MYSQL_BIND; { statement handler } + st_mysql_stmt_extension = record end; + st_mysql_stmt = record mem_root : MEM_ROOT; // root allocations // list : LIST; // list to keep track of all stmts @@ -1212,6 +1249,9 @@ uses { Is set to true if we need to calculate field->max_length for metadata fields when doing mysql_stmt_store_result. } update_max_length : my_bool; +{$IFDEF mysql51} + extension: ^st_mysql_stmt_extension; +{$ENDIF} end; MYSQL_STMT = st_mysql_stmt; { When doing mysql_stmt_store_result calculate max_length attribute @@ -1450,6 +1490,7 @@ uses function mysql_autocommit(mysql:PMYSQL; auto_mode:my_bool):my_bool;extdecl;external mysqllib name 'mysql_autocommit'; function mysql_more_results(mysql:PMYSQL):my_bool;extdecl;external mysqllib name 'mysql_more_results'; function mysql_next_result(mysql:PMYSQL):cint;extdecl;external mysqllib name 'mysql_next_result'; + function mysql_stmt_next_result(stmt:PMYSQL_STMT):cint;extdecl;external mysqllib name 'mysql_stmt_next_result'; procedure mysql_close(sock:PMYSQL);extdecl;external mysqllib name 'mysql_close'; {$ELSE} @@ -1519,6 +1560,7 @@ uses mysql_stmt_affected_rows: function (stmt:PMYSQL_STMT):my_ulonglong;extdecl; mysql_stmt_insert_id: function (stmt:PMYSQL_STMT):my_ulonglong;extdecl; mysql_stmt_field_count: function (stmt:PMYSQL_STMT):cuint;extdecl; + mysql_stmt_next_result: function (stmt:PMYSQL_STMT):cint;extdecl; {$ENDIF} @@ -1686,6 +1728,7 @@ begin pointer(mysql_stmt_affected_rows) := GetProcedureAddress(MysqlLibraryHandle,'mysql_stmt_affected_rows'); pointer(mysql_stmt_insert_id) := GetProcedureAddress(MysqlLibraryHandle,'mysql_stmt_insert_id'); pointer(mysql_stmt_field_count) := GetProcedureAddress(MysqlLibraryHandle,'mysql_stmt_field_count'); + pointer(mysql_stmt_next_result) := GetProcedureAddress(MysqlLibraryHandle,'mysql_stmt_next_result'); if mysql_library_init(argc, argv, groups) <> 0 then Exit; @@ -1768,7 +1811,9 @@ end; function IS_NUM(t : enum_field_types) : boolean; begin -{$IF DEFINED(mysql50) or DEFINED(mysql51)} +{$IF DEFINED(mysql55)} + IS_NUM := ((t <= FIELD_TYPE_INT24) and (t<>FIELD_TYPE_TIMESTAMP)) or (t=FIELD_TYPE_YEAR) or (t=FIELD_TYPE_NEWDECIMAL); +{$ELSEIF DEFINED(mysql50) or DEFINED(mysql51)} IS_NUM := (t <= FIELD_TYPE_INT24) or (t=FIELD_TYPE_YEAR) or (t=FIELD_TYPE_NEWDECIMAL); {$ELSE} IS_NUM := (t <= FIELD_TYPE_INT24) or (t=FIELD_TYPE_YEAR); diff --git a/packages/mysql/src/mysql55.pp b/packages/mysql/src/mysql55.pp new file mode 100644 index 0000000000..e2b65455e0 --- /dev/null +++ b/packages/mysql/src/mysql55.pp @@ -0,0 +1,12 @@ +{ + Contains the mysql calls for MySQL 5.5 +} + +unit mysql55; + +{$UNDEF LinkDynamically} +{$DEFINE MYSQL55} + +{$i mysql.inc} + +end. diff --git a/packages/mysql/src/mysql55dyn.pp b/packages/mysql/src/mysql55dyn.pp new file mode 100644 index 0000000000..a21558db9f --- /dev/null +++ b/packages/mysql/src/mysql55dyn.pp @@ -0,0 +1,12 @@ +{ + Contains the mysql calls for MySQL 5.5 +} + +unit mysql55dyn; + +{$DEFINE LinkDynamically} +{$DEFINE MYSQL55} + +{$i mysql.inc} + +end.