Browse Source

* Generic FCL fixes for newer targets.

marco 23 years ago
parent
commit
87c09b4534
4 changed files with 34 additions and 0 deletions
  1. 11 0
      fcl/Makefile
  2. 3 0
      fcl/Makefile.fpc
  3. 18 0
      fcl/db/Makefile
  4. 2 0
      fcl/db/Makefile.fpc

+ 11 - 0
fcl/Makefile

@@ -215,6 +215,9 @@ endif
 ifeq ($(OS_TARGET),netbsd)
 ifeq ($(OS_TARGET),netbsd)
 override TARGET_UNITS+=process asyncio ssockets http
 override TARGET_UNITS+=process asyncio ssockets http
 endif
 endif
+ifeq ($(OS_TARGET),openbsd)
+override TARGET_UNITS+=process asyncio ssockets http
+endif
 override TARGET_RSTS+=classes ssockets cachecls
 override TARGET_RSTS+=classes ssockets cachecls
 override TARGET_EXAMPLEDIRS+=tests
 override TARGET_EXAMPLEDIRS+=tests
 override CLEAN_UNITS+=adler gzcrc gzio infblock infcodes inffast inftrees infutil minigzip paszlib trees zbase zcompres zdeflate zinflate zuncompr zutil
 override CLEAN_UNITS+=adler gzcrc gzio infblock infcodes inffast inftrees infutil minigzip paszlib trees zbase zcompres zdeflate zinflate zuncompr zutil
@@ -236,6 +239,9 @@ endif
 ifeq ($(OS_TARGET),qnx)
 ifeq ($(OS_TARGET),qnx)
 override COMPILER_INCLUDEDIR+=posix
 override COMPILER_INCLUDEDIR+=posix
 endif
 endif
+ifeq ($(OS_TARGET),openbsd)
+override COMPILER_INCLUDEDIR+=unix
+endif
 override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
 override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
 override COMPILER_TARGETDIR+=$(OS_TARGET)
 override COMPILER_TARGETDIR+=$(OS_TARGET)
 ifdef REQUIRE_UNITSDIR
 ifdef REQUIRE_UNITSDIR
@@ -839,6 +845,8 @@ ifeq ($(OS_TARGET),netbsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_INET=1
 REQUIRE_PACKAGES_INET=1
+REQUIRE_PACKAGES_MYSQL=1
+REQUIRE_PACKAGES_IBASE=1
 endif
 endif
 ifeq ($(OS_TARGET),amiga)
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_RTL=1
@@ -863,6 +871,9 @@ endif
 ifeq ($(OS_TARGET),openbsd)
 ifeq ($(OS_TARGET),openbsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_INET=1
+REQUIRE_PACKAGES_MYSQL=1
+REQUIRE_PACKAGES_IBASE=1
 endif
 endif
 ifeq ($(OS_TARGET),wdosx)
 ifeq ($(OS_TARGET),wdosx)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_RTL=1

+ 3 - 0
fcl/Makefile.fpc

@@ -11,6 +11,7 @@ packages=paszlib
 packages_linux=inet
 packages_linux=inet
 packages_freebsd=inet
 packages_freebsd=inet
 packages_netbsd=inet
 packages_netbsd=inet
+packages_openbsd=inet
 
 
 # clean package units
 # clean package units
 [clean]
 [clean]
@@ -21,6 +22,7 @@ dirs=xml db shedit
 units=classes contnrs inifiles registry ezcgi pipes rtfpars idea base64 gettext iostream zstream cachecls
 units=classes contnrs inifiles registry ezcgi pipes rtfpars idea base64 gettext iostream zstream cachecls
 units_freebsd=process asyncio ssockets http
 units_freebsd=process asyncio ssockets http
 units_netbsd=process asyncio ssockets http
 units_netbsd=process asyncio ssockets http
+units_openbsd=process asyncio ssockets http
 units_linux=process asyncio ssockets http
 units_linux=process asyncio ssockets http
 units_win32=process fileinfo
 units_win32=process fileinfo
 rsts=classes ssockets cachecls
 rsts=classes ssockets cachecls
@@ -33,6 +35,7 @@ includedir=$(OS_TARGET) inc
 includedir_linux=unix
 includedir_linux=unix
 includedir_freebsd=unix
 includedir_freebsd=unix
 includedir_netbsd=unix
 includedir_netbsd=unix
+includedir_openbsd=unix
 includedir_sunos=posix
 includedir_sunos=posix
 includedir_qnx=posix
 includedir_qnx=posix
 sourcedir=$(OS_TARGET) inc
 sourcedir=$(OS_TARGET) inc

+ 18 - 0
fcl/db/Makefile

@@ -210,6 +210,12 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 ifeq ($(OS_TARGET),freebsd)
 override TARGET_DIRS+=mysql interbase
 override TARGET_DIRS+=mysql interbase
 endif
 endif
+ifeq ($(OS_TARGET),netbsd)
+override TARGET_DIRS+=mysql interbase
+endif
+ifeq ($(OS_TARGET),openbsd)
+override TARGET_DIRS+=mysql interbase
+endif
 override TARGET_UNITS+=db ddg_ds ddg_rec
 override TARGET_UNITS+=db ddg_ds ddg_rec
 override TARGET_EXAMPLEDIRS+=tests
 override TARGET_EXAMPLEDIRS+=tests
 override INSTALL_FPCPACKAGE=y
 override INSTALL_FPCPACKAGE=y
@@ -806,6 +812,8 @@ REQUIRE_PACKAGES_RTL=1
 endif
 endif
 ifeq ($(OS_TARGET),netbsd)
 ifeq ($(OS_TARGET),netbsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_MYSQL=1
+REQUIRE_PACKAGES_IBASE=1
 endif
 endif
 ifeq ($(OS_TARGET),amiga)
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_RTL=1
@@ -824,6 +832,8 @@ REQUIRE_PACKAGES_RTL=1
 endif
 endif
 ifeq ($(OS_TARGET),openbsd)
 ifeq ($(OS_TARGET),openbsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_MYSQL=1
+REQUIRE_PACKAGES_IBASE=1
 endif
 endif
 ifeq ($(OS_TARGET),wdosx)
 ifeq ($(OS_TARGET),wdosx)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_RTL=1
@@ -1303,6 +1313,14 @@ ifeq ($(OS_TARGET),freebsd)
 TARGET_DIRS_MYSQL=1
 TARGET_DIRS_MYSQL=1
 TARGET_DIRS_INTERBASE=1
 TARGET_DIRS_INTERBASE=1
 endif
 endif
+ifeq ($(OS_TARGET),netbsd)
+TARGET_DIRS_MYSQL=1
+TARGET_DIRS_INTERBASE=1
+endif
+ifeq ($(OS_TARGET),openbsd)
+TARGET_DIRS_MYSQL=1
+TARGET_DIRS_INTERBASE=1
+endif
 ifdef TARGET_DIRS_DBASE
 ifdef TARGET_DIRS_DBASE
 dbase_all:
 dbase_all:
 	$(MAKE) -C dbase all
 	$(MAKE) -C dbase all

+ 2 - 0
fcl/db/Makefile.fpc

@@ -9,6 +9,8 @@ main=fcl
 dirs=dbase
 dirs=dbase
 dirs_linux=mysql interbase
 dirs_linux=mysql interbase
 dirs_freebsd=mysql interbase
 dirs_freebsd=mysql interbase
+dirs_netbsd=mysql interbase
+dirs_openbsd=mysql interbase
 dirs_win32=mysql interbase
 dirs_win32=mysql interbase
 units=db ddg_ds ddg_rec
 units=db ddg_ds ddg_rec
 exampledirs=tests
 exampledirs=tests