From 7b5fb0794fed88349243814534b598ed44997af6 Mon Sep 17 00:00:00 2001 From: marco Date: Sat, 17 Oct 2009 18:41:26 +0000 Subject: * reworked dependancies around the FCL. daemonapp and servicemanager are isolated into fcl-extra. This makes fcl-base have less dependancies, and other problems then solve themselves. git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@13902 3ad0048d-3df7-0310-abae-a5850022a9f2 --- packages/Makefile.fpc | 59 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 23 deletions(-) (limited to 'packages/Makefile.fpc') diff --git a/packages/Makefile.fpc b/packages/Makefile.fpc index 47e549434b..3c316c27de 100644 --- a/packages/Makefile.fpc +++ b/packages/Makefile.fpc @@ -24,16 +24,16 @@ dirs_haiku=fv fcl-web fastcgi fcl-async ibase mysql ncurses zlib oracle odbc pos dirs_freebsd=fv fcl-web fastcgi fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick \ gdbint libpng x11 gdbm tcl syslog libcurl opengl cairo bfd aspell svgalib \ imlib utmp fpgtk xforms fftw pcap ggi sdl openssl graph gnome1 gtk1 gtk2 librsvg httpd13 httpd20 httpd22 pxlib numlib \ - users iconvenc gmp + users iconvenc gmp fcl-extra dirs_darwin=fv fcl-web fastcgi fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick \ - libpng gdbm tcl syslog libcurl bfd aspell utmp fftw pcap openssl numlib iconvenc gmp + libpng gdbm tcl syslog libcurl bfd aspell utmp fftw pcap openssl numlib iconvenc gmp fcl-extra dirs_i386_darwin=graph univint sdl opengl x11 cairo gtk1 gtk2 librsvg fpgtk xforms gnome1 httpd13 httpd20 httpd22 imlib opengles objcrtl dirs_powerpc_darwin=graph univint sdl opengl x11 cairo gtk1 gtk2 librsvg fpgtk xforms gnome1 httpd13 httpd20 httpd22 imlib objcrtl dirs_x86_64_darwin=opengl x11 cairo gtk1 gtk2 librsvg fpgtk xforms gnome1 httpd13 httpd20 httpd22 imlib dirs_powerpc64_darwin=opengl x11 cairo gtk1 gtk2 librsvg fpgtk xforms gnome1 httpd13 httpd20 httpd22 imlib dirs_arm_darwin= httpd13 httpd20 httpd22 opengles objcrtl dirs_solaris=fv fcl-web fastcgi fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick \ - libpng x11 gdbm tcl syslog libcurl opengl cairo gtk1 bfd svgalib \ + libpng x11 gdbm tcl syslog libcurl opengl cairo gtk1 bfd svgalib fcl-extra \ imlib utmp fpgtk xforms fftw pcap ggi openssl gnome1 httpd13 httpd20 httpd22 numlib dirs_netbsd=fv fcl-web fastcgi fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick \ gdbint libpng x11 gdbm tcl syslog libcurl opengl cairo gtk1 gtk2 librsvg bfd aspell svgalib \ @@ -43,13 +43,13 @@ dirs_openbsd=fv fcl-web fastcgi fcl-async ibase mysql ncurses zlib oracle odbc imlib utmp fpgtk xforms fftw pcap ggi sdl openssl gnome1 httpd13 httpd20 httpd22 pxlib numlib dirs_linux=fv fcl-web fastcgi fcl-async ibase mysql ncurses unzip zlib oracle dbus odbc postgres sqlite pthreads imagemagick \ gdbint libpng x11 uuid ldap modplug dts mad gdbm tcl syslog libcurl opengl cairo gtk1 gtk2 librsvg \ - a52 bfd aspell svgalib newt cdrom users iconvenc libxml proj4 \ + a52 bfd aspell svgalib newt cdrom users iconvenc libxml proj4 fcl-extra \ imlib utmp fpgtk openal lua oggvorbis xforms fftw pcap ggi sdl openssl gnome1 httpd13 httpd20 httpd22 pxlib numlib gmp dirs_win32=fv winunits-base winunits-jedi fcl-web fastcgi ibase mysql zlib oracle odbc postgres sqlite imagemagick \ - gdbint libpng mad tcl opengl gtk1 gtk2 librsvg a52 cdrom fpgtk openal fftw lua \ + gdbint libpng mad tcl opengl gtk1 gtk2 librsvg a52 cdrom fpgtk openal fftw lua fcl-extra \ oggvorbis sdl openssl graph pcap httpd13 httpd20 httpd22 pxlib numlib winceunits cairo libxml gmp dirs_win64=fv winunits-base winunits-jedi fcl-web fastcgi ibase mysql zlib oracle odbc postgres sqlite imagemagick \ - tcl opengl gtk1 fpgtk fftw sdl openssl cdrom httpd13 httpd20 httpd22 numlib + tcl opengl gtk1 fpgtk fftw sdl openssl cdrom httpd13 httpd20 httpd22 numlib fcl-extra dirs_wince=winceunits httpd22 fcl-web fastcgi tcl fftw unzip zlib sqlite mysql ibase postgres oracle odbc sdl openssl oggvorbis numlib dirs_os2=fv zlib libpng x11 tcl fpgtk rexx os2units gtk1 imlib dirs_emx=fv zlib libpng x11 tcl fpgtk rexx os2units gtk1 imlib @@ -74,26 +74,32 @@ fpmkunit_smart: fcl-base_smart fcl-process_smart paszlib_smart fpmkunit_release: fcl-base_release fcl-process_release paszlib_release fpmkunit_shared: fcl-base_shared fcl-process_shared paszlib_shared - -ifneq ($(findstring $(OS_TARGET),win32 win64),) -fcl-base_all: paszlib_all winunits-base_all winunits-jedi_all -fcl-base_debug: paszlib_debug winunits-base_debug winunits-jedi_debug -fcl-base_smart: paszlib_smart winunits-base_smart winunits-jedi_smart -fcl-base_release: paszlib_release winunits-base_release winunits-jedi_release -fcl-base_shared: paszlib_shared winunits-base_shared winunits-jedi_shared fcl-base_all: paszlib_all fcl-base_debug: paszlib_debug fcl-base_smart: paszlib_smart fcl-base_release: paszlib_release fcl-base_shared: paszlib_shared + +ifneq ($(findstring $(OS_TARGET),win32 win64),) +fcl-extra_all: fcl-base winunits-base_all winunits-jedi_all +fcl-extra_debug: fcl-base_debug winunits-base_debug winunits-jedi_debug +fcl-extra_smart: fcl-base_smart winunits-base_smart winunits-jedi_smart +fcl-extra_release: fcl-base_release winunits-base_release winunits-jedi_release +fcl-extra_shared: fcl-base_shared winunits-base_shared winunits-jedi_shared +else +fcl-extra_all: fcl-base_all +fcl-extra_debug: fcl-base_debug +fcl-extra_smart: fcl-base_smart +fcl-extra_release: fcl-base_release +fcl-extra_shared: fcl-base_shared endif ifneq ($(findstring $(FULL_TARGET),powerpc-darwin i386-darwin),) -fcl-base_all: univint_all -fcl-base_debug: univint_debug -fcl-base_smart: univint_smart -fcl-base_release: univint_release -fcl-base_shared: univint_shared +fcl-extra_all: univint_all +fcl-extra_debug: univint_debug +fcl-extra_smart: univint_smart +fcl-extra_release: univint_release +fcl-extra_shared: univint_shared endif fcl-xml_all: fcl-base_all @@ -298,11 +304,18 @@ unixutil_smart: libc_smart fcl-base_smart unixutil_debug: libc_debug fcl-base_debug unixutil_release: libc_release fcl-base_release -winunits-jedi_all: winunits-base_all -winunits-jedi_shared: winunits-base_shared -winunits-jedi_smart: winunits-base_smart -winunits-jedi_debug: winunits-base_debug -winunits-jedi_release: winunits-base_release +winunits-base_all: fcl-registry fcl-base_all +winunits-base_shared: fcl-registry fcl-base_shared +winunits-base_smart: fcl-registry fcl-base_smart +winunits-base_debug: fcl-registry fcl-base_debug +winunits-base_release: fcl-registry fcl-base_release + +winunits-jedi_all: winunits-base_all fcl-registry fcl-base_all +winunits-jedi_shared: winunits-base_shared fcl-registry fcl-base_shared +winunits-jedi_smart: winunits-base_smart fcl-registry fcl-base_smart +winunits-jedi_debug: winunits-base_debug fcl-registry fcl-base_debug +winunits-jedi_release: winunits-base_release fcl-registry fcl-base_release + xforms_all: x11_all xforms_shared: x11_shared -- cgit v1.2.1 From 333be851705ba851bae5013c3a117e6a609df85b Mon Sep 17 00:00:00 2001 From: jonas Date: Mon, 19 Oct 2009 12:51:31 +0000 Subject: * fixed darwin dependencies after r13902 git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@13910 3ad0048d-3df7-0310-abae-a5850022a9f2 --- packages/Makefile.fpc | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'packages/Makefile.fpc') diff --git a/packages/Makefile.fpc b/packages/Makefile.fpc index 3c316c27de..fc9f0e0422 100644 --- a/packages/Makefile.fpc +++ b/packages/Makefile.fpc @@ -100,6 +100,12 @@ fcl-extra_debug: univint_debug fcl-extra_smart: univint_smart fcl-extra_release: univint_release fcl-extra_shared: univint_shared + +fcl-base_all: univint_all +fcl-base_debug: univint_debug +fcl-base_smart: univint_smart +fcl-base_release: univint_release +fcl-base_shared: univint_shared endif fcl-xml_all: fcl-base_all -- cgit v1.2.1 From 54b76cd28e60c220c2ce45d2b72cab5088c7b528 Mon Sep 17 00:00:00 2001 From: marco Date: Mon, 19 Oct 2009 19:45:19 +0000 Subject: * custapp has univint deps on OS X. git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@13911 3ad0048d-3df7-0310-abae-a5850022a9f2 --- packages/Makefile.fpc | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'packages/Makefile.fpc') diff --git a/packages/Makefile.fpc b/packages/Makefile.fpc index fc9f0e0422..6350480060 100644 --- a/packages/Makefile.fpc +++ b/packages/Makefile.fpc @@ -74,11 +74,19 @@ fpmkunit_smart: fcl-base_smart fcl-process_smart paszlib_smart fpmkunit_release: fcl-base_release fcl-process_release paszlib_release fpmkunit_shared: fcl-base_shared fcl-process_shared paszlib_shared +ifneq ($(findstring $(FULL_TARGET),powerpc-darwin i386-darwin),) +fcl-base_all: univint_all paszlib_all +fcl-base_debug: univint_debug paszlib_debug +fcl-base_smart: univint_smart paszlib_smart +fcl-base_release: univint_release paszlib_release +fcl-base_shared: univint_shared paszlib_shared +else fcl-base_all: paszlib_all fcl-base_debug: paszlib_debug fcl-base_smart: paszlib_smart fcl-base_release: paszlib_release fcl-base_shared: paszlib_shared +endif ifneq ($(findstring $(OS_TARGET),win32 win64),) fcl-extra_all: fcl-base winunits-base_all winunits-jedi_all @@ -87,25 +95,19 @@ fcl-extra_smart: fcl-base_smart winunits-base_smart winunits-jedi_smart fcl-extra_release: fcl-base_release winunits-base_release winunits-jedi_release fcl-extra_shared: fcl-base_shared winunits-base_shared winunits-jedi_shared else +ifneq ($(findstring $(FULL_TARGET),powerpc-darwin i386-darwin),) +fcl-extra_all: univint_all fcl-base_all +fcl-extra_debug: univint_debug fcl-base_debug +fcl-extra_smart: univint_smart fcl-base_release +fcl-extra_release: univint_release fcl-base_release +fcl-extra_shared: univint_shared fcl-base_shared +else fcl-extra_all: fcl-base_all fcl-extra_debug: fcl-base_debug fcl-extra_smart: fcl-base_smart fcl-extra_release: fcl-base_release fcl-extra_shared: fcl-base_shared endif - -ifneq ($(findstring $(FULL_TARGET),powerpc-darwin i386-darwin),) -fcl-extra_all: univint_all -fcl-extra_debug: univint_debug -fcl-extra_smart: univint_smart -fcl-extra_release: univint_release -fcl-extra_shared: univint_shared - -fcl-base_all: univint_all -fcl-base_debug: univint_debug -fcl-base_smart: univint_smart -fcl-base_release: univint_release -fcl-base_shared: univint_shared endif fcl-xml_all: fcl-base_all -- cgit v1.2.1 From aadbbdfb9f0868180017ee5ff4468d37906c0a22 Mon Sep 17 00:00:00 2001 From: marco Date: Sat, 31 Oct 2009 10:32:15 +0000 Subject: * enabled bzip2 git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@13987 3ad0048d-3df7-0310-abae-a5850022a9f2 --- packages/Makefile.fpc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/Makefile.fpc') diff --git a/packages/Makefile.fpc b/packages/Makefile.fpc index 6350480060..a6a0d703b3 100644 --- a/packages/Makefile.fpc +++ b/packages/Makefile.fpc @@ -4,8 +4,8 @@ # [target] -dirs=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json fcl-process unzip regexpr chm fcl-res libgd symbolic -dirs_linux_i386=libc unixutil graph pxlib +dirs=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json fcl-process unzip regexpr chm fcl-res libgd symbolic bzip2 +dirs_linux_i386=libc unixutil graph pxlib bzip2 dirs_i386_linux=graph dirs_x86_64_linux=graph dirs_powerpc_linux=graph -- cgit v1.2.1 From b408144e4f628cbf761f59c89f503596c1092599 Mon Sep 17 00:00:00 2001 From: marco Date: Wed, 4 Nov 2009 11:29:45 +0000 Subject: * enabled libxml for FreeBSD. Some tests run, and the breakage of the others are not due to FreeBSD. git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@14040 3ad0048d-3df7-0310-abae-a5850022a9f2 --- packages/Makefile.fpc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/Makefile.fpc') diff --git a/packages/Makefile.fpc b/packages/Makefile.fpc index a6a0d703b3..7b50be4e2b 100644 --- a/packages/Makefile.fpc +++ b/packages/Makefile.fpc @@ -24,7 +24,7 @@ dirs_haiku=fv fcl-web fastcgi fcl-async ibase mysql ncurses zlib oracle odbc pos dirs_freebsd=fv fcl-web fastcgi fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick \ gdbint libpng x11 gdbm tcl syslog libcurl opengl cairo bfd aspell svgalib \ imlib utmp fpgtk xforms fftw pcap ggi sdl openssl graph gnome1 gtk1 gtk2 librsvg httpd13 httpd20 httpd22 pxlib numlib \ - users iconvenc gmp fcl-extra + users iconvenc gmp fcl-extra libxml dirs_darwin=fv fcl-web fastcgi fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick \ libpng gdbm tcl syslog libcurl bfd aspell utmp fftw pcap openssl numlib iconvenc gmp fcl-extra dirs_i386_darwin=graph univint sdl opengl x11 cairo gtk1 gtk2 librsvg fpgtk xforms gnome1 httpd13 httpd20 httpd22 imlib opengles objcrtl -- cgit v1.2.1