Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MDEV-23538: Rename mariadb.pc to mariadb-embedded-server.pc to avoid confusion #1800

Open
wants to merge 1 commit into
base: 11.4
Choose a base branch
from
Open

MDEV-23538: Rename mariadb.pc to mariadb-embedded-server.pc to avoid confusion #1800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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)
  • Loading branch information
@ottok
ottok committed May 5, 2024
commit cb41451ab487794782388f683e949d2c2ec0b2e6
1 change: 1 addition & 0 deletions debian/libmariadb-dev.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,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
3 changes: 2 additions & 1 deletion debian/libmariadbd-dev.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ 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
usr/lib/*/pkgconfig/mariadb-embedded-server.pc
11 changes: 11 additions & 0 deletions debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,17 @@ endif
# Rename and install AppArmor profile
install -D -m 644 debian/apparmor-profile $(TMP)/etc/apparmor.d/usr.sbin.mariadbd

# Rename mariadb.pc as mariadb-embedded-server.pc as to be more descriptive
mv -v $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/mariadb.pc $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/mariadb-embedded-server.pc
# Keep libmariadbd.pc around for backwards compatibility as all Debian users
# have had it for embedded server since April 2021
ln -sf mariadb-embedded-server.pc $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/libmariadbd.pc

# Rename libmariadb.pc as mariadb.pc as it better fits the client library,
# and keep old libmariadb.pc as symlink for backwards compatibility
mv -v $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/libmariadb.pc $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/mariadb.pc
ln -sf mariadb.pc $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/libmariadb.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