Skip to content

Commit

Permalink
MDEV-23538: Rename mariadb.pc to mariadbd.pc to avoid confusion
Browse files Browse the repository at this point in the history
Change so that the client library config can be accessed using the name
libmariadb.pc or mariadb.pc. Rename old mariadb.pc to libmariadbd.pc to
better indicate that the config is for the daemon build, not client.

Adopting the 'lib' naming also better aligns with host most *.pc files
are named.

In downstream Debian we already ship the libmariadb.pc as mariadb.pc:
https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/2f183af990fbe1cfa8c343998c7640f45f45368b

After this change we would have for the files:
- libmariadb.pc for client
- libmariadbd.pc for server
  • Loading branch information
ottok committed Mar 19, 2023
1 parent 4c355d4 commit cdf6b32
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
1 change: 1 addition & 0 deletions debian/libmariadb-dev.install
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ usr/lib/*/libmariadbclient.a
usr/lib/*/libmariadbclient.so
usr/lib/*/libmysqlservices.a
usr/lib/*/pkgconfig/libmariadb.pc
usr/lib/*/pkgconfig/mariadb.pc
usr/share/aclocal/mysql.m4
usr/share/man/man1/mariadb_config.1
usr/share/man/man1/mysql_config.1
Expand Down
2 changes: 1 addition & 1 deletion debian/libmariadbd-dev.install
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ usr/lib/*/libmariadbd.a
usr/lib/*/libmariadbd.so
usr/lib/*/libmysqld.a
usr/lib/*/libmysqld.so
usr/lib/*/pkgconfig/mariadb.pc
usr/lib/*/pkgconfig/libmariadbd.pc
7 changes: 7 additions & 0 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,13 @@ endif
# Rename and install AppArmor profile
install -D -m 644 debian/apparmor-profile $(TMP)/etc/apparmor.d/usr.sbin.mariadbd

# Rename mariadb.pc as libmariadbd.pc as it really is a file for the daemon
mv -v $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/mariadb.pc $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/libmariadbd.pc

# Install mariadb.pc as a symlink for the client library,
# use -f to override the existing server mariadb.pc file
ln -sf libmariadb.pc $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/mariadb.pc

# Install libmariadbclient18 compatibility links
ln -s libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadbclient.so
ln -s libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadbclient.so.18
Expand Down

0 comments on commit cdf6b32

Please sign in to comment.