Commit graph

119 commits

Author SHA1 Message Date
Michael Stahl
3c38b7727a zlib: remove ExternalPackage_zlib
Change-Id: I5bce88b2044279a6563fd68c35f9c1ac824c8850
2013-05-08 23:34:26 +02:00
Michael Stahl
e567baf92c cairo: forgot to remove another outdir libpng path
... should be covered by $(LIBPNG_CFLAGS) already

Change-Id: Ib0f5b152b369285fca7018c0872c41ab2eb8b9cb
2013-05-08 23:34:26 +02:00
Michael Stahl
416b321666 libpng: remove ExternalPackage_libpng
Change-Id: I478a057c07b9fe850401b96297a14d7842c0703f
2013-05-08 17:49:58 +02:00
Michael Stahl
1a1f1fbdf0 gbuild: ExternalProject: remove second parameter again...
... now that everything is consistent.

Change-Id: I96c15159648815554280202eb1b6d274ead4e7b8
2013-05-07 01:41:26 +02:00
Michael Stahl
276021c761 gbuild: remove gb_ExternalProject_use_unpacked
It must always be used exactly once, so replace it with constructor
parameter.

Change-Id: Ifbe87065c19a5185a5705dc461656179002ece5d
2013-05-07 01:41:25 +02:00
David Tardon
491dea0a1f use gb_ExternalPackage_add_runtime_library for adding libs
Change-Id: I7be80bbef306db8f7ad585e95bfa4b6da0b30067
2013-05-01 16:55:38 +02:00
Michael Meeks
79b0046ba0 remove legacy build.pl prj/build.lst files. 2013-03-14 17:05:51 +00:00
Michael Stahl
b768611724 remove all d.lst
Change-Id: Icba4218c5f9fe89d183d25ea82a8eae52881f885
2013-02-28 18:40:06 +01:00
Caolán McNamara
c0f85e6879 Resolves: fdo#61571 cairo not linking against internal libpng
the flag is called SYSTEM_LIBPNG not SYSTEM_PNG

Change-Id: I703a669f544e539f7fcfa64c0121a73f0608aecc
2013-02-28 09:46:01 +00:00
Norbert Thiebaud
ed26c01be1 quiet external module build log unless failure
ExternalProject usually involve a configure and a make
step that produce a bunch of output usually irrelevant
including a large number of warning and other mess.
now that everything is pretty much in tail_build
these output get interleaved with useful output from
the build of the product and actually drown them in a logorrhea
of messy noise.
This store the output of external modules in a log file
and only print them as a whole if the module failed do build.
on a non-verbose build.

Change-Id: I3abfcccd6d16821a9e061a71e031b427cc283647
Reviewed-on: https://gerrit.libreoffice.org/2304
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2013-02-22 08:25:56 +00:00
Bjoern Michaelsen
d335c2a02a remove stray makefile.mk in cairo
Change-Id: Ie920fbdf140db81bc4426048a6c0e05f9a823d7d
2013-02-18 16:46:15 +01:00
Tor Lillqvist
c29098917a Get rid of (most uses of) GUI
GUI only takes values UNX or WNT, so it is fairly pointless. One can check
whether OS is WNT or not instead.

Change-Id: I78ae32c03536a496a563e5deeb0fca78aebf9c34
Reviewed-on: https://gerrit.libreoffice.org/1304
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-25 17:53:25 +00:00
Tor Lillqvist
12152d253e Replace GUIBASE checks with equivalent OS checks
The idea is to get rid of GUIBASE and GUI checks as much as possible.

GUIBASE=aqua <=> OS=MACOSX
GUIBASE=WIN <=> OS=WNT
GUIBASE=cocoatouch <=> OS=IOS
GUIBASE=android <=> OS=ANDROID

Don't set GUIBASE to these values any more in configure.ac
either.

GUIBASE_FOR_BUILD is not used anywhere.

Conflicts:
	configure.ac
	postprocess/packcomponents/makefile.mk
	postprocess/packregistry/makefile.mk

Change-Id: Ie0526b40e1073f2328ba6c333e28752104b0fed3
2012-12-18 20:52:24 -05:00
Luboš Luňák
fc54a7bac7 deliver also .so.<version> libraries
Otherwise dynamic loader doesn't find them there.

Change-Id: Idabec8e0fca48562164d90f5d0afdf3ebf5615cb
2012-11-21 13:33:17 +01:00
Michael Stahl
adbe531ef0 cairo: to actually use the right cairo-version.h...
...it is necessary to overwrite dummy src/cairo-version.h because that
is included with "" from src/cairo.h which means that at least GCC 4.7
looks in the current directory src/ first...

Change-Id: I4a254021ad318ffb428242443f7e1e29c876915c
2012-11-20 22:26:33 +01:00
Matúš Kukan
2cb7ba189d cairo: convert to gbuild
Change-Id: I1f3dd368a0d0b78b73df3baad214a1079bbbd1d3
Reviewed-on: https://gerrit.libreoffice.org/1144
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
2012-11-20 20:36:42 +00:00
Matúš Kukan
e7fee7d4a5 add dependency on fontconfig to cairo
Change-Id: I7c97169ea56c8290d0866e2e226cd4ecf4debc25
2012-11-07 00:27:03 +01:00
Tor Lillqvist
36a3b74d8c Revert "Depend on the internal freetype when needed (for Android)"
This caused some circular dependency issue.

This reverts commit 78c5ba99f3.
2012-11-07 00:07:27 +02:00
Tor Lillqvist
78c5ba99f3 Depend on the internal freetype when needed (for Android)
Change-Id: I02014d61cdbd77a40d0c797b3d4f3d26cff667de
2012-11-06 19:29:00 +02:00
Tor Lillqvist
22bf1df8ca Filter out fairly pointless ld warning from crt1.o (!) in the 10.4 SDK
Unfortunately the pixman and cairo configury consider any non-empty
stderr indicating an error, even if it just a warning and the exit
status of the command is success.

Change-Id: I921f72fcfc127d9c34a8db448926e478a82646d6
2012-10-14 22:42:13 +03:00
David Tardon
6066151aa1 return build conditional for libpng
Change-Id: I0ff1f219db136f3cc763d6af61df177831b1e93f
2012-09-26 13:15:14 +02:00
Matúš Kukan
f96d58bd53 libpng: convert to gbuild
Change-Id: I68d8eb5ee481c893ca1ddecf891db66bef5b03f2
2012-09-09 00:44:03 +02:00
Jung-uk Kim
34ca8dd9ad fdo#54015: At least FreeBSD ld requires -z origin when RPATH contains $ORIGIN
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>:
* bulk replacement of "-Wl,-z,origin,-rpath,..." with
  "-Wl,-z,origin -Wl,rpath,..."
* additional hunk for directory/c-sdk/config/FreeBSD.mk in
  moz/seamonkey-source-1.1.14.patch did not apply and has been dropped

Change-Id: Ie60c696f041108e819ce8f799cff6f58e63a5ad7
2012-08-29 12:02:26 +02:00
Tor Lillqvist
8f8edfe737 ATSUI is not present in the 10.7 SDK even if one builds for 10.6 or earlier
So use the avoid-ATSUI patch dependingh on (the newly added)
MAXOSX_SDK_VERSION, not MAC_OS_X_VERSION_MAX_ALLOWED.

It is not clear (to me at least) whether for instance building against
SDK version 10.7 but with MAC_OS_X_VERSION_MAX_ALLOWED=1060 ensures
the resulting binaries actually work on 10.6. Somebody should
check. If it doesn't work, we should add a check to configure.in that
the min-required and max-allowed values are not less than the SDK
version.

(If it would work even for MAC_OS_X_VERSION_MAX_ALLOWED=1040, we
would not need to require the increasingly obsolete Xcode 3 and 10.4
SDK for "official" builds.)

Change-Id: Ia7088a26024ed288db55fa734465138d44d2ae12
2012-07-23 15:27:04 +03:00
Caolán McNamara
c1239a1e70 default unix in general to system libxml2/libxslt like MacOSX
Change-Id: I7cde2a79462c71f4ce6e3ab75152e804ec7260f9
2012-05-14 14:34:10 +01:00
Thomas Collerton
9520dbf59f EasyHack fdo#42783: get rid of CPU define/build system variable
Change-Id: I6a178f7ff9c8306e15bcfa847ad1e5e4f8476504
2012-05-09 16:31:31 +02:00
Bjoern Michaelsen
b1c3e8ae28 make gbuild the default assumption of build.pl
this removes dmake completely out of the build for migrated modules
build.pl now assumes modules to be gbuild, unless there is a
prj/dmake file

Change-Id: I674a036b182ee13c5ec093e83cb3d38133112d3b
2012-04-29 03:50:46 +02:00
Caolán McNamara
3934efe28c sigh, need a 64bit zlib too on windows, reverting 2012-04-13 14:06:55 +01:00
Caolán McNamara
452af5f452 gbuildize internal zlib
and stick headers into the solver in the same hierarchy as is "standard"
so we don't have to patch so much, similiarly rename to libz
2012-04-13 13:15:25 +01:00
Fridrich Štrba
619b314317 Upgrade pixman to 0.24.4 2012-04-10 14:06:44 +02:00
Michael Meeks
dc24525d09 more idle code documentation improvement 2012-03-06 14:41:45 +00:00
Stephan Bergmann
7c4f2ec8a7 Simplify install name handling for external libraries on Mac OS X
...by allowing our special @___... tokens anywhere within an install name,
so that external modules can configure --prefix=/@___... etc.  This removes
the need for the special extshl and EXTRPATH=LOADER.  Also, a new
OUT2BIN_NONE can be used for external modules where the generated libraries
need the default EXTRPATH=OOO, but generated executables are only used
during the build and such need RPATH=NONE.
2012-02-29 18:46:38 +01:00
Fridrich Štrba
b5f727d395 Fix build of generic unix vcl plugin with older fontconfig 2012-02-21 09:51:18 +01:00
Josh Heidenreich
b469be0723 Added and improved READMEs for modules in libs-extern-sys 2012-02-09 18:23:49 +01:00
Caolán McNamara
79f5f4c971 Resolves: fdo#44219 RHEL-4 buildbox doesn't have FT_Library_SetLcdFilter 2012-01-06 09:52:42 +00:00
Tor Lillqvist
7d3c674a04 Abandon attempt to use the debug CRT in a dbgutil build 2011-12-20 18:08:08 +02:00
Fridrich Štrba
275e6c6291 Disable cairo svg surface on windows to avoid problems with missing header 2011-12-20 09:58:07 +01:00
Tor Lillqvist
0edebb4f79 Fix cairo build for Android again 2011-12-20 01:12:25 +02:00
Fridrich Štrba
04417370fc Build all default cairo features on Windows 2011-12-19 19:03:33 +01:00
Fridrich Štrba
8cf76f19c5 Build ps and pdf cairo surfaces with MSVC 2011-12-19 09:43:18 +01:00
Fridrich Štrba
b4c74957cb Fix MMX build of pixman with MSVC 2011-12-19 09:42:32 +01:00
Tor Lillqvist
2800d3366c Do build cairo for Android, will likely be needed 2011-12-17 00:42:04 +02:00
Norbert Thiebaud
3293535767 MacOSX build breaker for MacOSX
somehow having -L $solenv/$OUTPATH/lib which does not exist, in a command
cause some trouble. in configure...
2011-12-16 12:40:05 -06:00
Stephan Bergmann
c4e5203999 Code modules no longer depend on stlport. 2011-12-16 17:45:10 +01:00
Fridrich Štrba
19bd9a8a6d Fix building of cairo on windows 2011-12-16 17:31:36 +01:00
Fridrich Štrba
8cb10ca246 Make buid pixman on windows 2011-12-16 16:24:09 +01:00
Fridrich Štrba
6de6fcefde Missing pixman file 2011-12-16 15:32:09 +01:00
Fridrich Štrba
b55c8f783d Keep changes to configure.ac only as documentary evidence 2011-12-16 15:32:08 +01:00
Fridrich Štrba
582e938796 One more attempt to not have -lz sucked in 2011-12-16 15:32:08 +01:00
Fridrich Štrba
b04c1479ba -lz was sucked in by freetype 2011-12-16 14:39:29 +01:00