Skip to content

Commit 4b60e09

Browse files
committed
Replace build-dependency pkg-config with pkgconf
1 parent 00a41ed commit 4b60e09

9 files changed

Lines changed: 24 additions & 30 deletions

File tree

config/blobs.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ percona-xtrabackup-8.4.0-5.tar.gz:
4242
size: 432646274
4343
object_id: edf66c32-e051-4a55-561a-bd67bb8a13bb
4444
sha: sha256:fadcf27efd2a2596f689388659e2ff5c36debcc051a55974ac8bb4a83c015f57
45-
pkg-config_0.29.2.orig.tar.gz:
46-
size: 2016830
47-
object_id: ca3d829d-016e-4acd-6509-9d1766884b9d
48-
sha: sha256:6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591
45+
pkgconf-2.5.1.tar.xz:
46+
size: 328064
47+
object_id: 74152211-babf-41d2-794a-2f1abcd5f998
48+
sha: sha256:cd05c9589b9f86ecf044c10a2269822bc9eb001eced2582cfffd658b0a50c243
4949
procps-ng-4.0.5.tar.xz:
5050
size: 1517672
5151
object_id: e196e815-f7be-462d-64f0-feaac1caffe0

packages/percona-xtrabackup-8.0/packaging

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@ main() {
1010
}
1111

1212
install_build_dependencies() {
13-
tar -xf pkg-config_*.tar.gz
14-
cd pkg-config-*/
15-
./configure --prefix=/usr \
16-
--with-internal-glib \
17-
--with-pc-path=/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
13+
tar -xf pkgconf-*.tar.xz
14+
cd pkgconf-*/
15+
./configure --prefix=/usr
1816
make -j "$(nproc)" install
17+
ln -sf pkgconf /usr/bin/pkg-config
1918
cd -
2019

2120
tar -xf libaio_*.tar.xz

packages/percona-xtrabackup-8.0/spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ files:
88
- percona-xtrabackup-8.0*.tar.gz
99
- libev-*.tar.gz
1010
- libaio_*.tar.xz
11-
- pkg-config_*.tar.gz
11+
- pkgconf-*.tar.xz
1212
- procps-ng-*.tar.xz

packages/percona-xtrabackup-8.4/packaging

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@ main() {
1010
}
1111

1212
install_build_dependencies() {
13-
tar -xf pkg-config_*.tar.gz
14-
cd pkg-config-*/
15-
./configure --prefix=/usr \
16-
--with-internal-glib \
17-
--with-pc-path=/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
13+
tar -xf pkgconf-*.tar.xz
14+
cd pkgconf-*/
15+
./configure --prefix=/usr
1816
make -j "$(nproc)" install
17+
ln -sf pkgconf /usr/bin/pkg-config
1918
cd -
2019

2120
tar -xf libaio_*.tar.xz

packages/percona-xtrabackup-8.4/spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ files:
77
- libaio_*.tar.xz
88
- libev-*.tar.gz
99
- percona-xtrabackup-8.4*.tar.gz
10-
- pkg-config_*.tar.gz
10+
- pkgconf-*.tar.xz
1111
- procps-ng-*.tar.xz

packages/percona-xtradb-cluster-8.0/packaging

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,11 @@ main() {
1111
}
1212

1313
install_build_dependencies() {
14-
tar -xf pkg-config_*.tar.gz
15-
cd pkg-config-*/
16-
./configure \
17-
--prefix=/usr \
18-
--with-internal-glib \
19-
--with-pc-path=/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
14+
tar -xf pkgconf-*.tar.xz
15+
cd pkgconf-*/
16+
./configure --prefix=/usr
2017
make -j "$(nproc)" install
18+
ln -sf pkgconf /usr/bin/pkg-config
2119
cd -
2220

2321
tar -xf libaio_*.orig.tar.xz

packages/percona-xtradb-cluster-8.0/spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ files:
88
- boost_1_77_0.tar.bz2
99
- check_*.tar.gz
1010
- libaio_*.orig.tar.xz
11-
- pkg-config_*.tar.gz
11+
- pkgconf-*.tar.xz
1212
- socat-*.tar.gz

packages/percona-xtradb-cluster-8.4/packaging

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,11 @@ main() {
1111
}
1212

1313
install_build_dependencies() {
14-
tar -xf pkg-config_*.tar.gz
15-
cd pkg-config-*/
16-
./configure \
17-
--prefix=/usr \
18-
--with-internal-glib \
19-
--with-pc-path=/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
14+
tar -xf pkgconf-*.tar.xz
15+
cd pkgconf-*/
16+
./configure --prefix=/usr
2017
make -j "$(nproc)" install
18+
ln -sf pkgconf /usr/bin/pkg-config
2119
cd -
2220

2321
tar -xf libaio_*.orig.tar.xz

packages/percona-xtradb-cluster-8.4/spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ files:
88
- boost_1_77_0.tar.bz2
99
- check_*.tar.gz
1010
- libaio_*.orig.tar.xz
11-
- pkg-config_*.tar.gz
11+
- pkgconf-*.tar.xz
1212
- socat-*.tar.gz

0 commit comments

Comments
 (0)