Commit Graph

271 Commits

Author SHA1 Message Date
naddy
4f1d2838ba revert "Handle ALL_TARGET and INSTALL_TARGET in cmake module"
It breaks a number of ports at the fake step:

Unknown argument -t
Usage: cmake --install <dir> [options]
2023-01-28 22:03:46 +00:00
kn
34b56cbb68 Remove security/hlfl
WWW is dead, the old hlfl.org is now another project, DESCR doesn't
mention pf, long missing out on updates, unmaintained.

OK benoit
2023-01-28 16:25:12 +00:00
rsadowski
78a7f300d2 Bugfix update CMake 3.25.2
https://www.kitware.com/cmake-3-25-2-available-for-download/
2023-01-22 08:59:03 +00:00
rsadowski
ea9ecc2516 Update cmake to 3.25.1 2022-12-03 17:40:12 +00:00
rsadowski
f3b6bbde5b Update cmake to 3.24.3 2022-11-08 16:00:55 +00:00
naddy
424a60c42f remove line continuation before empty lines
ok sthen@ ajacoutot@
2022-10-31 23:14:52 +00:00
sthen
533f76026d regen PLISTs following py-sphinx update 2022-10-31 08:47:46 +00:00
rsadowski
7c01d45bae Bring back the upper-case -DPYTHON_* for now
Some old cmake ports still use it. Many hints on how to use them or what to do
in the right order can be found here:

https://cmake.org/cmake/help/latest/module/FindPythonLibs.html

For the record: FindPythonInterp and FindPythonLibs are deprecated since
version 3.12: Use FindPython3, FindPython2 or FindPython instead. All of them
operate with -DPython instead of -DPYTHON.

Spotted by naddy
2022-10-29 04:11:21 +00:00
rsadowski
93252f9e0b Improve python version detection when multiple versions are installed
Add Python${MODPY_MAJOR_VERSION}_{EXECUTABLE,LIBRARY_DIRS,INCLUDE_DIR}
to help CMake to detect the correct python ports version.

OK tb@, discovered in an aarch64 bulk build with Python 3.10 installed at the
time of build.
2022-10-28 17:05:18 +00:00
rsadowski
a886fb36dc Bugfix update cmake 3.24.2
https://www.kitware.com/cmake-3-24-2-is-available-for-download/
2022-09-18 14:59:46 +00:00
rsadowski
bb44e53fca Enable MODCMAKE_VERBOSE
I somehow forgot that.
2022-09-02 18:00:02 +00:00
rsadowski
ec925382d2 Mordernize CMake Module
- Use cmake(1) and ctest(1) instead of ninja(1)
- Change test verbose mode

OK sthen, kn and tb
2022-09-02 13:19:58 +00:00
sthen
956e3b651c more s/MODPY_VERSION/3.9 in plist 2022-08-27 08:33:14 +00:00
sthen
10a5cda2ed s//3.9/ in plist 2022-08-27 07:33:18 +00:00
rsadowski
4b8ff8da6d Update CMake to 3.24.1
Version 3.24:
https://cmake.org/cmake/help/v3.24/release/3.24.html

Bugfix update 3.24.1:
https://www.kitware.com/cmake-3-24-1-is-available-for-download/

OK tb@ for version 3.24.0
2022-08-25 20:06:36 +00:00
rsadowski
d1a13d9219 Bugfix update CMake to 3.23.3
https://www.kitware.com/cmake-3-23-3-available-for-download/
2022-07-31 20:40:36 +00:00
kn
967b64d57d Shorten tcl/tk patch
Ports no longer has 8.4 and base has no tcl/tk headers at all.

OK rsadowski
2022-07-18 18:24:32 +00:00
kn
66edfb3ab9 Remove old {KDE,Qt}{3,4} patches
We longer build/support those old frameworks.

OK rsadowski sthen
2022-07-15 07:51:38 +00:00
sthen
8311c389e4 regen PLIST following sphinx update 2022-07-07 16:23:17 +00:00
rsadowski
c2ed8df29e Respect OPENBSD_X11BASE 2022-06-19 08:16:22 +00:00
rsadowski
a694f71ec1 Bugfix update CMake to 3.23.2 2022-06-14 10:26:13 +00:00
rsadowski
c6874d2913 Prefer base instead of ports binutiles
Override the default binutiles filepath for ar, ranlib, addr2line, nm,
readelf, strip.

Some ports pick up llvm-ar and llvm-ranlib from the ports version of LLVM
tools. This can cause problems if devel/llvm tools (llvm-*) are detected at
configuration time but junked at build time.

Feedback, help and OK sthen@
2022-06-06 09:31:51 +00:00
kn
eb3f0ab592 Allow file(DOWNLOAD, file:///...) in ports builds
Ports trying to fetch URLs from variables can be fixed without patching
by passing an absoloute file path as URL, e.g.
  file(DOWNLOAD ${CONFIG_URL} ${CMAKE_CURRENT_BINARY_DIR}/config.json)

can be fixed right from our Makefile like so
  -DCONFIG_URL=file://${DISTDIR}/myport-config.json

The alternative would be to patch sources to use something akin to
  configure_file(${CONFIG_URL} ${CMAKE_CURRENT_BINARY_DIR}/config.json COPYONLY)

UPLOAD does not need this and stays completely neutered in ports builds.

OK sthen rsadowski
2022-05-29 00:30:30 +00:00
rsadowski
b6a8a48098 Update CMake to 3.23.1
- Drop cmComputeLinkInformation.cxx patch
I don't understand why we still have this "workaround". Everything works
WITHOUT it. It comes from very old dark times and was never validated again.
I'm happy to drop it!

- cmGeneratorTarget.cxx patch
cmValue needs heap variables, that fixes a possible crash. Nevertheless,
I still don't like this solution because nothing deletes the string.
I have to dig dipper in the CMake memory management system. Anyway, not
perfect but better than now. I will discuss this with upstream.

- Respect CFLAGS and CXXFLAGS
cmake.port.mk now respects C/CXX flags. With is CMAKE_*_FLAGS_* is obsolete.

- MODCMAKE_LDFLAGS
cmake.port.mk now respects LDFLAGS flags when you set MODCMAKE_LDFLAGS
https://cmake.org/cmake/help/latest/envvar/LDFLAGS.html

Many thanks to tb and sthen. Bulk build by tb, final ok sthen
2022-05-28 06:18:52 +00:00
robert
30649e8a7a add a hack to the hack to allow building libraries that link to libraries
with OBJECT type so that path/to/object.o does not get translated to -lobject.o

ok aja@, sthen@, rsadowski@
2022-03-26 08:14:00 +00:00
rsadowski
2bb505eaca Fix LIBxxx_VERSION processing by introducing MODCMAKE_USE_SHARED_LIBS
The default "0.0" version has been broken for several months/years.

MODCMAKE_USE_SHARED_LIBS:

If set to "Yes", CMake will override of shared library version using
LIBxxx_VERSION.  LIBxxx_VERSION is created by the module and put in
CONFIGURE_ENV and MAKE_ENV.

If no LIBxxx_VERSION environment variable is present during configure stage
but the shared library was set a VERSION or SOVERSION by CMake, then the
shared library verison is set to 0.0.

Special case: If the CMake target shared library is given the prefix `lib'
and the `PREFIX' option is set to an empty string then the overwrite still
takes effect.

OK kn@, Bulk build by sthen@, Feedback by many; Thanks
2022-03-18 21:05:31 +00:00
naddy
85229c97e7 drop RCS Ids 2022-03-11 18:49:30 +00:00
rsadowski
c6c6e6ca53 Fix cmake /usr/(local|X11R6) post-patch handling
OK sthen@
2022-02-26 19:42:28 +00:00
rsadowski
12ae4c69cc Remove the cmake wxneeded-hack and replace it with USE_WXNEEDED
Remove the webkit/webengine-wxneeded hack in cmComputeLinkInformation.cxx
and add USE_WXNEEDED=Yes to all cmake webkit/webengine consumer.

Background knowledge about the "hack":
It searches for webkit/webengine (lower-case search) in all link-entries for
EXECUTABLE/SHARED_LIBRARY targets. If the search match it adds
"-Wl,-z,wxneeded".

Feedback, help and OK sthen@ Thanks!
2022-02-13 16:38:29 +00:00
rsadowski
c89b6cbd2f Disable find_package "QUIET" option in openbsd ports builds
Help porters to find hidden (QUIET) dependencies in cmake ports by disabling
the QUIET option in the ports tree build.

This is controlled at MODCMAKE_PORT_BUILD and is activated by default.

OK kn@
2022-01-03 16:18:52 +00:00
sthen
129f770429 disable DOWNLOAD/UPLOAD in cmake when called from OpenBSD ports builds.
ok rsadowski@ kn@
2022-01-03 15:10:14 +00:00
sthen
58814d4c09 cmake: use ${PATCHORIG}, don't hardcode .orig 2022-01-03 12:21:50 +00:00
sthen
ecc401aba5 fix bogus MODPY_VERSION variables in PLIST entries 2021-10-31 11:34:49 +00:00
daniel
7437f9d093 update py-sphinx to 4.0.2 and regen PLISTs for affected consumers
all consumers were packaged and installed on amd64 by me; all python2
syntax in consumers appears to have been updated at this point making
it possible to move to the 4.x series.

lang/ghc bits look ok to gnezdo@

ok sthen@ on the rest
2021-07-06 16:55:32 +00:00
rsadowski
0b8c3c2143 Update CMake 3.20.3
https://blog.kitware.com/cmake-3-20-3-available-for-download/
2021-05-28 08:26:08 +00:00
rsadowski
d857fefe28 Remove cmLocaleRAII patch.
This is no longer necessary. The class now copies the value of LC_CTYPE and not
hold a pointer.
2021-05-21 18:48:45 +00:00
rsadowski
418271b18e Remove useless and broken patches
Discussed with upstream
2021-05-21 18:43:15 +00:00
rsadowski
0ad4dc7182 Remove obsolete USE_SYSTRACE patch
OK sthen@
2021-05-18 17:37:01 +00:00
rsadowski
3d1c2f1f60 Add merge-request link from upstream
The patch will stay.
2021-05-18 03:42:29 +00:00
rsadowski
9cbccf7aa8 Update cmake to 3.20.2
Notable port changes:

- Remove cmLocaleRAII patch. This is no longer necessary. The class now
  copies the value of LC_CTYPE and not hold a pointer.
- Some patches merged upstream:
  https://blog.kitware.com/cmake-3-20-2-available-for-download/
  https://gitlab.kitware.com/cmake/cmake/-/merge_requests/6000

Survived 3 amd64 bulk builds, all consumers should be patched with upstream
patches.
2021-05-09 14:46:15 +00:00
rsadowski
6c53428d82 Enable CMAKE_SUPPRESS_REGENERATION
https://cmake.org/cmake/help/latest/variable/CMAKE_SUPPRESS_REGENERATION.html

If something change during the build-task in /usr/local/share/cmake/Modules/
(For example, another package was installed), cmake starts a second configure
tasks after the build task.  In this second task our (self hacked) SHARED_LIBS
VERSION's are lost. Whit CMAKE_SUPPRESS_REGENERATION=ON this not happen.

This should lead to significantly better cmake bulk build results.

OK sthen@
2021-04-25 12:25:30 +00:00
sthen
3cbe1c2f30 Reverse the polarity of MODPY_VERSION; default is now 3.x,
if a port needs 2.x then set MODPY_VERSION=${MODPY_DEFAULT_VERSION_2}.

This commit doesn't change any versions currently used; it may be that
some ports have MODPY_DEFAULT_VERSION_2 but don't require it, those
should be cleaned up in the course of updating ports where possible.

Python module ports providing py3-* packages should still use
FLAVOR=python3 so that we don't have a mixture of dependencies some
using ${MODPY_FLAVOR} and others not.
2021-02-23 19:39:08 +00:00
sthen
29704c3c83 adapt to py-sphinx-3.5.1 2021-02-20 22:27:27 +00:00
rsadowski
0523920a53 Update cmake to 3.19.4 2021-02-12 17:36:49 +00:00
rsadowski
4cb5b2f199 Update cmake to 3.19.1
Changelog:
https://cmake.org/cmake/help/v3.18/release/3.18.html
https://cmake.org/cmake/help/v3.19/release/3.19.html

This update went through a amd64 bulk build and also tested with ~500 ports on
macppc without issues by cwen@
2020-12-30 07:17:34 +00:00
daniel
ceb3a6300c update py-sphinx to 1.5.6
main changes are:
- add a new dep on py-requests
- undo the no longer needed iftex.sty workaround
- move MODPY variables to more standard location
- regen plist

Unfortunately py-sphinx changed the suffix from .txt to .rst.txt in the
1.5 series. This means we have to update PLISTs for about 20+ ports as
a result of this version update. Hopefully future updates of py-sphinx
won't be quite as involved.

ok sthen@
2020-12-10 02:20:29 +00:00
sthen
e79392b3e4 MODCMAKE_PORT_BUILD=yes must be set in CONFIGURE_ENV.
Keeping it in MAKE_ENV as well in case something runs a second copy
of cmake during the build.
2020-11-23 18:35:03 +00:00
rsadowski
4d03b75f56 Cleanup: tabs and spaces 2020-11-23 09:58:35 +00:00
rsadowski
a42b0ebe16 Set MODCMAKE_PORT_BUILD environment variable in the cmake module.
This disable cmake's default optimization flags and gives the control over the
ports tree.

OK sthen@
2020-11-23 07:33:20 +00:00
rsadowski
61d46f0d67 Fix comment and DEBUG_PACKAGES detection
Use DEFINE ENV{} instead $ENV cmake syntax and fix typo in comment
2020-11-23 07:25:15 +00:00