mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-04-18 13:59:47 +02:00
* Removed libcurl dependency from fppkg
* Added fcl-web dependency of fppkg to main packages makefile git-svn-id: trunk@17801 -
This commit is contained in:
joost
parent
19fb48dfa9
commit
c5eb5eb240
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/21]
|
||||
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/05/22]
|
||||
#
|
||||
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
|
||||
@ -107,25 +107,37 @@ FPC=$(PP)
|
||||
endif
|
||||
endif
|
||||
ifndef FPC
|
||||
DETERMINE_NATIVE_COMPILER=1
|
||||
else
|
||||
ifdef CROSSCOMPILE
|
||||
ifndef FPCFPMAKE
|
||||
DETERMINE_NATIVE_COMPILER=1
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
ifdef DETERMINE_NATIVE_COMPILER
|
||||
FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH))))
|
||||
ifneq ($(FPCPROG),)
|
||||
FPCPROG:=$(firstword $(FPCPROG))
|
||||
ifneq ($(CPU_TARGET),)
|
||||
FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB)
|
||||
FPCNATIVE:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB)
|
||||
else
|
||||
FPC:=$(shell $(FPCPROG) -PB)
|
||||
FPCNATIVE:=$(shell $(FPCPROG) -PB)
|
||||
endif
|
||||
ifneq ($(findstring Error,$(FPC)),)
|
||||
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
|
||||
ifneq ($(findstring Error,$(FPCNATIVE)),)
|
||||
override FPCNATIVE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
|
||||
else
|
||||
ifeq ($(strip $(wildcard $(FPC))),)
|
||||
FPC:=$(firstword $(FPCPROG))
|
||||
ifeq ($(strip $(wildcard $(FPCNATIVE))),)
|
||||
FPCNATIVE:=$(firstword $(FPCPROG))
|
||||
endif
|
||||
endif
|
||||
else
|
||||
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
|
||||
override FPCNATIVE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
|
||||
endif
|
||||
endif
|
||||
ifndef FPC
|
||||
FPC=$(FPCNATIVE)
|
||||
endif
|
||||
override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
|
||||
override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)
|
||||
FOUNDFPC:=$(strip $(wildcard $(FPC)))
|
||||
@ -267,24 +279,14 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(F
|
||||
ifndef FPCFPMAKE
|
||||
ifdef CROSSCOMPILE
|
||||
ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
|
||||
FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH))))
|
||||
ifneq ($(FPCPROG),)
|
||||
FPCPROG:=$(firstword $(FPCPROG))
|
||||
FPCFPMAKE:=$(shell $(FPCPROG) -PB)
|
||||
ifeq ($(strip $(wildcard $(FPCFPMAKE))),)
|
||||
FPCFPMAKE:=$(firstword $(FPCPROG))
|
||||
endif
|
||||
else
|
||||
override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
|
||||
endif
|
||||
FPCFPMAKE:=$(FPCNATIVE)
|
||||
else
|
||||
FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR))))
|
||||
FPMAKE_SKIP_CONFIG=-n
|
||||
export FPCFPMAKE
|
||||
export FPMAKE_SKIP_CONFIG
|
||||
endif
|
||||
else
|
||||
FPCFPMAKE=$(FPC)
|
||||
export FPCFPMAKE
|
||||
endif
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-linux)
|
||||
@ -9681,12 +9683,12 @@ cocoaint_smart: univint_smart
|
||||
cocoaint_release: univint_release
|
||||
cocoaint_shared: univint_shared
|
||||
endif
|
||||
ifneq ($(findstring $(OS_TARGET),beos haiku freebsd darwin iphonesim solaris netbsd openbsd linux),)
|
||||
fppkg_all: fcl-base_all fcl-xml_all fcl-process_all fcl-net_all paszlib_all libcurl_all fcl-web_all
|
||||
fppkg_debug: fcl-base_debug fcl-xml_debug fcl-process_debug fcl-net_debug paszlib_debug libcurl_debug fcl-web_debug
|
||||
fppkg_smart: fcl-base_smart fcl-xml_smart fcl-process_smart fcl-net_smart paszlib_smart libcurl_smart fcl-web_smart
|
||||
fppkg_release: fcl-base_release fcl-xml_release fcl-process_release fcl-net_release paszlib_release libcurl_release fcl-web_release
|
||||
fppkg_shared: fcl-base_shared fcl-xml_shared fcl-process_shared fcl-net_shared paszlib_shared libcurl_shared fcl-web_shared
|
||||
ifneq ($(findstring $(OS_TARGET),beos haiku freebsd darwin iphonesim solaris netbsd openbsd linux win32 win64 wince),)
|
||||
fppkg_all: fcl-base_all fcl-xml_all fcl-process_all fcl-net_all paszlib_all fcl-web_all
|
||||
fppkg_debug: fcl-base_debug fcl-xml_debug fcl-process_debug fcl-net_debug paszlib_debug fcl-web_debug
|
||||
fppkg_smart: fcl-base_smart fcl-xml_smart fcl-process_smart fcl-net_smart paszlib_smart fcl-web_smart
|
||||
fppkg_release: fcl-base_release fcl-xml_release fcl-process_release fcl-net_release paszlib_release fcl-web_release
|
||||
fppkg_shared: fcl-base_shared fcl-xml_shared fcl-process_shared fcl-net_shared paszlib_shared fcl-web_shared
|
||||
else
|
||||
fppkg_all: fcl-base_all fcl-xml_all fcl-process_all fcl-net_all paszlib_all
|
||||
fppkg_debug: fcl-base_debug fcl-xml_debug fcl-process_debug fcl-net_debug paszlib_debug
|
||||
@ -9934,7 +9936,7 @@ opencl_debug: opengl_debug
|
||||
opencl_smart: opengl_smart
|
||||
opencl_release: opengl_release
|
||||
opencl_shared: opengl_shared
|
||||
ifeq ($(findstring $(OS_TARGET),go32v2),)
|
||||
ifeq ($(findstring $(OS_TARGET),go32v2 win32 win64 wince),)
|
||||
fppkg_all: fcl-web_all
|
||||
fppkg_debug: fcl-web_debug
|
||||
fppkg_smart: fcl-web_smart
|
||||
|
||||
@ -128,12 +128,12 @@ cocoaint_release: univint_release
|
||||
cocoaint_shared: univint_shared
|
||||
endif
|
||||
|
||||
ifneq ($(findstring $(OS_TARGET),beos haiku freebsd darwin iphonesim solaris netbsd openbsd linux),)
|
||||
fppkg_all: fcl-base_all fcl-xml_all fcl-process_all fcl-net_all paszlib_all libcurl_all fcl-web_all
|
||||
fppkg_debug: fcl-base_debug fcl-xml_debug fcl-process_debug fcl-net_debug paszlib_debug libcurl_debug fcl-web_debug
|
||||
fppkg_smart: fcl-base_smart fcl-xml_smart fcl-process_smart fcl-net_smart paszlib_smart libcurl_smart fcl-web_smart
|
||||
fppkg_release: fcl-base_release fcl-xml_release fcl-process_release fcl-net_release paszlib_release libcurl_release fcl-web_release
|
||||
fppkg_shared: fcl-base_shared fcl-xml_shared fcl-process_shared fcl-net_shared paszlib_shared libcurl_shared fcl-web_shared
|
||||
ifneq ($(findstring $(OS_TARGET),beos haiku freebsd darwin iphonesim solaris netbsd openbsd linux win32 win64 wince),)
|
||||
fppkg_all: fcl-base_all fcl-xml_all fcl-process_all fcl-net_all paszlib_all fcl-web_all
|
||||
fppkg_debug: fcl-base_debug fcl-xml_debug fcl-process_debug fcl-net_debug paszlib_debug fcl-web_debug
|
||||
fppkg_smart: fcl-base_smart fcl-xml_smart fcl-process_smart fcl-net_smart paszlib_smart fcl-web_smart
|
||||
fppkg_release: fcl-base_release fcl-xml_release fcl-process_release fcl-net_release paszlib_release fcl-web_release
|
||||
fppkg_shared: fcl-base_shared fcl-xml_shared fcl-process_shared fcl-net_shared paszlib_shared fcl-web_shared
|
||||
else
|
||||
fppkg_all: fcl-base_all fcl-xml_all fcl-process_all fcl-net_all paszlib_all
|
||||
fppkg_debug: fcl-base_debug fcl-xml_debug fcl-process_debug fcl-net_debug paszlib_debug
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -35,7 +35,7 @@ fpcpackage=y
|
||||
fpcdir=../..
|
||||
|
||||
[require]
|
||||
packages=fcl-base fcl-xml fcl-process fcl-net paszlib libcurl fcl-web
|
||||
packages=fcl-base fcl-xml fcl-process fcl-net paszlib fcl-web
|
||||
tools=data2inc
|
||||
packages_darwin=univint
|
||||
packages_iphonesim=univint
|
||||
|
||||
Loading…
Reference in New Issue
Block a user