Commit Graph

214 Commits

Author SHA1 Message Date
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
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
Oliver Tappe
655a5e7f16 Rename some merged recipe files to conform to version syntax. 2013-09-17 12:08:37 +02:00
Oliver Tappe
80d36572c0 Cleanup fallout from cherry-picks (renaming .bep to .recipe). 2013-09-17 01:14:53 +02:00
Alexander von Gluck IV
36e1819c3c pkgconfig: Add 0.28, fix build (tested on gcc4)
(cherry picked from commit 7bea1e79b9)
2013-09-17 01:06:22 +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
Adrien Destugues
2bfeb67002 Update NetSurf following 3.0 release
* All the packages have changed version
 * Cleanup the dependencies to avoid repeating transitive ones
 * libxml is not required anymore (libdom replaces it everywhere)
 * on the other hand, NetSurf build uses perl html::entities. Added a bep for it.
 * Also adjusted the licences. While NetSurf is still GPL/MIT+OpenSSL exception, all the other libs are plain MIT, with various copyright holders.

(cherry picked from commit 9b6e3c28b0)

Conflicts:
	dev-libs/libwapcaplet/libwapcaplet-0.2.0-HEAD.bep
	dev-util/buildsystem/buildsystem-1.0-HEAD.bep
	media-libs/libnsbmp/libnsbmp-0.1.0-HEAD.bep
	media-libs/libsvgtiny/libsvgtiny-0.1.0-HEAD.bep
	net-libs/libdom/libdom-0.0.1-HEAD.bep
	www-client/netsurf/netsurf-3.1-HEAD.bep
2013-09-17 00:45:35 +02:00
Oliver Tappe
08421602f5 Avoid attempts at rebuilding gperf-documentation. 2013-09-07 15:30:58 +02:00
Oliver Tappe
8ec70f6e92 Add x86_64 as supported architecture to ports required by Haiku. 2013-09-02 11:51:26 +02:00
Scott McCreary
c59bbf6ac0 Added recipe for ccache-3.1.9, removed earlier versions. 2013-08-27 22:10:07 -07:00
Scott McCreary
065cdb5640 First pass at fastdep. 2013-08-27 21:17:15 -07: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
Alexander von Gluck IV
7bea1e79b9 pkgconfig: Add 0.28, fix build (tested on gcc4) 2013-08-18 20:14:54 -05:00
Ingo Weinhold
d3fff39e6e Declare most recipes stable on x86 2013-08-17 09:40:03 +02:00
Ingo Weinhold
8bea1430a7 gperf: make recipe an actual recipe 2013-08-10 07:14:38 +02:00
Ingo Weinhold
099c1c8b34 scons: Remove old non-recipes and patches 2013-08-09 18:05:51 +02:00
Ingo Weinhold
8b3e98d3a3 scons: convert 2.2.0 recipe to an actual recipe 2013-08-09 18:05: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
9291198633 ctags: bump revision 2013-06-17 19:00:42 +02:00
Ingo Weinhold
fe182f8451 pkgconfig: remove old non-recipes and patches 2013-06-11 16:57:42 +02:00
Ingo Weinhold
2af394537a pkgconfig: add recipe for 0.27.1 2013-06-11 16:56:49 +02:00