From b45749cfe114186fec0c64064b11ade20666c06b Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sun, 30 Jan 2022 03:53:39 +0000 Subject: [PATCH 1/6] zlib: set PKGCONFIG directories for both host and target to lib/pkgconfig --- packages/compress/zlib/package.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/compress/zlib/package.mk b/packages/compress/zlib/package.mk index f39e64dee8..971b389b45 100644 --- a/packages/compress/zlib/package.mk +++ b/packages/compress/zlib/package.mk @@ -11,3 +11,7 @@ PKG_DEPENDS_HOST="cmake:host" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A general purpose (ZIP) data compression library." PKG_TOOLCHAIN="cmake-make" + +PKG_CMAKE_OPTS_HOST="-DINSTALL_PKGCONFIG_DIR=${TOOLCHAIN}/lib/pkgconfig" + +PKG_CMAKE_OPTS_TARGET="-DINSTALL_PKGCONFIG_DIR=/usr/lib/pkgconfig" From 423183d431628e393ebd6d46c9249301e8169802 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sun, 30 Jan 2022 11:50:41 +0000 Subject: [PATCH 2/6] systemd: set PKGCONFIG directory to /usr/lib/pkgconfig --- packages/sysutils/systemd/package.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/sysutils/systemd/package.mk b/packages/sysutils/systemd/package.mk index 0b117d7929..c825fd716e 100644 --- a/packages/sysutils/systemd/package.mk +++ b/packages/sysutils/systemd/package.mk @@ -100,6 +100,7 @@ PKG_MESON_OPTS_TARGET="--libdir=/usr/lib \ -Dmount-path=/usr/bin/mount \ -Dumount-path=/usr/bin/umount \ -Ddebug-tty=${DEBUG_TTY} \ + -Dpkgconfigdatadir=/usr/lib/pkgconfig \ -Dversion-tag=${PKG_VERSION}" pre_configure_target() { From ebd0c203b88116c7a553278f41aa0ef3e76f6ba7 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sun, 30 Jan 2022 12:06:48 +0000 Subject: [PATCH 3/6] xkeyboard-config: set PKGCONFIG directory to /usr/lib/pkgconfig --- packages/x11/data/xkeyboard-config/package.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/x11/data/xkeyboard-config/package.mk b/packages/x11/data/xkeyboard-config/package.mk index 46752d53f1..aec5c7c580 100644 --- a/packages/x11/data/xkeyboard-config/package.mk +++ b/packages/x11/data/xkeyboard-config/package.mk @@ -24,6 +24,7 @@ pre_configure_target() { --disable-runtime-deps \ --enable-nls \ --disable-rpath \ + --datadir=/usr/lib \ --with-gnu-ld" if [ "${DISPLAYSERVER}" = "x11" ]; then From 65e42b9492e8050c3b02ac4e7459154b7b32a534 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sun, 30 Jan 2022 12:15:52 +0000 Subject: [PATCH 4/6] util-macros: set PKGCONFIG directory to /usr/lib/pkgconfig util-macros does not allow pkgconfigdir to be set independently of datadir. If datadir is changed to /usr/lib instead of /usr/share - then the aclocal files are also placed into /usr/lib - causing an error when aclocal and its subordinate programs are run. --- packages/x11/util/util-macros/package.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/x11/util/util-macros/package.mk b/packages/x11/util/util-macros/package.mk index 5b6420fa62..185f53b8ca 100644 --- a/packages/x11/util/util-macros/package.mk +++ b/packages/x11/util/util-macros/package.mk @@ -10,6 +10,11 @@ PKG_URL="http://xorg.freedesktop.org/archive/individual/util/${PKG_NAME}-${PKG_V PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="X.org autoconf utilities such as M4 macros." +pre_configure_target() { + sed -i 's|^pkgconfigdir = .*|pkgconfigdir = /usr/lib/pkgconfig|' ${PKG_BUILD}/Makefile.am + sed -i 's|^pkgconfigdir = .*|pkgconfigdir = /usr/lib/pkgconfig|' ${PKG_BUILD}/Makefile.in +} + post_makeinstall_target() { rm -rf ${INSTALL}/usr } From 2d3a2e620e8d91724b0adef3c45d1efca3a057dd Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sun, 6 Feb 2022 06:50:48 +0000 Subject: [PATCH 5/6] xtrans: set PKGCONFIG directory to /usr/lib/pkgconfig xtrans does not allow pkgconfigdir to be set independently of datadir. If datadir is changed to /usr/lib instead of /usr/share - then the aclocal files are also placed into /usr/lib - causing an error when aclocal and its subordinate programs are run. --- packages/x11/lib/xtrans/package.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/x11/lib/xtrans/package.mk b/packages/x11/lib/xtrans/package.mk index a5c43997bb..4b825df4d8 100644 --- a/packages/x11/lib/xtrans/package.mk +++ b/packages/x11/lib/xtrans/package.mk @@ -13,6 +13,11 @@ PKG_LONGDESC="Abstract network code for X." PKG_CONFIGURE_OPTS_TARGET="--without-xmlto" +pre_configure_target() { + sed -i 's|^pkgconfigdir = .*|pkgconfigdir = /usr/lib/pkgconfig|' ${PKG_BUILD}/Makefile.am + sed -i 's|^pkgconfigdir = .*|pkgconfigdir = /usr/lib/pkgconfig|' ${PKG_BUILD}/Makefile.in +} + post_makeinstall_target() { mkdir -p ${SYSROOT_PREFIX}/usr/lib/pkgconfig cp xtrans.pc ${SYSROOT_PREFIX}/usr/lib/pkgconfig From 67bdf48b4895e5e7289ad6cfa5dc568b20cae907 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sun, 6 Feb 2022 07:45:07 +0000 Subject: [PATCH 6/6] xorgproto: set PKGCONFIG directory to /usr/lib/pkgconfig --- packages/x11/proto/xorgproto/package.mk | 3 +- .../patches/xorgproto-0001-pkgconfig.patch | 48 +++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 packages/x11/proto/xorgproto/patches/xorgproto-0001-pkgconfig.patch diff --git a/packages/x11/proto/xorgproto/package.mk b/packages/x11/proto/xorgproto/package.mk index 686953477d..2f9ce8d041 100644 --- a/packages/x11/proto/xorgproto/package.mk +++ b/packages/x11/proto/xorgproto/package.mk @@ -11,4 +11,5 @@ PKG_DEPENDS_TARGET="toolchain util-macros" PKG_LONGDESC="combined X.Org X11 Protocol headers" PKG_TOOLCHAIN="meson" -PKG_MESON_OPTS_TARGET="-Dlegacy=false" +PKG_MESON_OPTS_TARGET="-Dlegacy=false \ + -Dpkgconfigdatadir=/usr/lib/pkgconfig" diff --git a/packages/x11/proto/xorgproto/patches/xorgproto-0001-pkgconfig.patch b/packages/x11/proto/xorgproto/patches/xorgproto-0001-pkgconfig.patch new file mode 100644 index 0000000000..7e86b727c9 --- /dev/null +++ b/packages/x11/proto/xorgproto/patches/xorgproto-0001-pkgconfig.patch @@ -0,0 +1,48 @@ +commit 989e25ecc4dc75c842f13b2b6457df9a3533ac72 +Author: heitbaum +Date: Sun Feb 6 07:56:38 2022 +0000 + + meson: enable override of arch-independent pkg-config + + Add meson_option pkgconfigdatadir to set the directory for + arch-independent pkg-config files. + + Signed-off-by: Rudi Heitbaum + +diff --git a/meson.build b/meson.build +index 5c15cc9..bb9c7c1 100644 +--- a/meson.build ++++ b/meson.build +@@ -57,12 +57,14 @@ pc_data = configuration_data() + pc_data.set('prefix', get_option('prefix')) + # meson does not allow installing the includedir outside of the prefix + pc_data.set('includedir', '${prefix}/' + get_option('includedir')) ++# Dirs of external packages ++pkgconfigdatadir = get_option('pkgconfigdatadir') != '' ? get_option('pkgconfigdatadir') : get_option('datadir') / 'pkgconfig' + + foreach pc : pcs + configure_file( + input : pc + '.pc.in', + output : pc + '.pc', +- install_dir : get_option('datadir') + '/pkgconfig', ++ install_dir : pkgconfigdatadir, + configuration : pc_data, + ) + endforeach +@@ -100,7 +102,7 @@ if get_option('legacy') == true + configure_file( + input : pc + '.pc.in', + output : pc + '.pc', +- install_dir : get_option('datadir') + '/pkgconfig', ++ install_dir : pkgconfigdatadir, + configuration : pc_data, + ) + endforeach +diff --git a/meson_options.txt b/meson_options.txt +index 757cd72..4c80f32 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1 +1,3 @@ + option('legacy', type: 'boolean', value: false) ++option('pkgconfigdatadir', type : 'string', value : '', ++ description : 'directory for arch-independent pkg-config files')