From 85f853a90373c786b20c67d30862cb0002598c2d Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 5 Nov 2022 22:05:10 +0100 Subject: [PATCH 1/4] Revert "xorgproto: set PKGCONFIG directory to /usr/lib/pkgconfig" This reverts commit 67bdf48b4895e5e7289ad6cfa5dc568b20cae907. --- packages/x11/proto/xorgproto/package.mk | 3 +- .../patches/xorgproto-0001-pkgconfig.patch | 48 ------------------- 2 files changed, 1 insertion(+), 50 deletions(-) delete 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 8d1299e5fb..514512e4ed 100644 --- a/packages/x11/proto/xorgproto/package.mk +++ b/packages/x11/proto/xorgproto/package.mk @@ -10,5 +10,4 @@ PKG_URL="https://xorg.freedesktop.org/archive/individual/proto/${PKG_NAME}-${PKG PKG_DEPENDS_TARGET="toolchain util-macros" PKG_LONGDESC="combined X.Org X11 Protocol headers" -PKG_MESON_OPTS_TARGET="-Dlegacy=false \ - -Dpkgconfigdatadir=/usr/lib/pkgconfig" +PKG_MESON_OPTS_TARGET="-Dlegacy=false" diff --git a/packages/x11/proto/xorgproto/patches/xorgproto-0001-pkgconfig.patch b/packages/x11/proto/xorgproto/patches/xorgproto-0001-pkgconfig.patch deleted file mode 100644 index 7e86b727c9..0000000000 --- a/packages/x11/proto/xorgproto/patches/xorgproto-0001-pkgconfig.patch +++ /dev/null @@ -1,48 +0,0 @@ -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') From ac613de3a05709f0fc2d71a9528c0be17c76a269 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 5 Nov 2022 22:05:19 +0100 Subject: [PATCH 2/4] Revert "xtrans: set PKGCONFIG directory to /usr/lib/pkgconfig" This reverts commit 2d3a2e620e8d91724b0adef3c45d1efca3a057dd. --- packages/x11/lib/xtrans/package.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/x11/lib/xtrans/package.mk b/packages/x11/lib/xtrans/package.mk index 4b825df4d8..a5c43997bb 100644 --- a/packages/x11/lib/xtrans/package.mk +++ b/packages/x11/lib/xtrans/package.mk @@ -13,11 +13,6 @@ 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 0ebee2e0cb22fdd826f43e37f3d4cde192be6e27 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 5 Nov 2022 22:05:27 +0100 Subject: [PATCH 3/4] Revert "util-macros: set PKGCONFIG directory to /usr/lib/pkgconfig" This reverts commit 65e42b9492e8050c3b02ac4e7459154b7b32a534. --- packages/x11/util/util-macros/package.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/x11/util/util-macros/package.mk b/packages/x11/util/util-macros/package.mk index 185f53b8ca..5b6420fa62 100644 --- a/packages/x11/util/util-macros/package.mk +++ b/packages/x11/util/util-macros/package.mk @@ -10,11 +10,6 @@ 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 d68a4b874b376ecf9943ce17fcfa1f0c28434c84 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 5 Nov 2022 22:05:37 +0100 Subject: [PATCH 4/4] Revert "systemd: set PKGCONFIG directory to /usr/lib/pkgconfig" This reverts commit 423183d431628e393ebd6d46c9249301e8169802. --- packages/sysutils/systemd/package.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/sysutils/systemd/package.mk b/packages/sysutils/systemd/package.mk index b5e8d94706..63b1bf2165 100644 --- a/packages/sysutils/systemd/package.mk +++ b/packages/sysutils/systemd/package.mk @@ -100,7 +100,6 @@ 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() {