Skip to content

Commit ddfebd4

Browse files
ottokvuvova
authored andcommitted
MDEV-23538: Rename mariadb.pc to mariadb-server-embedded.pc to avoid confusion
Change so that the client library config can be accessed using the name mariadb.pc (or libmariadb.pc). Rename old mariadb.pc to mariadb-embedded-server.pc to better indicate that the config is for the daemon build, not client. Also keep/include names with 'lib' as symlinks, as it aligns with how most of *.pc files are named in general. 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: - mariadb.pc for client (with libmariadb.pc as symlink) - mariadb-embedded-sever.pc for server (with libmariadbd.pc as symlink)
1 parent ecb7c9b commit ddfebd4

File tree

3 files changed

+14
-0
lines changed

3 files changed

+14
-0
lines changed

debian/libmariadb-dev.install

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ usr/lib/*/libmariadbclient.a
2929
usr/lib/*/libmariadbclient.so
3030
usr/lib/*/libmysqlservices.a
3131
usr/lib/*/pkgconfig/libmariadb.pc
32+
usr/lib/*/pkgconfig/mariadb.pc
3233
usr/share/aclocal/mysql.m4
3334
usr/share/man/man1/mariadb_config.1
3435
usr/share/man/man1/mysql_config.1

debian/libmariadbd-dev.install

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ usr/lib/*/libmariadbd.a
33
usr/lib/*/libmariadbd.so
44
usr/lib/*/libmysqld.a
55
usr/lib/*/libmysqld.so
6+
usr/lib/*/pkgconfig/libmariadbd.pc
7+
usr/lib/*/pkgconfig/mariadb-embedded-server.pc

debian/rules

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,17 @@ override_dh_auto_install:
161161
# Rename and install AppArmor profile
162162
install -D -m 644 debian/apparmor-profile $(TMP)/etc/apparmor.d/usr.sbin.mariadbd
163163

164+
# Rename mariadb.pc as mariadb-embedded-server.pc as to be more descriptive
165+
mv -v $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/mariadb.pc $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/mariadb-embedded-server.pc
166+
# Keep libmariadbd.pc around for backwards compatibility as all Debian users
167+
# have had it for embedded server since April 2021
168+
ln -sf mariadb-embedded-server.pc $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/libmariadbd.pc
169+
170+
# Rename libmariadb.pc as mariadb.pc as it better fits the client library,
171+
# and keep old libmariadb.pc as symlink for backwards compatibility
172+
mv -v $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/libmariadb.pc $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/mariadb.pc
173+
ln -sf mariadb.pc $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/libmariadb.pc
174+
164175
# Install libmariadbclient18 compatibility links
165176
ln -s libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadbclient.so
166177
ln -s libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadbclient.so.18

0 commit comments

Comments
 (0)