Attachment 8975 Details for Bug 20333 – pkg-config patch to add directories to --with-pc-path

[patch] pkg-config patch to add directories to --with-pc-path

pkg-config-add-directories-to-pc-path-and-create-directories-as-needed.patch (text/plain), 1.51 KB, created by Stephen Brokenshire on 2017-02-22 17:19:01 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Stephen Brokenshire

Created: 2017-02-22 17:19:01 CET

Size: 1.51 KB

patch

obsolete

>--- /home/kiri/rpmbuild/SPECS/pkgconfig.spec	2016-05-09 18:26:21.000000000 +0100
>+++ pkgconfig.spec	2017-02-22 15:20:44.000000000 +0000
>@@ -26,7 +26,7 @@
> %build
> %configure2_5x \
> %if "%{_lib}" != "lib"
>-	--with-pc-path="%{_libdir}/pkgconfig:%{_datadir}/pkgconfig:%{_libdir}/pkgconfig/32" \
>+	--with-pc-path="%{_prefix}/local/%{_lib}/pkgconfig:%{_prefix}/local/share/pkgconfig:%{_prefix}/local/%{_lib}/pkgconfig/32:%{_libdir}/pkgconfig:%{_datadir}/pkgconfig:%{_libdir}/pkgconfig/32" \
> %endif
> 	--with-internal-glib=no
> %make
>@@ -37,12 +37,16 @@
> rm -fr %{buildroot}%{_datadir}/doc
> 
> mkdir -p %{buildroot}%{_libdir}/pkgconfig
>+mkdir -p %{buildroot}%{_prefix}/local/%{_lib}/pkgconfig
>+mkdir -p %{buildroot}%{_prefix}/local/share
>+mkdir -p %{buildroot}%{_datadir}/pkgconfig
> %if "%{_lib}" != "lib"
>-mkdir -p %{buildroot}%{_prefix}/lib/pkgconfig
>+mkdir -p %{buildroot}%{_prefix}/%{_lib}/pkgconfig
>+mkdir -p %{buildroot}%{_prefix}/local/%{_lib}/pkgconfig
> ln -s ../../lib/pkgconfig %{buildroot}%{_libdir}/pkgconfig/32
>+ln -s ../../lib/pkgconfig %{buildroot}%{_prefix}/local/%{_lib}/pkgconfig/32
> %endif
>-
>-mkdir -p %{buildroot}%{_datadir}/pkgconfig
>+ln -s ../%{_lib}/pkgconfig %{buildroot}%{_prefix}/local/share/pkgconfig
> 
> %check
> %make check
>@@ -54,8 +58,10 @@
> %dir %{_libdir}/pkgconfig
> %{_datadir}/pkgconfig
> %if "%{_lib}" != "lib"
>-%{_prefix}/lib/pkgconfig
>+%{_prefix}/local/%{_lib}/pkgconfig
> %{_libdir}/pkgconfig/32
>+%{_prefix}/local/%{_lib}/pkgconfig/32
>+%{_prefix}/local/share/pkgconfig
> %endif
> %{_datadir}/aclocal/*
> %{_mandir}/man1/*

--- /home/kiri/rpmbuild/SPECS/pkgconfig.spec	2016-05-09 18:26:21.000000000 +0100
+++ pkgconfig.spec	2017-02-22 15:20:44.000000000 +0000
@@ -26,7 +26,7 @@
 %build
 %configure2_5x \
 %if "%{_lib}" != "lib"
-	--with-pc-path="%{_libdir}/pkgconfig:%{_datadir}/pkgconfig:%{_libdir}/pkgconfig/32" \
+	--with-pc-path="%{_prefix}/local/%{_lib}/pkgconfig:%{_prefix}/local/share/pkgconfig:%{_prefix}/local/%{_lib}/pkgconfig/32:%{_libdir}/pkgconfig:%{_datadir}/pkgconfig:%{_libdir}/pkgconfig/32" \
 %endif
 	--with-internal-glib=no
 %make
@@ -37,12 +37,16 @@
 rm -fr %{buildroot}%{_datadir}/doc
 
 mkdir -p %{buildroot}%{_libdir}/pkgconfig
+mkdir -p %{buildroot}%{_prefix}/local/%{_lib}/pkgconfig
+mkdir -p %{buildroot}%{_prefix}/local/share
+mkdir -p %{buildroot}%{_datadir}/pkgconfig
 %if "%{_lib}" != "lib"
-mkdir -p %{buildroot}%{_prefix}/lib/pkgconfig
+mkdir -p %{buildroot}%{_prefix}/%{_lib}/pkgconfig
+mkdir -p %{buildroot}%{_prefix}/local/%{_lib}/pkgconfig
 ln -s ../../lib/pkgconfig %{buildroot}%{_libdir}/pkgconfig/32
+ln -s ../../lib/pkgconfig %{buildroot}%{_prefix}/local/%{_lib}/pkgconfig/32
 %endif
-
-mkdir -p %{buildroot}%{_datadir}/pkgconfig
+ln -s ../%{_lib}/pkgconfig %{buildroot}%{_prefix}/local/share/pkgconfig
 
 %check
 %make check
@@ -54,8 +58,10 @@
 %dir %{_libdir}/pkgconfig
 %{_datadir}/pkgconfig
 %if "%{_lib}" != "lib"
-%{_prefix}/lib/pkgconfig
+%{_prefix}/local/%{_lib}/pkgconfig
 %{_libdir}/pkgconfig/32
+%{_prefix}/local/%{_lib}/pkgconfig/32
+%{_prefix}/local/share/pkgconfig
 %endif
 %{_datadir}/aclocal/*
 %{_mandir}/man1/*

Actions: View | Diff

Attachments on bug 20333: 8975