210 Commits

Author SHA1 Message Date
rsadowski
2f8e808809 Update cmake to 3.15.3
Release notes:
https://cmake.org/cmake/help/v3.15/release/3.15.htm

No OpenBSD relevant changes.
2019-09-20 14:37:24 +00:00
rsadowski
bf12019dd1 Update cmake to 3.15.2
Highlights:

- Stop building cmake itself with ninja. Upstream has decided not to
  support this anymore. I see no benefit and it's getting harder and
  harder to take care of.
- Use cmake's internel libuv, json-cpp etc. to build the bootstrap
  cmake (only bootstrap).
- Fix SONAME in cmake ports

Notable port changes:

- Fix COMPILER, it's not possible to build the old and the new cmake
  version with base-gcc, isn't.
- It doesn't make any sense to keep the m88k XXX tags. CMake don't build
  under m88k.
- Tech cmake to detect/provide system JDK11, lua and new ruby version
  (of course upcoming ruby 2.7)
- I took some pre-configure commands from the FreeBSDs port.
- Add --docdir to avoid warnings and sort CONFIGURE_ARGS

Bulk build by naddy@ on amd64. Thanks a lot!
Successful test by Martin Reindl on macppc and arm64. Thanks!
2019-08-21 05:47:40 +00:00
sthen
9fe1e38b23 replace simple PERMIT_PACKAGE_CDROM=Yes with PERMIT_PACKAGE=Yes 2019-07-12 20:43:27 +00:00
sthen
6ff3e55398 bump REVISION in a bunch of ports known or likely to use struct kinfo_proc,
there may be some missing as my unpacked ports source is a little out of date
but this should catch the main things people might run into

the struct was reordered a second time in sysctl.h r1.192 to improve
compatibility but amd64 snapshot packages made it out before that happened
so the bumps are still needed
2019-06-25 20:25:20 +00:00
sthen
86852bcf6e reset unresponsive maintainers, various porters have spent a bunch of
time waiting for timeouts over the last year or more for many of these
ports.  ok danj@ jca@ kmos@
2019-04-24 16:26:54 +00:00
pascal
9c9d13242d Let cmake cope with new location of libuv includes. 2019-01-04 08:54:42 +00:00
sthen
25f0e460f2 Add COMPILER lines to c++ ports which currently use the default. Adjust
some existing COMPILER lines with arch restrictions etc. In the usual
case this is now using "COMPILER = base-clang ports-gcc base-gcc" on
ports with c++ libraries in WANTLIB.

This is basically intended to be a noop on architectures using clang
as the system compiler, but help with other architectures where we
currently have many ports knocked out due to building with an unsuitable
compiler -

- some ports require c++11/newer so the GCC version in base that is used
on these archirtectures is too old.

- some ports have conflicts where an executable is built with one compiler
(e.g. gcc from base) but a library dependency is built with a different
one (e.g. gcc from ports), resulted in mixing incompatible libraries in the
same address space.

devel/gmp is intentionally skipped as it's on the path to building gcc -
the c++ library there is unused in ports (and not built by default upstream)
so intending to disable building gmpcxx in a future commit.
2018-10-24 14:27:57 +00:00
bcallah
2a5249375f Allow Samurai to be used to build CMake ports by setting USE_NINJA=samurai
Some of these variables may be moved to more permanent homes later, after
samurai gets through a bulk build, but for now this allows testing of
samurai without changing the default case of using ninja.

Adapted from sthen@'s diff. ok sthen@
2018-09-11 12:12:31 +00:00
jsg
486b7b49c3 Enable the stack protector again on arm. It was disabled when armv7
used gcc 4.2, this builds fine after the switch to clang.
2018-07-13 03:00:16 +00:00
sthen
c7b1925252 backout to cmake 3.10.2 to unbreak ports at least on i386, maybe others, ok jca
3.11.2 has issues along these lines:

cmQtAutoGeneratorMocUic.cxx:(.text+0x8e8b): undefined reference to `operator new(unsigned long, std::align_val_t)'
cmQtAutoGeneratorMocUic.cxx:(.text+0x8ebf): undefined reference to `operator delete(void*, std::align_val_t)'
2018-06-14 17:04:45 +00:00
rsadowski
f93ceded67 Update CMake to 3.11.2
sparc64 bulk by jca@, amd64 by landry@ Thanks! Maintainer feedback timeout

ok jca@ landry@
2018-06-12 05:12:01 +00:00
sthen
1ee90f5b01 Bump the next set of ports to trigger rebuilds following cpu stats changes
(CPUSTATES/etc). More to come.
2018-06-01 15:32:04 +00:00
sthen
5d95ab140b patch to disable cmake picking up libexecinfo / execinfo.h during build;
seems this can happen on ports-gcc arches. reported by/tests landry@
2018-05-04 21:36:24 +00:00
rsadowski
a629d34d9b Update cmake to 3.10.2
Initial diff from me and revised diff from dcoppa@.
COMPILER tweak from jca@ and many bulks from landry@. Thanks!

ok dcoppa@ landry@ jca@
2018-03-14 12:24:54 +00:00
jca
d1565529a6 Stop abusing DEBUG in cmake.port.mk
Setting DEBUG changed the cmake build type ("release" vs "debug"), which
had a bunch of undocumented and surprising consequences:
- changing CFLAGS/LDFLAGS etc, potentially to values unsupported on
  OpenBSD, instead of just using what the user passed in DEBUG
- PLIST changes which break packaging when using PLIST_DB (default)

Leave DEBUG alone and introduce MODCMAKE_DEBUG as a documented feature
instead, as proposed by various folks.  Reluctant ok landry@ (thanks!)
2018-01-26 13:11:14 +00:00
espie
88170a8ca8 be more stupid, always tag _build/runtime_params and .ninja_log
as files that may change.  there's really no need for logic, who else
would use those files ?
2017-11-28 10:26:00 +00:00
espie
7536a9e0ac reduce noise in check-wrkdir output, ninja builds update their log during
fake, and that's okay
2017-11-25 12:19:07 +00:00
sthen
7ca2ede1cf add a !defined(CONFIGURE_ARGS) check to unbreak cmake things that don't
set CONFIGURE_ARGS, reported by jca@, thanks!
2017-11-02 14:32:37 +00:00
sthen
b3d1116028 Don't override CMAKE_BUILD_TYPE if a port wants to take control. ok landry@ 2017-11-02 11:04:37 +00:00
dcoppa
39d889d7d4 Update to CMake-3.9.3 2017-09-22 13:42:54 +00:00
dcoppa
afac03f005 Bugfixing update to cmake-3.9.2 2017-09-08 06:32:29 +00:00
dcoppa
698ae8c08d cmake: Fix --find-package mode with imported targets
(upstream git commit 18454ea44d6a1fd2dbc613ad9c3fe941639563aa)

Before:

$ cmake --find-package -DNAME=TIFF -DLANGUAGE=C -DCOMPILER_ID=GNU -DMODE=LINK
CMake Error at /usr/local/share/cmake/Modules/FindTIFF.cmake:78 (add_library):
  Unknown CMake command "add_library".
Call Stack (most recent call first):
  /usr/local/share/cmake/Modules/CMakeFindPackageMode.cmake:180 (find_package)

TIFF not found.
CMake Error: Problem processing arguments. Aborting.

After:

$ cmake --find-package -DNAME=TIFF -DLANGUAGE=C -DCOMPILER_ID=GNU -DMODE=LINK
 -L/usr/local/lib -ltiff -Wl,-rpath-link,/usr/X11R6/lib:/usr/local/lib
2017-09-01 08:45:13 +00:00
dcoppa
16afbc2029 Update to CMake-3.9.1
Tests and feedback by rsadowski@, schwarze@
Ports bulk build by sthen@
2017-08-26 17:53:35 +00:00
sthen
5e964ab0df bump LIBCXX/LIBECXX/COMPILER_LIBCXX ports. 2017-07-26 22:45:14 +00:00
espie
8ac47fd9c6 use COMPILER_LIBCXX where applicable 2017-07-16 19:18:47 +00:00
zhuk
1ccdac894c Use standard CMake idiom for Foo_INCLUDE_DIR/DIRS and Foo_LIBRARY/LIBRARIES
in FindLibXml2.cmake.

To be used by pgpointcloud port. See also the upstream merge request #1043:
https://gitlab.kitware.com/cmake/cmake/merge_requests/1043

okay dcoppa@, landry@
2017-07-10 23:05:54 +00:00
dcoppa
c2cb84c7eb Revert previous 2017-07-04 20:07:51 +00:00
dcoppa
1d66a1f07e include/libxml2/libxml/encoding.h wants iconv.h, so teach
FindLibXml2.cmake how to find the libiconv include directory.

Problem spotted by landry@ while porting geo/pgpointcloud
2017-07-04 16:38:53 +00:00
kurt
ad353c9559 Update for devel/jdk/1.7 removal. okay dcoppa@ sthen@ 2017-04-21 18:37:43 +00:00
sthen
7b9fdbb2c9 use LIBCXX 2017-04-10 11:45:22 +00:00
dcoppa
6b7e5a80b9 Update to cmake-3.7.2 2017-01-16 08:51:50 +00:00
dcoppa
ae3598771b Bugfixing update to cmake-3.7.1 2016-12-01 09:38:54 +00:00
dcoppa
a3c284dfa6 Update to CMake-3.7.0
Thanks to naddy@ who ran a bulk build with it
2016-11-28 09:15:13 +00:00
dcoppa
254f28304c maintenance update to cmake-3.6.3 2016-11-04 09:34:22 +00:00
dcoppa
47f0d4d5b0 Maintenance update to cmake-3.6.2.
Nothing worth of interest for us.
2016-09-08 07:53:32 +00:00
dcoppa
2a16923e13 Hack cmake so that if webkit is in the list of shared libraries
that are passed to the linker, automatically add '-Wl,-z,wxneeded'
to the linker flags.
Works for libQt5WebKit, libQtWebKit, libwebkit2gtk, libwebkitgtk.

Requested by, and ok, ajacoutot@
Also ok landry@
2016-09-06 08:43:54 +00:00
dcoppa
938e116557 Revert previous, it was causing breakage to some ports.
spotted by naddy@
2016-08-13 15:01:13 +00:00
dcoppa
5579805dd1 FindPkgConfig: call find_library() for every library returned by
the .pc file, so that at the end a list of full paths to the libraries
is returned.
This makes the pkg_check_modules() behaviour consistent with the
normal CMake convention, where use of link_directories() is discouraged
in favour of using absolute paths to system libraries.

Patch by Sam Thursfield <sam.thursfield@codethink.co.uk>
https://cmake.org/Bug/view.php?id=15804
2016-08-12 14:23:02 +00:00
dcoppa
168d14aa46 Update to CMake-3.6.1.
Tested in a bulk build by naddy@: the one and only fallout has been
fixed.
2016-08-08 07:44:48 +00:00
dcoppa
5ca8fee37b Update to CMake-3.5.2
ok sthen@
2016-04-29 10:34:33 +00:00
sthen
fd870f2264 Clean up some bits missed in yesterday's systrace removal. 2016-04-26 10:56:59 +00:00
dcoppa
4118e5c5b9 sync 2016-04-19 19:48:28 +00:00
shadchin
525cd9c2bd Unbreak after py-sphinx update to 1.4 2016-04-15 08:53:48 +00:00
dcoppa
4150790c68 sync 2016-03-24 13:22:21 +00:00
jsg
d47b7967c5 Switch arm back to using base gcc for cmake. This requires disabling
the stack protector so the bootstrap won't hit toolchain bugs.

ok dcoppa@ sthen@
2016-02-19 01:19:51 +00:00
dcoppa
f4ead80e7b Do not handle jsoncpp in a special way, treat it like all the other
external libraries

$ diff -u objdump-pre.out objdump-post.out | grep libjsoncpp
-  NEEDED      /usr/local/lib/libjsoncpp.so.0.0
+  NEEDED      libjsoncpp.so.0.0
2016-01-28 11:28:02 +00:00
dcoppa
3cf039bccd Use g++-4.9 from ports to build cmake on arm
OK jsg@, sthen@
2016-01-28 09:22:31 +00:00
dcoppa
2fb56e44cb Update to cmake-3.4.3.
Windows10-related fixes
2016-01-26 08:44:07 +00:00
dcoppa
2ac2301d47 Maintenance update to cmake-3.4.2.
Nothing interesting for us...
2016-01-20 09:39:46 +00:00
jsg
ac49dd042a set CXXFLAGS in addition to CFLAGS for an arm specific workaround here as well 2015-12-29 14:44:34 +00:00