[packages/crossmingw32-pangomm] - adjusted gmmproc hacks to work with rpm.org

qboosh qboosh at pld-linux.org
Sat May 22 15:24:46 CEST 2021


commit 41b93a03e92a7ae648030eba5ab2863e132243fa
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat May 22 15:27:09 2021 +0200

    - adjusted gmmproc hacks to work with rpm.org

 crossmingw32-pangomm.spec | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/crossmingw32-pangomm.spec b/crossmingw32-pangomm.spec
index 9a58d27..2464582 100644
--- a/crossmingw32-pangomm.spec
+++ b/crossmingw32-pangomm.spec
@@ -97,8 +97,9 @@ Biblioteka DLL pangomm dla Windows.
 
 %build
 # use host gmmprocdir (before changing PKG_CONFIG_LIBDIR to cross target)
-GMMPROC_DIR=$(pkg-config --variable=gmmprocdir glibmm-2.4)
-export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig:%{_npkgconfigdir}
+# note: rpm.org sets PKG_CONFIG_PATH according to _libdir and _datadir
+GMMPROC_DIR=$(PKG_CONFIG_PATH=%{_sysprefix}/%{_lib}/pkgconfig pkg-config --variable=gmmprocdir glibmm-2.4)
+export PKG_CONFIG_PATH=%{_prefix}/lib/pkgconfig:%{_npkgconfigdir}
 mm-common-prepare --copy --force
 %{__libtoolize}
 %{__aclocal} -I build
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/crossmingw32-pangomm.git/commitdiff/41b93a03e92a7ae648030eba5ab2863e132243fa



More information about the pld-cvs-commit mailing list