From cf81d396824a2c5dcd30743e3506e6e9ecde3019 Mon Sep 17 00:00:00 2001 From: Tomas Hajny Date: Mon, 10 Oct 2011 23:06:10 +0000 Subject: [PATCH] * fixed wrong dependency of fppkg on fcl-web for all targets git-svn-id: trunk@19456 - --- packages/Makefile | 7 ------- packages/Makefile.fpc | 8 -------- packages/fppkg/Makefile | 32 +------------------------------- packages/fppkg/Makefile.fpc | 16 +++++++++++++--- 4 files changed, 14 insertions(+), 49 deletions(-) diff --git a/packages/Makefile b/packages/Makefile index 7746472ddc..b18d74c421 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -9905,10 +9905,3 @@ opencl_debug: opengl_debug opencl_smart: opengl_smart opencl_release: opengl_release opencl_shared: opengl_shared -ifeq ($(findstring $(OS_TARGET),go32v2),) -fppkg_all: fcl-web_all -fppkg_debug: fcl-web_debug -fppkg_smart: fcl-web_smart -fppkg_release: fcl-web_release -fppkg_shared: fcl-web_shared -endif diff --git a/packages/Makefile.fpc b/packages/Makefile.fpc index d03dc3d1df..ff265a3394 100644 --- a/packages/Makefile.fpc +++ b/packages/Makefile.fpc @@ -438,11 +438,3 @@ opencl_debug: opengl_debug opencl_smart: opengl_smart opencl_release: opengl_release opencl_shared: opengl_shared - -ifeq ($(findstring $(OS_TARGET),go32v2),) -fppkg_all: fcl-web_all -fppkg_debug: fcl-web_debug -fppkg_smart: fcl-web_smart -fppkg_release: fcl-web_release -fppkg_shared: fcl-web_shared -endif diff --git a/packages/fppkg/Makefile b/packages/fppkg/Makefile index b83377654d..e20c6fba1e 100644 --- a/packages/fppkg/Makefile +++ b/packages/fppkg/Makefile @@ -1698,7 +1698,7 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl fcl-base fcl-xml fcl-process fcl-net paszlib fcl-web +override REQUIRE_PACKAGES=rtl fcl-base fcl-xml fcl-process fcl-net paszlib ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 @@ -1720,7 +1720,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_FCL-WEB=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 @@ -1742,7 +1741,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_FCL-WEB=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1811,7 +1809,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_FCL-WEB=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 @@ -1822,7 +1819,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_FCL-WEB=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1844,7 +1840,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_FCL-WEB=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1868,7 +1863,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_FCL-WEB=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 @@ -1879,7 +1873,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_FCL-WEB=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 @@ -1890,7 +1883,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_FCL-WEB=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 @@ -1912,7 +1904,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_FCL-WEB=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 @@ -1923,7 +1914,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_FCL-WEB=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 @@ -1934,7 +1924,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_FCL-WEB=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 @@ -1993,7 +1982,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_FCL-WEB=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 @@ -2004,7 +1992,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_FCL-WEB=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -2026,7 +2013,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_FCL-WEB=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2037,7 +2023,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_FCL-WEB=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 @@ -2071,7 +2056,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_FCL-WEB=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 @@ -2082,7 +2066,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_FCL-WEB=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2106,7 +2089,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_FCL-WEB=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2117,7 +2099,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_FCL-WEB=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 @@ -2128,7 +2109,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_FCL-WEB=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 @@ -2173,7 +2153,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_FCL-WEB=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 @@ -2243,7 +2222,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_FCL-WEB=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 @@ -2266,7 +2244,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_FCL-WEB=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2301,7 +2278,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_FCL-WEB=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 @@ -2312,7 +2288,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_FCL-WEB=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2323,7 +2298,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_FCL-WEB=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 @@ -2334,7 +2308,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_FCL-WEB=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 @@ -2370,7 +2343,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_FCL-WEB=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2381,7 +2353,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_FCL-WEB=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 @@ -2404,7 +2375,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_FCL-WEB=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 diff --git a/packages/fppkg/Makefile.fpc b/packages/fppkg/Makefile.fpc index b3d3f1e782..4efc47d1f5 100644 --- a/packages/fppkg/Makefile.fpc +++ b/packages/fppkg/Makefile.fpc @@ -35,10 +35,20 @@ fpcpackage=y fpcdir=../.. [require] -packages=fcl-base fcl-xml fcl-process fcl-net paszlib fcl-web +packages=fcl-base fcl-xml fcl-process fcl-net paszlib tools=data2inc -packages_darwin=univint -packages_iphonesim=univint +packages_darwin=univint fcl-web +packages_iphonesim=univint fcl-web +packages_linux=fcl-web +packages_beos=fcl-web +packages_haiku=fcl-web +packages_freebsd=fcl-web +packages_netbsd=fcl-web +packages_openbsd=fcl-web +packages_solaris=fcl-web +packages_win32=fcl-web +packages_win64=fcl-web +packages_wince=fcl-web [rules] .NOTPARALLEL: