Commit Graph

48 Commits

Author SHA256 Message Date
8dd7e8222f Accepting request 1140010 from home:StefanBruens:branches:devel:tools:building
See https://build.opensuse.org/request/show/1140009

- Revert the linker flags revert. Instead of increasing differences
  between SLE/Leap and Tumbleweed and risking silent breakage of
  dozens of packages due to underlinking, fix the one failing
  package.

OBS-URL: https://build.opensuse.org/request/show/1140010
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=577
2024-04-08 07:54:21 +00:00
bd0a74fa85 Accepting request 1139746 from home:lnussel:branches:devel:tools:building
- Revert "-Wl,--no-undefined" as it still breaks packages (boo#1218620)

OBS-URL: https://build.opensuse.org/request/show/1139746
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=567
2024-01-19 09:12:43 +00:00
00a1d89f7e Accepting request 1139691 from home:Thaodan:branches:devel:tools:building
- macros: Set some more variables notable %{_docdir} so that GNUInstallDirs
  works fully on openSUSE. Packages using CMAKE_INSTALL_DOCDIR fail otherwise.

OBS-URL: https://build.opensuse.org/request/show/1139691
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=566
2024-01-18 12:22:02 +00:00
2ce911feda Accepting request 1135308 from home:StefanBruens:branches:devel:tools:building
- Re-add "-Wl,--no-undefined" linker flags for executables and
  regular shared libraries. Shared library targets which are used
  as plugins/modules should use `add_library(... MODULE ...), which
  uses the "CMAKE_MODULE_LINKER_FLAGS".

OBS-URL: https://build.opensuse.org/request/show/1135308
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=561
2023-12-29 08:49:37 +00:00
674068c525 Accepting request 1124704 from home:dimstar:Factory
Revert that cmake macro stuff that has been causing grieph since August

Once a proper solution is found, things like this can be re-attempted,
but for now we need a solution to move forward with newer cmake versions
for zlib 1.3 compatibility

OBS-URL: https://build.opensuse.org/request/show/1124704
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=552
2023-11-11 16:07:56 +00:00
92274bd9cc Accepting request 1119169 from home:jengelh:branches:devel:tools:building
- Stick -DNDEBUG back into CMAKE_C_FLAGS. Can't find a spontaneous
  resolution for projects relying on its presence.

OBS-URL: https://build.opensuse.org/request/show/1119169
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=551
2023-10-26 06:40:59 +00:00
f149f52acc Accepting request 1104229 from home:jengelh:branches:devel:tools:building
- Make %cmake_build insert RELWITHDEBINFO CFLAGS as well to avoid
  projects overriding our %optflags with some cmake default.

OBS-URL: https://build.opensuse.org/request/show/1104229
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=547
2023-08-17 02:09:25 +00:00
51ab3cbdc5 Accepting request 1085362 from home:Pharaoh_Atem:branches:devel:tools:building
- macros: Drop "-Wl,--no-undefined" as it breaks packages that
  build plugins

OBS-URL: https://build.opensuse.org/request/show/1085362
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=530
2023-05-08 08:37:21 +00:00
02a9498f8f Accepting request 1082125 from home:gmbr3:Active
- macros: Re-add old setup on top of new - some applications still
  use the old version

OBS-URL: https://build.opensuse.org/request/show/1082125
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=528
2023-04-24 09:18:48 +00:00
bbc9c7d7f1 Accepting request 1080965 from home:gmbr3:Active
- macros: substitute exactly once otherwise some non default values
  won't work

OBS-URL: https://build.opensuse.org/request/show/1080965
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=527
2023-04-21 12:32:35 +00:00
04ff4295d9 Accepting request 1079125 from home:gmbr3:Active
- macros: Convert to GNUInstallDirs
  * some of the old values such as SYSCONF_INSTALL_PATH aren't
    used anymore
  * RUNSTATEDIR and SHAREDSTATEDIR weren't set and the defaults
    are different to us
  * SHAREDSTATEDIR isn't under /usr so isn't relative

OBS-URL: https://build.opensuse.org/request/show/1079125
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=526
2023-04-13 11:28:17 +00:00
e88273a269 Accepting request 986334 from home:cgiboudeaux:branches:devel:tools:building
- Fix the %%cmake macro which tried to run sed on 'CMakeLists.txt'
  without making sure it's not a folder.

Found while fixing the liboqs package which has a folder named CMakeLists.txt

OBS-URL: https://build.opensuse.org/request/show/986334
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=494
2022-07-03 12:07:34 +00:00
e1450897b2 Accepting request 979615 from home:jengelh:branches:devel:tools:building
- Edit cmake.macros: Stop injecting -DNDEBUG at the end of
  CFLAGS. It's impossible to override by re-setting CFLAGS, and
  if it were really wanted globally, it should be in %optflags
  instead.

OBS-URL: https://build.opensuse.org/request/show/979615
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=491
2022-06-04 08:14:02 +00:00
47fab54a20 Accepting request 917570 from home:mlin7442:branches:devel:tools:building
fix a typo in the default macros, bsc#1190302

OBS-URL: https://build.opensuse.org/request/show/917570
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=472
2021-09-10 10:53:10 +00:00
cd1eb0f4c9 - reapply this change:
* Fix setting CMAKE_INSTALL_LIBDIR in cmake macro
  * This is a relative path, see `cmake --help-module GNUInstallDirs`
  see also
  https://gitlab.kitware.com/cmake/cmake/-/issues/20250
  https://github.com/arvidn/libtorrent/issues/5125#issuecomment-691559244

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=427
2020-09-14 10:31:04 +00:00
Martin Pluskal
7cb60c14ca Accepting request 811375 from home:simotek:cmake:test
- DCMAKE_MODULES_INSTALL_DIR should be %{_libdir}/cmake/%{name}
- Set CMAKE_INSTALL_LIBEXECDIR=%{_libexecdir}
- Use -DCMAKE_SKIP_INSTALL_RPATHS:BOOL=ON instead of completely
  removing rpaths. boo#1172331

OBS-URL: https://build.opensuse.org/request/show/811375
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=414
2020-06-04 14:19:09 +00:00
Martin Pluskal
41752cc024 Accepting request 788510 from home:simotek:branches:devel:tools:building
- Fix mistake in previous change.

OBS-URL: https://build.opensuse.org/request/show/788510
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=404
2020-03-26 14:08:17 +00:00
Martin Pluskal
51d9cc63af Accepting request 788373 from home:simotek:branches:devel:tools:building
- Many Leap packages don't build without -DCMAKE_SKIP_RPATH:BOOL=ON
  so leave this change to the next major version of Leap / SLE

OBS-URL: https://build.opensuse.org/request/show/788373
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=403
2020-03-26 08:02:45 +00:00
ec7529e107 Accepting request 773189 from home:StefanBruens:branches:devel:tools:building
- Revert LIBDIR change in macros - it is inconsistent (all other
  INSTALL_<dir>s use absolute paths), unneeded (paths may be
  absolute or relative), and breaks a number of packages.
- Update minimum libarchive version, >= 3.3.3.
- Do not flag macros as config file.
- Adjust constraints (7G disk space is required, independent
  of architecture).

OBS-URL: https://build.opensuse.org/request/show/773189
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=398
2020-02-10 21:08:19 +00:00
979dc5d980 Accepting request 770787 from home:simotek:branches:devel:tools:building
Add missing bit of the previous revert

OBS-URL: https://build.opensuse.org/request/show/770787
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=397
2020-02-07 07:58:09 +00:00
862cd7303e Accepting request 770783 from home:simotek:branches:devel:tools:building
- Revert "use cmake generics in marcos.cmake" it breaks many
  cases in stagings.

OBS-URL: https://build.opensuse.org/request/show/770783
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=396
2020-02-07 07:38:41 +00:00
39b578c0fa Accepting request 764183 from home:gladiac:branches:devel:tools:building
- Fix setting CMAKE_INSTALL_LIBDIR in cmake macro
  * This is a relative path, see `cmake --help-module GNUInstallDirs`
- Do NOT set -DCMAKE_SKIP_RPATH:BOOL=OFF
  * A lot of applications have private libraries in a subdirectory
    and require linking with RPATH which is totally valid.

OBS-URL: https://build.opensuse.org/request/show/764183
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=394
2020-02-05 11:59:05 +00:00
dd41aea1b6 Accepting request 764792 from home:cjunghans:branches:devel:tools:building
- use cmake generics in marcos.cmake

OBS-URL: https://build.opensuse.org/request/show/764792
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=393
2020-01-30 10:28:01 +00:00
cdec9b8b57 Accepting request 712997 from home:marxin:branches:devel:tools:building
- Remove -DCMAKE_STATIC_LINKER_FLAGS as it's supposed
  to be used by 'ar'.

OBS-URL: https://build.opensuse.org/request/show/712997
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=364
2019-07-02 15:59:24 +00:00
Martin Pluskal
a5320c7660 Accepting request 710493 from home:marxin:branches:devel:tools:building
- Make %build_ldflags conditional.

OBS-URL: https://build.opensuse.org/request/show/710493
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=362
2019-06-18 07:15:56 +00:00
Martin Pluskal
c65c2dc33e Accepting request 710337 from home:marxin:branches:devel:tools:building
- Add -DCMAKE_STATIC_LINKER_FLAGS.
  - Add %build_ldflags to all LINKER_FLAGS.

OBS-URL: https://build.opensuse.org/request/show/710337
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=361
2019-06-17 13:03:51 +00:00
Martin Pluskal
9cee3988cc Accepting request 684805 from home:simotek:branches:devel:tools:building
- Allow %cmake_build to handle parameters

OBS-URL: https://build.opensuse.org/request/show/684805
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=355
2019-03-14 14:07:22 +00:00
451f652e0f Accepting request 676950 from home:Andreas_Schwab:Factory
- Pass arguments of %ctest macro down to ctest

OBS-URL: https://build.opensuse.org/request/show/676950
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=350
2019-02-18 08:54:21 +00:00
015ccf822f Accepting request 669487 from home:scarabeus_iv:branches:devel:tools:building
- Rename %make_jobs to %cmake_build to inline with other lang macros
  like meson, also since we are not just using make it is less
  confusing this way. Keep the %make_jobs as compat wrapper with
  warning for now

OBS-URL: https://build.opensuse.org/request/show/669487
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=345
2019-01-29 10:09:31 +00:00
Martin Pluskal
5032e1818c Accepting request 561593 from home:scarabeus_iv:branches:devel:tools:building
- Do not add no-undefined on module linking, should reduce us a bit
  of redefining as most modules dynamically load stuff

OBS-URL: https://build.opensuse.org/request/show/561593
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=309
2018-01-04 12:34:02 +00:00
Martin Pluskal
43f23f4c82 Accepting request 430013 from home:boombatower:branches:devel:tools:building
Utilize $OLDPWD to make __sourcedir always relative to root regardless of the __builddir.

OBS-URL: https://build.opensuse.org/request/show/430013
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=269
2016-09-26 11:02:24 +00:00
Martin Pluskal
d5bc660fb8 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=266 2016-09-13 12:09:16 +00:00
Martin Pluskal
b78775909d OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=265 2016-09-13 12:00:34 +00:00
Martin Pluskal
36f65f7882 Accepting request 426207 from home:boombatower:graphics
Update %cmake macro to provide %__sourcedir parameter.

OBS-URL: https://build.opensuse.org/request/show/426207
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=264
2016-09-10 06:48:32 +00:00
Martin Pluskal
6d9b1150cb Accepting request 423027 from home:scarabeus_iv:branches:devel:tools:building
- Remove wrong FIXME from spec
- Require qt5 gui everywhere as it on all supported platforms

- Respect CFLAGS while bootstraping
- Remove wrong FIXME from the spec
- Add relwithdebinfo as default target to ease living of sci packages
- Add possibility to switch between ninja and cmake by defining
  %__builder ninja prior %cmake call bnc#995752

OBS-URL: https://build.opensuse.org/request/show/423027
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=262
2016-08-26 10:34:52 +00:00
Martin Pluskal
cc2d407a76 - Remove PIE from macro
- Remove PIE from macros

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=255
2016-07-11 17:29:16 +00:00
Martin Pluskal
ad02e4d23b Accepting request 404888 from home:pluskalm:branches:devel:tools:building
Lets try PIE (as already discussed with scarabeus)

OBS-URL: https://build.opensuse.org/request/show/404888
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=252
2016-06-27 11:29:40 +00:00
Martin Pluskal
9a2e27e36f Accepting request 367854 from home:scarabeus_iv:branches:devel:tools:building
- Update macros to allow redefinition of builddir not to be build
  (found 1 upstream that already has build with actually some
   distributed files)

OBS-URL: https://build.opensuse.org/request/show/367854
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=241
2016-03-08 07:29:07 +00:00
Tomáš Chvátal
9517bf9dfc - With all the cnages we dont need cmake.rules anymore, so try to
remove them completely and lets see what fails

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=234
2015-12-03 09:46:18 +00:00
Martin Pluskal
d33753251f - Revert removal of CMAKE_INSTALL_LIBDIR declaration from the
macros.

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=231
2015-11-13 09:24:59 +00:00
Tomáš Chvátal
c91d96b115 - Remove CMAKE_INSTALL_LIBDIR declaration from the macros. rh#795542
* It is unfortunate but SOME packages will now have to define it
    themselves because in some cases it is relative path while in
    others it is absolute one.

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=228
2015-09-21 08:41:45 +00:00
Tomáš Chvátal
303c3d7aff - Also pass -Wl,-z,now lets see if that is passable :)
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=170
2014-08-20 10:46:19 +00:00
Tomáš Chvátal
b391c89a1a Accepting request 245174 from KDE:Unstable:Frameworks
- Import some cmake handing from kf5- and kde4- filesystem to macros:
   * Simplify debug build handling in macros. Whether debug is on or off is known to optflags
   * Don't build in release mode, that cramps optimization flags; instead pass wanted flags directly
   * Pass -Wl,--as-needed -Wl,--no-undefined to linker, to avoid unneeded libs, and to disallow undefined symbols
   * Add a %make_jobs macro with verbose argument 
   * Simplify %cmake_install invocation

OBS-URL: https://build.opensuse.org/request/show/245174
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=169
2014-08-20 10:42:37 +00:00
Tomáš Chvátal
b5260f393c - Mark macros as %config
- use curl-devel to build with as the internal libcurl is broken
  with https bnc#892256
- Run tests to avoid such bugs in future
- Provide %ctest macro for testing to avoid people having to
  remember all the arguments

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=168
2014-08-18 08:21:42 +00:00
Tomáš Chvátal
19a8bafd89 Accepting request 239256 from home:sleep_walker:branches:devel:tools:building
- reduce number of sed calls in %cmake RPM macro

OBS-URL: https://build.opensuse.org/request/show/239256
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=161
2014-07-02 08:57:25 +00:00
Ismail Dönmez
0d6b7b1b22 Accepting request 205978 from home:bmanojlovic:branches:devel:tools:building
After discussion with scarabeus, we have agreed to use %_datadir macro even if user change it (and possibly fail this macro)

OBS-URL: https://build.opensuse.org/request/show/205978
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=129
2013-11-06 18:29:08 +00:00
Ismail Dönmez
9fa8fb7526 Accepting request 205960 from home:bmanojlovic:branches:devel:tools:building
- updated cmake.macros to include installation path for packages cmake modules

OBS-URL: https://build.opensuse.org/request/show/205960
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=128
2013-11-06 12:55:12 +00:00
Ismail Dönmez
1b90ba4d09 Accepting request 195426 from home:scarabeus_iv
This change is followup for the discussion at ml:
http://lists.opensuse.org/opensuse-factory/2013-08/msg00174.html

I would propose proceed by the schedule I mentioned there.
Most of this stuff is taken from what I did in Gentoo cmake system.


- One more backslash here.

- Backshlashes were missing in macros.

- Add opensuse_rules.cmake to set the default compiler and linker
  opts. Tweak a bit the macro to not let upstreams twerk with the
  cmake files too much.

- Provide macros.cmake which contains %cmake macro to reduce
  mess in the spec files.

OBS-URL: https://build.opensuse.org/request/show/195426
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=122
2013-08-16 09:35:44 +00:00