Commit Graph

88 Commits

Author SHA1 Message Date
Augustin Cavalier
d23f1c2fc3 CMake: update to 3.0.0 final. 2014-07-14 15:39:36 -04:00
PulkoMandy
0d00a5baa9 cmake: add ARM support.
* Only to please the bootstrap build process.
2014-06-14 09:06:34 +02:00
Alexander von Gluck IV
086d814af0 cmake: Drop some old / broken recipes
* 2.8.5 was even missing patchsets
2014-06-12 20:44:25 +00:00
Adrien Destugues
8029989021 Udate cmaek recipe to 3.0.0 rc6
* Remove previous RCs
* Add fix to FindOpenAL module.
2014-06-09 22:42:16 +02:00
Adrien Destugues
ff2c700560 Add recipe for cmake 3.0.0-rc5. 2014-05-18 12:47:35 +02:00
PulkoMandy
5f9bcb6928 Declare ARM support for packages to bootstrap.
* The bootstrap process won't work without that.
2014-04-22 21:23:55 +02:00
Oliver Tappe
80bbd70b83 Let all recipes use SHA-256 checksums only. 2014-04-21 19:31:51 +02:00
Adrien Destugues
dcb801514f Add recipe for CMake 3.0.0-rc3.
* Reuses the patch from rc1, and still seems to work.
2014-04-06 11:18:13 +02:00
Jonathan Schleifer
a4cc09bf55 cmake-3.0.0_rc1: Add checksums 2014-03-27 22:12:23 +01:00
Adrien Destugues
314bbe6cca Update git version of CMake patchset.
* Some more of our patches have been upstreamed.
2014-03-21 12:29:20 +01:00
Adrien Destugues
6f37335a7d Add "test" recipe for cmake git master branch.
Not intented for actual use, but this is a good way to track and test
our pending upstream changes.
2014-03-10 16:53:08 +01:00
Adrien Destugues
3e4d362da5 CMake: yet another fix to the compiler detection recipe.
Thanks to GSoC candidate akshay1994 for fixing this.
2014-03-10 14:22:45 +01:00
Adrien Destugues
ab83fa4bdf cmake: remove antique patches.
They have been upstreamed for the most part, and we don't have the
matching recipes anymore.
2014-03-10 14:22:44 +01:00
Adrien Destugues
b85bf977d2 Fix test script.
http://www.cmake.org/pipermail/cmake/2014-March/057117.html
This will probably be solved in the next release.

We get 98% passed tests, and 8 failures.
2014-03-04 20:12:38 +01:00
Adrien Destugues
7b06788772 Add recipe for CMake 3.0.0-rc1.
* Just to keep track of what has already been upstreamed so far.
* Untested: the testsuite doesn't run from haikuporter anymore. We'll be
running a CMake build bot, however.
2014-03-04 19:08:52 +01:00
Rene Gollent
8dbdecf72f Update cmake 2.8.11.2 patchset.
Rework Haiku CPU detection backend to use newer CPU
topology/information APIs for frequency calculation.
2014-03-03 16:59:33 -05:00
Adrien Destugues
0cc4ae7248 CMake: fix search path for freetype2 includes. 2014-01-13 20:38:16 +01:00
Jérôme Duval
7d19e6a9e2 cmake: enable x86_64 2014-01-08 20:52:17 +00:00
Adrien Destugues
f4c103d15e CMake: fix hybrid detection, and SDL libs detection
* The check for hybrids sometimes didn't work because the end of line
from the compiler output was stripped. Make sure there is always a
newline in the string so the regexp can match.
* The path prefix for SDL sub-libraries (image, ttf and mixer) are
wrong. Add the correct prefix, but leave the wrong ones for backward
compatibility.
2014-01-05 23:00:49 +01:00
noryb009
f4b61c7fd6 Rewrap dev-util DESCRIPTIONs 2014-01-02 16:40:56 -05:00
Alexander von Gluck IV
d97a2aabd9 all: Don't use portVersionedName for SOURCE_DIR
* portVersionedName contains the secondary architecture,
  so using it means secondary package builds fail.
  example: $portVersionedName is libwow_x86-0.0.0 when
  doing an x86 build on x86_gcc2
2013-12-25 17:52:56 -06:00
Adrien Destugues
a2e291e446 CMake: fix on non-gcc2 architectures
Checking for the compiler version at packaging time doesn't work. So, do
it earlier and export a variable for it.

Also fix some variable names to make a check work and avoid cmake
failing in strange ways later on.
2013-11-22 17:54:05 +01:00
Adrien Destugues
5725bc5195 CMake: Remove failure message
When running CPack, PlatformHaiku is imported without
CMAKE_C(XX)_COMPILER being set. Do not fail in this case, just don't set
the variables.
2013-11-21 16:01:22 +01:00
Adrien Destugues
1ee30d71a0 CMake: remove common/ references and fix use with distcc.
* common/ dir is no more.
 * When using distcc, our logic to detect the secondary architecture
didn't work because cmake ran "distcc" instad of "distcc gcc-x86". Add
the missing part to the command-line invocation.
2013-11-12 16:38:28 +01:00
Adrien Destugues
1c9af8d9b6 More complete Hpkg support in CMake/CPack
* This works well enough to get hpkg files of HaikuWebkit
 * Packages can be used in Haiku build for a Network Kit Web+
2013-11-12 09:44:48 +01:00
Adrien Destugues
ce481ebce9 CMake: add CPack support for HPKG packages. 2013-10-21 11:54:22 +02:00
Oliver Tappe
f3532dc2cb Merge branch 'package-management'
Conflicts:
	app-arch/p7zip/p7zip-9.04.bep
	app-arch/p7zip/p7zip-9.13.bep
	app-arch/tar/tar-1.22.bep
	app-arch/tar/tar-1.23.bep
	app-arch/tar/tar-1.25.bep
	app-arch/xz-utils/xz-utils-4.999.9.bep
	app-cdr/bchunk/bchunk-1.2.0.bep
	app-cdr/cdrtools/cdrtools-2.01.01a66.bep
	app-cdr/cdrtools/cdrtools-3.01a01.bep
	app-crypt/gnupg/gnupg-1.4.11.bep
	app-doc/doxygen/doxygen-1.6.3.bep
	app-editors/nano/nano-2.2.6.bep
	app-editors/vim/vim-7.3.bep
	app-text/antiword/antiword-0.37.bep
	app-text/libpaper/libpaper-1.1.23.bep
	app-text/libpaper/libpaper-1.1.24.bep
	app-text/rman/rman-3.2.bep
	dev-db/sqlite/sqlite-3.6.22.bep
	dev-db/sqlite/sqlite-3.6.23.bep
	dev-db/sqlite/sqlite-3.7.2.bep
	dev-db/sqlite/sqlite-3.7.3.bep
	dev-db/sqlite/sqlite-3.7.4.bep
	dev-db/sqlite/sqlite-3.7.5.bep
	dev-lang/lua/lua-5.1.4.bep
	dev-lang/nasm/nasm-2.08.01.bep
	dev-lang/perl/patches/perl-5.10.0.patch
	dev-lang/python/python-2.5.4.bep
	dev-lang/python/python-2.6.4.bep
	dev-lang/python/python-2.6.5.bep
	dev-lang/python/python-2.6.6.bep
	dev-lang/python/python-2.6.7.bep
	dev-lang/python/python-2.6.8.bep
	dev-lang/python/python-3.2.bep
	dev-lang/python/python-3.2.recipe
	dev-lang/python/python-3.2a4.bep
	dev-lang/yasm/yasm-1.1.0.bep
	dev-libs/apr-util/apr-util-1.3.10.bep
	dev-libs/apr-util/apr-util-1.3.9.bep
	dev-libs/apr/apr-1.3.8.bep
	dev-libs/apr/apr-1.3.9.bep
	dev-libs/apr/apr-1.4.2.bep
	dev-libs/apr/patches/apr-1.4.2.patch
	dev-libs/expat/expat-2.0.1.bep
	dev-libs/fribidi/fribidi-0.19.2.bep
	dev-libs/icu/icu-4.4.1.bep
	dev-libs/libedit/libedit-20090923.bep
	dev-libs/libedit/libedit-20100424.bep
	dev-libs/libevent/libevent-1.4.11.bep
	dev-libs/libevent/libevent-1.4.13.bep
	dev-libs/libevent/libevent-1.4.14b.bep
	dev-libs/libevent/libevent-2.0.10.bep
	dev-libs/libiconv/libiconv-1.12.bep
	dev-libs/libiconv/libiconv-1.13.1.bep
	dev-libs/libpcre/libpcre-8.00.bep
	dev-libs/libpcre/libpcre-8.02.bep
	dev-libs/libpcre/libpcre-8.12.bep
	dev-libs/libxml2/libxml2-2.7.3.bep
	dev-libs/libxml2/libxml2-2.7.6.bep
	dev-libs/libxml2/libxml2-2.7.7.bep
	dev-libs/libxml2/libxml2-2.7.8.bep
	dev-libs/openssl/openssl-0.9.8l.bep
	dev-libs/openssl/openssl-0.9.8m.bep
	dev-libs/openssl/openssl-1.0.0.bep
	dev-libs/openssl/openssl-1.0.0a.bep
	dev-libs/openssl/openssl-1.0.0c.bep
	dev-qt/qtcore/qtcore-4.8.x-git.bep
	dev-qt/qtcore/qtcore-4.8.x.recipe
	dev-util/ccache/ccache-3.0.1.bep
	dev-util/cmake/cmake-2.6.4.bep
	dev-util/cmake/cmake-2.8.0.bep
	dev-util/cmake/cmake-2.8.1.bep
	dev-util/cmake/cmake-2.8.2.bep
	dev-util/cmake/cmake-2.8.3.bep
	dev-util/cmake/cmake-2.8.4.bep
	dev-util/ctags/ctags-5.8.bep
	dev-util/fastdep/fastdep-0.16.bep
	dev-util/gperf/gperf-3.0.4.bep
	dev-util/pkgconfig/pkgconfig-0.23.bep
	dev-util/pkgconfig/pkgconfig-0.25.bep
	dev-vcs/cvs/cvs-1.12.13.1.bep
	dev-vcs/cvs/cvs-1.12.13.bep
	dev-vcs/subversion/subversion-1.6.11.bep
	dev-vcs/subversion/subversion-1.6.12.bep
	dev-vcs/subversion/subversion-1.6.13.bep
	dev-vcs/subversion/subversion-1.6.15.bep
	dev-vcs/subversion/subversion-1.6.6.bep
	dev-vcs/subversion/subversion-1.6.9.bep
	dev-vcs/subversion/subversion-1.7.xx-svn.bep
	haiku-apps/bepdf/bepdf-1.1.1b4.bep
	haiku-apps/libwalter/libwalter-97.bep
	haiku-apps/paladin/paladin-1.3-hg.bep
	haiku-apps/pe/pe-2.4.3-600.bep
	haiku-apps/vision/patches/vision-908-gcc4.patch
	haiku-apps/vision/vision-0.9.7.bep
	haiku-libs/libwalter/libwalter-97.bep
	haiku-libs/libwalter/libwalter-97.recipe
	media-gfx/graphviz/graphviz-2.24.bep
	media-gfx/graphviz/graphviz-2.26.3.bep
	media-libs/flac/flac-1.2.1.bep
	media-libs/freetype/freetype-2.3.11.bep
	media-libs/freetype/freetype-2.4.2.bep
	media-libs/freetype/freetype-2.4.4.bep
	media-libs/ftgl/ftgl-2.1-svn.bep
	media-libs/guilib/guilib-1.2.1.bep
	media-libs/jpeg/jpeg-7.bep
	media-libs/jpeg/jpeg-8b.bep
	media-libs/jpeg/jpeg-8c.bep
	media-libs/libao/libao-1.0.0.bep
	media-libs/libmad/libmad-0.15.1b.bep
	media-libs/libmng/libmng-1.0.10.bep
	media-libs/libogg/libogg-1.1.4.bep
	media-libs/libogg/libogg-1.2.0.bep
	media-libs/libogg/libogg-1.2.2.bep
	media-libs/libpng/libpng-1.2.29.bep
	media-libs/libpng/libpng-1.2.30.bep
	media-libs/libpng/libpng-1.2.40.bep
	media-libs/libpng/libpng-1.2.41.bep
	media-libs/libpng/libpng-1.2.43.bep
	media-libs/libpng/libpng-1.2.44.bep
	media-libs/libpng/libpng-1.4.1.bep
	media-libs/libpng/libpng-1.4.2.bep
	media-libs/libpng/libpng-1.4.3.bep
	media-libs/libpng/libpng-1.4.4.bep
	media-libs/libpng/libpng-1.5.0.bep
	media-libs/libsdl/patches/libsdl-1.2-hg.patch
	media-libs/libtheora/libtheora-1.1.1.bep
	media-libs/libvorbis/libvorbis-1.2.3.bep
	media-libs/libvorbis/libvorbis-1.3.1.bep
	media-libs/libvorbis/libvorbis-1.3.2.bep
	media-libs/libvpx/libvpx-0.9.2-git.bep
	media-libs/smpeg/smpeg-0.4.5.bep
	media-libs/speex/speex-1.2-git.bep
	media-libs/speex/speex-1.2rc1.bep
	media-sound/lame/lame-3.98.4.bep
	media-sound/lame/lame-398-2.bep
	media-sound/vorbis-tools/vorbis-tools-1.2.0.bep
	media-sound/vorbis-tools/vorbis-tools-1.4.0.bep
	media-video/ffmpeg/ffmpeg-0.5.bep
	media-video/ffmpeg/ffmpeg-0.6.bep
	net-misc/curl/curl-7.18.2.bep
	net-misc/curl/curl-7.19.1.bep
	net-misc/curl/curl-7.19.2.bep
	net-misc/curl/curl-7.19.5.bep
	net-misc/curl/curl-7.19.7.bep
	net-misc/curl/curl-7.20.0.bep
	net-misc/curl/curl-7.20.1.bep
	net-misc/curl/curl-7.21.1.bep
	net-misc/curl/curl-7.21.2.bep
	net-misc/curl/curl-7.21.3.bep
	net-misc/openssh/openssh-5.4p1.bep
	net-misc/openssh/openssh-5.5p1.bep
	net-misc/openssh/openssh-5.6p1.bep
	net-misc/openssh/openssh-5.7p1.bep
	net-misc/openssh/openssh-5.8p1.bep
	net-wireless/b43-fwcutter/b43-fwcutter-012.bep
	sci-libs/gsl/gsl-1.14.bep
	sys-apps/ed/ed-1.4.bep
	sys-apps/gawk/gawk-3.1.8.bep
	sys-apps/grep/grep-2.5.4.bep
	sys-apps/grep/grep-2.7.bep
	sys-apps/groff/groff-1.20.1.bep
	sys-apps/man/man-1.6f.bep
	sys-apps/sed/sed-4.2.1.bep
	sys-apps/texinfo/texinfo-4.13a.bep
	sys-devel/autoconf/autoconf-2.68.bep
	sys-devel/automake/automake-1.11.1.bep
	sys-devel/bison/bison-2.4.1.bep
	sys-devel/bison/bison-2.4.bep
	sys-devel/flex/flex-2.5.35.bep
	sys-devel/gettext/gettext-0.18.1.1-dev.bep
	sys-devel/gettext/gettext-0.18.1.1.bep
	sys-devel/jam/jam-2.5.bep
	sys-devel/m4/m4-1.4.14.bep
	sys-libs/ncurses/ncurses-5.6.bep
	sys-libs/ncurses/ncurses-5.7.bep
	sys-libs/readline/readline-5.2.bep
	sys-libs/readline/readline-6.0.bep
	sys-libs/readline/readline-6.1.bep
	sys-libs/zlib/zlib-1.2.3.bep
	sys-libs/zlib/zlib-1.2.5.bep
	x11-libs/qt/qt-4.8.x-git.bep
2013-10-15 22:48:02 +02:00
Adrien Destugues
d50f282a65 Add command line length limit to Ninja generator
* If we don't do that, ninja will fail building WebKit because of a too
long command line
 * CMake will use a "response file" to forward arguments when the
command line gets over the limit (with a safety margin)
2013-10-14 10:06:53 +02:00
Adrien Destugues
620303182f More fixes from CMake reviewer
* Avoid using sed to do regex matching when cmake has built-in
	equivalents
 * Simplify checks for empty variables (they resolve to false)
 * Rewrite the history so each commit can be applied individually
	without breaking any functionality
2013-10-05 22:51:58 +02:00
Adrien Destugues
e8f7702898 Cleanuup the cmake patchset for upstream submission. 2013-10-05 17:25:22 +02:00
Adrien Destugues
2a68df0986 Merge work on CMake 2.8.5 to 2.8.11
* The testsuite does not deadlock anymore
 * However, we only get 49% passing tests. Still some workto do there.
2013-10-03 09:32:59 +02:00
Adrien Destugues
c1ed31ee9c Fix search pathes for CMake 2.8.11.2.
* This is only tested on gcc2 hybrids, help welcome testing it on other
archs.
2013-10-02 22:54:04 +02:00
Adrien Destugues
f0cda2a5a4 Cleanup cmake-2.8.11.2 recipe and patch
* Some tests are not passing, so marking the port as broken for now.
 * Make sure the patch is actually used when building.
2013-10-01 10:47:50 +02:00
Adrien Destugues
a87953b834 Update patches for cmake 2.8.11 and 2.8-git to include some of our changes that are not merged yet.
(cherry picked from commit d2acf18c1e)

Conflicts:
	dev-util/cmake/patches/cmake-2.8-git.patch
2013-09-17 01:03:21 +02:00
Oliver Tappe
a946574571 CMake 2.8.11 fixes our build problems on Haiku (2.8.10 did not build).
Add bep file for this new version, which also merges most of our changes from the previous patch.

(cherry picked from commit 725e6e5eae)
2013-09-17 00:57:42 +02:00
Oliver Tappe
8ec70f6e92 Add x86_64 as supported architecture to ports required by Haiku. 2013-09-02 11:51:26 +02:00
Oliver Tappe
aec3652b01 Cleanup: fix names of recipe and patch files.
* this fixes the wrong recipe names introduced by myself in #d525fee
* adjust patch names to match corresponding recipes
* additionally: create 'additional-files' folders as hint to some
  ports that do not have a proper recipe yet
2013-08-25 23:51:08 +02:00
Ingo Weinhold
d3fff39e6e Declare most recipes stable on x86 2013-08-17 09:40:03 +02:00
Ingo Weinhold
c50e75ec27 cmake: fix finding libraries for secondary architecture
Haiku.cmake:
* Does now try to determine the secondary architecture from the C or
  the C++ compiler and set up the library and include search path
  variables accordingly. It also sets CMAKE_*LIBRARY_ARCHITECTURE.
* Remove obsolete */include paths.
* Set the same include search paths for C and C++. At least the paths
  we do consider are the same.
2013-08-08 05:09:29 +02:00
Oliver Tappe
39a646a289 Adjust recipes to separation of buildhost and target packages 2013-08-05 00:14:47 +02:00
Oliver Tappe
d525fee8e9 Fix names of recipe files that were non-parsable 2013-08-04 21:47:43 +02:00
Adrien Destugues
d2acf18c1e Update patches for cmake 2.8.11 and 2.8-git to include some of our changes that are not merged yet. 2013-07-27 16:11:19 +02:00
Adrien Destugues
725e6e5eae CMake 2.8.11 fixes our build problems on Haiku (2.8.10 did not build).
Add bep file for this new version, which also merges most of our changes from the previous patch.
2013-07-27 15:18:13 +02:00
Ingo Weinhold
0dd756390e cmake: bump revision 2013-06-17 19:00:43 +02:00
Ingo Weinhold
3315657fae cmake: Fix finding libraries
Set CMAKE_SYSTEM_LIBRARY_PATH in Haiku.cmake by default after all.
CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES doesn't really seem to be
used.
2013-05-20 18:11:03 +02:00
Ingo Weinhold
588f7769ed Convert cmake 2.8.5 recipe to an actual recipe
Also adjust the patch according to the new directory layout for
development files and simplify in a few places.
2013-04-28 19:12:03 +02:00
Oliver Tappe
60aba35d64 * convert all .bep files to follow shell syntax
* rename all .bep files to .recipe
2013-03-29 16:31:03 +00:00
Oliver Tappe
94cc6aaf85 Merge all changes from trunk 2013-03-29 14:04:07 +00:00
Cian Duffy
42f79c0439 Fix Freetype detection routine in cmake 2013-02-10 23:27:22 +00:00
Adrien Destugues
6f41d37e10 Some of our patches were merged upstream (thanks!). Remove them from the patch file. Also add a test rule while I'm at it. We fail 8 tests out of 257. 2013-01-11 19:17:13 +00:00