rpm/mariadb
SHA256
1
0
Fork 0
forked from pool/mariadb
Code Pull Requests Activity

Accepting request 452618 from home:dimstar:Factory

Browse Source 
Fixup the build dependencies. Requiring systemd/systemd-devel is almost
always wrong as it takes you out of the order in the build chain. In
case of mariadb it even introduces a build cycle.

Hence, update the BuildRequires to match what the build system (cmake) actually
is looking for. There is not a single place it tries to find systemd.pc (which
seems what caused your entire confusion - it happened to work when systemd.pc
was in the -devel package, but broke when this was moved out).

with this diff, the build log contains correctly:
[  185s] -- Checking for one of the modules 'libsystemd;libsystemd-daemon'
[  185s] -- Performing Test HAVE_SYSTEMD
[  185s] -- Performing Test HAVE_SYSTEMD - Success
[  185s] -- Looking for include file systemd/sd-daemon.h
[  185s] -- Looking for include file systemd/sd-daemon.h - found
[  186s] -- Systemd features enabled

Just as one would expect to find there.

OBS-URL: https://build.opensuse.org/request/show/452618
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=187
This commit is contained in:
Martin Pluskal 2017-01-26 12:05:02 +00:00 committed by Git OBS Bridge
parent e12598a30f
commit c692fa4a36
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mariadb.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jan 26 10:54:15 UTC 2017 - dimstar@opensuse.org
- Replace systemd and systemd-devel BuildRequires with
pkgconfig(libsystemd), which matches what the build system is
actually looking for.
-------------------------------------------------------------------
Tue Dec 27 03:19:07 UTC 2016 - 13ilya@gmail.com

6
mariadb.spec
View File

@ -99,10 +99,8 @@ BuildRequires: sqlite
BuildRequires: tcpd-devel
BuildRequires: time
BuildRequires: zlib-devel
# pkgconfig(systemd) on most versions is in systemd main pkg, remove
# after oldest supported is Leap 43
BuildRequires: systemd
BuildRequires: systemd-devel
# Do not ever switch away from pkgconfig(libsystemd) BuildRequires; systemd/systemd-devel causes build cycles
BuildRequires: pkgconfig(libsystemd)
# required by rcmysql
Requires: %{name}-client
Requires: %{name}-errormessages = %{version}