Commit Graph

241 Commits

Author SHA1 Message Date
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
Oliver Tappe
ba743fa244 Add missing commands required for building. 2014-03-05 21:49:40 +00: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
Jonathan Schleifer
a49dcf7b88 abi_compliance_checker-1.98.3.recipe: Fix syntax error 2014-02-19 16:22:33 +01:00
Adrien Destugues
0cc4ae7248 CMake: fix search path for freetype2 includes. 2014-01-13 20:38:16 +01:00
Scott McCreary
9c55f414f8 WIP abi_compliance_checker, TODO-unravel the target directories 2014-01-10 03:13:40 -08: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
Scott McCreary
3c25a8f3d2 Fix secondaryArchSuffix for ragel 2013-12-30 15:14:32 -08:00
Theodore Kokkoris
d197a3424b Added ragel 6.8 recipe and patch 2013-12-30 19:54:48 +00:00
Theodore Kokkoris
313b29ceba Fixed intltool-0.40.6 recipe to be compatible with .recipe format 2013-12-27 12:44:17 +00: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
François Revol
451d3654ee pkg-config: Allow secondary arch builds
Since it hardcodes the search paths inside the binary, either
we must make a secondary arch build of it for _x86 ports,
either we could export a patched PKG_CONFIG_LIBDIR from
haikuporter 's environment... but this seems to work anyway.
2013-12-11 09:39:31 +01:00
François Revol
c46dcd59a4 netsurf_buildsystem: Fix provides 2013-12-09 18:17:47 +01:00
François Revol
ba717a9158 buildsystem: rename to netsurf_buildsystem 2013-12-09 18:17:46 +01:00
François Revol
6257415a4d netsurf_buildsystem: remove old recipe 2013-12-09 18:17:45 +01:00
François Revol
324d7d07af netsurf_buildsystem: Force installing to data/
The install path is hardcoded in the makefile to $prefix/shared/.

Also remove the make invocation, it's a no-op anyway.
2013-12-09 18:17:44 +01:00
François Revol
391e2b7b9d Fix and rename NetSurf's buildsystem
lowercase name works much better...

FIXME: still need to fix paths (share/...).
2013-12-09 17:37:09 +01:00
Scott McCreary
7afffc1dd9 Fixed ccache so that it builds again 2013-12-09 10:48:43 +00:00
Scott McCreary
f5035b1344 Fixed fastdep so that it builds again 2013-12-09 10:48:40 +00:00
François Revol
72ac1f84c6 Convert some remaining bep syntax to shell syntax 2013-12-07 02:00:02 +01:00
Scott McCreary
7de6be4b0e Updated axel, bakefile, and antiword recipes so that they now build again, recipes by GCI2013 student Dareus 2013-11-29 03:03:49 +00: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
Scott McCreary
d715cae92c Bump pkgconfig-0.27.1 to revision 2 2013-11-11 00:20:52 -08:00
Scott McCreary
fdfa8f4e24 Update paths in pkgconfig recipe. 2013-11-11 00:20:30 -08:00
Chris Roberts
05699503b4 Remove charset.alias file from diffutils/idutils/patch 2013-10-28 19:16:51 -06:00
Chris Roberts
d9cbb1a840 Convert/update astyle to working recipe 2013-10-28 15:07:38 -06:00
Chris Roberts
c7af452b93 Fix bad link dir variable in w3m and global 2013-10-22 15:16:40 -06:00
Adrien Destugues
ce481ebce9 CMake: add CPack support for HPKG packages. 2013-10-21 11:54:22 +02:00
Chris Roberts
0fcb11a989 Convert/update global to working recipe 2013-10-16 17:02:11 -06:00
Chris Roberts
c0629f9f3a Convert/update patchutils to working recipe 2013-10-16 16:24:44 -06:00
Chris Roberts
55e012c492 Convert/update idutils to working recipe 2013-10-16 16:23:49 -06:00
Chris Roberts
c3ddab959c Convert cscope to working recipe 2013-10-16 16:17:16 -06:00
Chris Roberts
f583e06d22 Cleanup leftover directories from the merge.
--HG--
rename : dev-libs/apr-util/patches/apr-util-1.3.10.patch => dev-libs/apr_util/patches/apr_util-1.3.10.patch
rename : haiku-apps/caya-gpl-protocols/patches/caya-gpl-protocols-0.HEAD.patch => haiku-apps/caya_gpl_protocols/patches/caya_gpl_protocols-0.HEAD.patch
2013-10-16 14:59:48 -06: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
Oliver Tappe
d679195b5a Bump revision of scons and mercurial.
* These provide a python module, so they need to be rebuilt in
  order to get those modules moved into the vendor-packages
  directory.
2013-10-15 21:38:30 +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
5c0c10ac00 Fix ninja recipe
* Workaround bug in python to get the build working
 * Mark the recipe as working.
2013-10-13 22:45:21 +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
c2a04a95c9 WIP for ninja.
* Fails to build, the python bootstrap tools seems to be generating
some build rules twice.
 * Not enough experience with Python to solve this, so leaving the
package as broken.
2013-10-03 10:10:30 +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