+ pthreads dependency added for linux

fcl/Makefile

@@ -932,6 +932,7 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
+REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_IBASE=1
 endif
@@ -942,6 +943,7 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
+REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_IBASE=1
 endif
@@ -952,6 +954,7 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
+REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_IBASE=1
 endif
@@ -962,6 +965,7 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
+REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_IBASE=1
 endif
@@ -972,6 +976,7 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
+REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_IBASE=1
 endif
@@ -1262,6 +1267,32 @@ ifdef UNITDIR_LIBASYNC
 override COMPILER_UNITDIR+=$(UNITDIR_LIBASYNC)
 endif
 endif
+ifdef REQUIRE_PACKAGES_PTHREADS
+PACKAGEDIR_PTHREADS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pthreads/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_PTHREADS),)
+ifneq ($(wildcard $(PACKAGEDIR_PTHREADS)/$(OS_TARGET)),)
+UNITDIR_PTHREADS=$(PACKAGEDIR_PTHREADS)/$(OS_TARGET)
+else
+UNITDIR_PTHREADS=$(PACKAGEDIR_PTHREADS)
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_PTHREADS)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_PTHREADS) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_PTHREADS)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_PTHREADS=
+UNITDIR_PTHREADS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /pthreads/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_PTHREADS),)
+UNITDIR_PTHREADS:=$(firstword $(UNITDIR_PTHREADS))
+else
+UNITDIR_PTHREADS=
+endif
+endif
+ifdef UNITDIR_PTHREADS
+override COMPILER_UNITDIR+=$(UNITDIR_PTHREADS)
+endif
+endif
 ifdef REQUIRE_PACKAGES_MYSQL
 PACKAGEDIR_MYSQL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /mysql/Makefile.fpc,$(PACKAGESDIR))))))
 ifneq ($(PACKAGEDIR_MYSQL),)

fcl/Makefile.fpc

@@ -8,7 +8,7 @@ version=1.0.6
 
 [require]
 packages=paszlib
-packages_linux=netdb libasync
+packages_linux=netdb libasync pthreads
 packages_freebsd=netdb libasync
 packages_netbsd=netdb libasync
 packages_openbsd=netdb libasync

packages/base/Makefile

@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2003/04/06]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2003/06/14]
 #
 default: all
-MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos macosx emx
+MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
@@ -32,7 +32,7 @@ inOS2=1
 endif
 endif
 else
-ifneq ($(findstring cygwin,$(MACHTYPE)),)
+ifneq ($(findstring cygdrive,$(PATH)),)
 inCygWin=1
 endif
 endif
@@ -203,9 +203,9 @@ else
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
-override TARGET_DIRS+=paszlib regexpr
+override TARGET_DIRS+=paszlib regexpr netdb
 ifeq ($(OS_TARGET),linux)
-override TARGET_DIRS+=inet gdbint libasync mysql ibase postgres oracle odbc netdb
+override TARGET_DIRS+=inet gdbint libasync mysql ibase postgres oracle odbc pthreads
 endif
 ifeq ($(OS_TARGET),go32v2)
 override TARGET_DIRS+=gdbint
@@ -214,13 +214,13 @@ ifeq ($(OS_TARGET),win32)
 override TARGET_DIRS+=inet gdbint mysql ibase odbc
 endif
 ifeq ($(OS_TARGET),freebsd)
-override TARGET_DIRS+=inet gdbint libasync mysql ibase postgres oracle odbc netdb
+override TARGET_DIRS+=inet gdbint libasync mysql ibase postgres oracle odbc
 endif
 ifeq ($(OS_TARGET),netbsd)
-override TARGET_DIRS+=inet gdbint libasync mysql ibase postgres oracle odbc netdb
+override TARGET_DIRS+=inet gdbint libasync mysql ibase postgres oracle odbc
 endif
 ifeq ($(OS_TARGET),openbsd)
-override TARGET_DIRS+=inet gdbint libasync mysql ibase postgres oracle odbc netdb
+override TARGET_DIRS+=inet gdbint libasync mysql ibase postgres oracle odbc
 endif
 override INSTALL_FPCPACKAGE=y
 override INSTALL_FPCSUBDIR=packages/base
@@ -519,6 +519,12 @@ ifeq ($(OS_TARGET),macos)
 EXEEXT=
 FPCMADE=fpcmade.mcc
 endif
+ifeq ($(OS_TARGET),darwin)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.darwin
+ZIPSUFFIX=darwin
+endif
 else
 ifeq ($(OS_TARGET),go32v1)
 PPUEXT=.pp1
@@ -875,6 +881,163 @@ else
 TAROPT=vz
 TAREXT=.tar.gz
 endif
+override REQUIRE_PACKAGES=rtl 
+ifeq ($(OS_TARGET),linux)
+ifeq ($(CPU_TARGET),i386)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
+ifeq ($(OS_TARGET),linux)
+ifeq ($(CPU_TARGET),m68k)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
+ifeq ($(OS_TARGET),linux)
+ifeq ($(CPU_TARGET),powerpc)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
+ifeq ($(OS_TARGET),linux)
+ifeq ($(CPU_TARGET),sparc)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
+ifeq ($(OS_TARGET),linux)
+ifeq ($(CPU_TARGET),x86_64)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
+ifeq ($(OS_TARGET),go32v2)
+ifeq ($(CPU_TARGET),i386)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
+ifeq ($(OS_TARGET),win32)
+ifeq ($(CPU_TARGET),i386)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
+ifeq ($(OS_TARGET),os2)
+ifeq ($(CPU_TARGET),i386)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
+ifeq ($(OS_TARGET),freebsd)
+ifeq ($(CPU_TARGET),i386)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
+ifeq ($(OS_TARGET),freebsd)
+ifeq ($(CPU_TARGET),m68k)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
+ifeq ($(OS_TARGET),beos)
+ifeq ($(CPU_TARGET),i386)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
+ifeq ($(OS_TARGET),netbsd)
+ifeq ($(CPU_TARGET),i386)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
+ifeq ($(OS_TARGET),netbsd)
+ifeq ($(CPU_TARGET),m68k)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
+ifeq ($(OS_TARGET),amiga)
+ifeq ($(CPU_TARGET),m68k)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
+ifeq ($(OS_TARGET),atari)
+ifeq ($(CPU_TARGET),m68k)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
+ifeq ($(OS_TARGET),sunos)
+ifeq ($(CPU_TARGET),i386)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
+ifeq ($(OS_TARGET),sunos)
+ifeq ($(CPU_TARGET),sparc)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
+ifeq ($(OS_TARGET),qnx)
+ifeq ($(CPU_TARGET),i386)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
+ifeq ($(OS_TARGET),netware)
+ifeq ($(CPU_TARGET),i386)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
+ifeq ($(OS_TARGET),openbsd)
+ifeq ($(CPU_TARGET),i386)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
+ifeq ($(OS_TARGET),openbsd)
+ifeq ($(CPU_TARGET),m68k)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
+ifeq ($(OS_TARGET),wdosx)
+ifeq ($(CPU_TARGET),i386)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
+ifeq ($(OS_TARGET),palmos)
+ifeq ($(CPU_TARGET),m68k)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
+ifeq ($(OS_TARGET),macos)
+ifeq ($(CPU_TARGET),powerpc)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
+ifeq ($(OS_TARGET),darwin)
+ifeq ($(CPU_TARGET),powerpc)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
+ifeq ($(OS_TARGET),emx)
+ifeq ($(CPU_TARGET),i386)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
+ifdef REQUIRE_PACKAGES_RTL
+PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/$(OS_TARGET)/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_RTL),)
+ifneq ($(wildcard $(PACKAGEDIR_RTL)/$(OS_TARGET)),)
+UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
+else
+UNITDIR_RTL=$(PACKAGEDIR_RTL)
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_RTL=
+UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_RTL),)
+UNITDIR_RTL:=$(firstword $(UNITDIR_RTL))
+else
+UNITDIR_RTL=
+endif
+endif
+ifdef UNITDIR_RTL
+override COMPILER_UNITDIR+=$(UNITDIR_RTL)
+endif
+endif
 ifndef NOCPUDEF
 override FPCOPTDEF=$(CPU_TARGET)
 endif
@@ -988,7 +1151,7 @@ override COMPILER:=$(FPC) $(FPCOPT)
 ifeq (,$(findstring -s ,$(COMPILER)))
 EXECPPAS=
 else
-ifeq ($(OS_SOURCE),$(OS_TARGET))
+ifeq ($(FULL_SOURCE),$(FULL_TARGET))
 EXECPPAS:=@$(PPAS)
 endif
 endif
@@ -1146,6 +1309,7 @@ fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
 fpc_makefiles: fpc_makefile fpc_makefile_dirs
 TARGET_DIRS_PASZLIB=1
 TARGET_DIRS_REGEXPR=1
+TARGET_DIRS_NETDB=1
 ifeq ($(OS_TARGET),linux)
 TARGET_DIRS_INET=1
 TARGET_DIRS_GDBINT=1
@@ -1155,7 +1319,7 @@ TARGET_DIRS_IBASE=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_ORACLE=1
 TARGET_DIRS_ODBC=1
-TARGET_DIRS_NETDB=1
+TARGET_DIRS_PTHREADS=1
 endif
 ifeq ($(OS_TARGET),go32v2)
 TARGET_DIRS_GDBINT=1
@@ -1176,7 +1340,6 @@ TARGET_DIRS_IBASE=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_ORACLE=1
 TARGET_DIRS_ODBC=1
-TARGET_DIRS_NETDB=1
 endif
 ifeq ($(OS_TARGET),netbsd)
 TARGET_DIRS_INET=1
@@ -1187,7 +1350,6 @@ TARGET_DIRS_IBASE=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_ORACLE=1
 TARGET_DIRS_ODBC=1
-TARGET_DIRS_NETDB=1
 endif
 ifeq ($(OS_TARGET),openbsd)
 TARGET_DIRS_INET=1
@@ -1198,7 +1360,6 @@ TARGET_DIRS_IBASE=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_ORACLE=1
 TARGET_DIRS_ODBC=1
-TARGET_DIRS_NETDB=1
 endif
 ifdef TARGET_DIRS_PASZLIB
 paszlib_all:
@@ -1286,6 +1447,49 @@ regexpr:
 	$(MAKE) -C regexpr all
 .PHONY: regexpr_all regexpr_debug regexpr_smart regexpr_release regexpr_examples regexpr_shared regexpr_install regexpr_sourceinstall regexpr_exampleinstall regexpr_distinstall regexpr_zipinstall regexpr_zipsourceinstall regexpr_zipexampleinstall regexpr_zipdistinstall regexpr_clean regexpr_distclean regexpr_cleanall regexpr_info regexpr_makefiles regexpr
 endif
+ifdef TARGET_DIRS_NETDB
+netdb_all:
+	$(MAKE) -C netdb all
+netdb_debug:
+	$(MAKE) -C netdb debug
+netdb_smart:
+	$(MAKE) -C netdb smart
+netdb_release:
+	$(MAKE) -C netdb release
+netdb_examples:
+	$(MAKE) -C netdb examples
+netdb_shared:
+	$(MAKE) -C netdb shared
+netdb_install:
+	$(MAKE) -C netdb install
+netdb_sourceinstall:
+	$(MAKE) -C netdb sourceinstall
+netdb_exampleinstall:
+	$(MAKE) -C netdb exampleinstall
+netdb_distinstall:
+	$(MAKE) -C netdb distinstall
+netdb_zipinstall:
+	$(MAKE) -C netdb zipinstall
+netdb_zipsourceinstall:
+	$(MAKE) -C netdb zipsourceinstall
+netdb_zipexampleinstall:
+	$(MAKE) -C netdb zipexampleinstall
+netdb_zipdistinstall:
+	$(MAKE) -C netdb zipdistinstall
+netdb_clean:
+	$(MAKE) -C netdb clean
+netdb_distclean:
+	$(MAKE) -C netdb distclean
+netdb_cleanall:
+	$(MAKE) -C netdb cleanall
+netdb_info:
+	$(MAKE) -C netdb info
+netdb_makefiles:
+	$(MAKE) -C netdb makefiles
+netdb:
+	$(MAKE) -C netdb all
+.PHONY: netdb_all netdb_debug netdb_smart netdb_release netdb_examples netdb_shared netdb_install netdb_sourceinstall netdb_exampleinstall netdb_distinstall netdb_zipinstall netdb_zipsourceinstall netdb_zipexampleinstall netdb_zipdistinstall netdb_clean netdb_distclean netdb_cleanall netdb_info netdb_makefiles netdb
+endif
 ifdef TARGET_DIRS_INET
 inet_all:
 	$(MAKE) -C inet all
@@ -1630,48 +1834,48 @@ odbc:
 	$(MAKE) -C odbc all
 .PHONY: odbc_all odbc_debug odbc_smart odbc_release odbc_examples odbc_shared odbc_install odbc_sourceinstall odbc_exampleinstall odbc_distinstall odbc_zipinstall odbc_zipsourceinstall odbc_zipexampleinstall odbc_zipdistinstall odbc_clean odbc_distclean odbc_cleanall odbc_info odbc_makefiles odbc
 endif
-ifdef TARGET_DIRS_NETDB
-netdb_all:
-	$(MAKE) -C netdb all
-netdb_debug:
-	$(MAKE) -C netdb debug
-netdb_smart:
-	$(MAKE) -C netdb smart
-netdb_release:
-	$(MAKE) -C netdb release
-netdb_examples:
-	$(MAKE) -C netdb examples
-netdb_shared:
-	$(MAKE) -C netdb shared
-netdb_install:
-	$(MAKE) -C netdb install
-netdb_sourceinstall:
-	$(MAKE) -C netdb sourceinstall
-netdb_exampleinstall:
-	$(MAKE) -C netdb exampleinstall
-netdb_distinstall:
-	$(MAKE) -C netdb distinstall
-netdb_zipinstall:
-	$(MAKE) -C netdb zipinstall
-netdb_zipsourceinstall:
-	$(MAKE) -C netdb zipsourceinstall
-netdb_zipexampleinstall:
-	$(MAKE) -C netdb zipexampleinstall
-netdb_zipdistinstall:
-	$(MAKE) -C netdb zipdistinstall
-netdb_clean:
-	$(MAKE) -C netdb clean
-netdb_distclean:
-	$(MAKE) -C netdb distclean
-netdb_cleanall:
-	$(MAKE) -C netdb cleanall
-netdb_info:
-	$(MAKE) -C netdb info
-netdb_makefiles:
-	$(MAKE) -C netdb makefiles
-netdb:
-	$(MAKE) -C netdb all
-.PHONY: netdb_all netdb_debug netdb_smart netdb_release netdb_examples netdb_shared netdb_install netdb_sourceinstall netdb_exampleinstall netdb_distinstall netdb_zipinstall netdb_zipsourceinstall netdb_zipexampleinstall netdb_zipdistinstall netdb_clean netdb_distclean netdb_cleanall netdb_info netdb_makefiles netdb
+ifdef TARGET_DIRS_PTHREADS
+pthreads_all:
+	$(MAKE) -C pthreads all
+pthreads_debug:
+	$(MAKE) -C pthreads debug
+pthreads_smart:
+	$(MAKE) -C pthreads smart
+pthreads_release:
+	$(MAKE) -C pthreads release
+pthreads_examples:
+	$(MAKE) -C pthreads examples
+pthreads_shared:
+	$(MAKE) -C pthreads shared
+pthreads_install:
+	$(MAKE) -C pthreads install
+pthreads_sourceinstall:
+	$(MAKE) -C pthreads sourceinstall
+pthreads_exampleinstall:
+	$(MAKE) -C pthreads exampleinstall
+pthreads_distinstall:
+	$(MAKE) -C pthreads distinstall
+pthreads_zipinstall:
+	$(MAKE) -C pthreads zipinstall
+pthreads_zipsourceinstall:
+	$(MAKE) -C pthreads zipsourceinstall
+pthreads_zipexampleinstall:
+	$(MAKE) -C pthreads zipexampleinstall
+pthreads_zipdistinstall:
+	$(MAKE) -C pthreads zipdistinstall
+pthreads_clean:
+	$(MAKE) -C pthreads clean
+pthreads_distclean:
+	$(MAKE) -C pthreads distclean
+pthreads_cleanall:
+	$(MAKE) -C pthreads cleanall
+pthreads_info:
+	$(MAKE) -C pthreads info
+pthreads_makefiles:
+	$(MAKE) -C pthreads makefiles
+pthreads:
+	$(MAKE) -C pthreads all
+.PHONY: pthreads_all pthreads_debug pthreads_smart pthreads_release pthreads_examples pthreads_shared pthreads_install pthreads_sourceinstall pthreads_exampleinstall pthreads_distinstall pthreads_zipinstall pthreads_zipsourceinstall pthreads_zipexampleinstall pthreads_zipdistinstall pthreads_clean pthreads_distclean pthreads_cleanall pthreads_info pthreads_makefiles pthreads
 endif
 all: $(addsuffix _all,$(TARGET_DIRS))
 debug: $(addsuffix _debug,$(TARGET_DIRS))

packages/base/Makefile.fpc

@@ -3,18 +3,18 @@
 #
 
 [target]
-dirs=paszlib regexpr
+dirs=paszlib regexpr netdb
 dirs_linux=inet gdbint libasync \
-           mysql ibase postgres oracle odbc netdb
+           mysql ibase postgres oracle odbc pthreads
 dirs_win32=inet gdbint \
            mysql ibase odbc
 dirs_go32v2=gdbint
 dirs_netbsd=inet gdbint libasync \
-            mysql ibase postgres oracle odbc netdb
+            mysql ibase postgres oracle odbc 
 dirs_openbsd=inet gdbint libasync \
-            mysql ibase postgres oracle odbc netdb
+            mysql ibase postgres oracle odbc 
 dirs_freebsd=inet gdbint libasync \
-             mysql ibase postgres oracle odbc netdb
+             mysql ibase postgres oracle odbc 
 
 [install]
 fpcpackage=y