landgraf pushed to gnatcoll (f22). "Fix libdir directory"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Mar 31 11:11:20 UTC 2015
>From 00125821aad7ea36a603735152a5b48c4dc4b038 Mon Sep 17 00:00:00 2001
From: Pavel Zhukov <landgraf at fedoraproject.org>
Date: Tue, 31 Mar 2015 13:11:13 +0200
Subject: Fix libdir directory
diff --git a/gnatcoll-2013-directories.patch b/gnatcoll-2013-directories.patch
index 660a870..4ce2cff 100644
--- a/gnatcoll-2013-directories.patch
+++ b/gnatcoll-2013-directories.patch
@@ -11,7 +11,7 @@ index 1ddb6cd..9813d12 100644
for Source_List_File use "gnatcoll/" & Project'Library_Name & ".lgpr";
for Library_Kind use GnatColl_Kind;
- for Library_Dir use Libdir;
-+ for Library_Dir use Directories.Libdir & "/gnatcoll/";
++ for Library_Dir use Directories.Libdir & "/gnatcoll/" & Project'Library_Kind;
for Library_Version use
"lib" & Project'Library_Name & So_Ext & "." & Version;
@@ -28,7 +28,7 @@ index 3d4b3e4..610a45a 100644
for Source_List_File use "gnatcoll/" & Project'Library_Name & ".lgpr";
for Library_Kind use GnatColl_Kind;
- for Library_Dir use Libdir;
-+ for Library_Dir use Directories.Libdir & "/gnatcoll/";
++ for Library_Dir use Directories.Libdir & "/gnatcoll/" & Project'Library_Kind;
for Library_Version use
"lib" & Project'Library_Name & So_Ext & "." & Version;
@@ -47,7 +47,7 @@ index 28b0c2d..e23f52f 100644
for Source_List_File use "gnatcoll/" & Project'Library_Name & ".lgpr";
for Library_Kind use GnatColl.GnatColl_Kind;
- for Library_Dir use "../gnatcoll/" & Project'Library_Kind;
-+ for Library_Dir use Directories.Libdir & "/gnatcoll/";
++ for Library_Dir use Directories.Libdir & "/gnatcoll/" & Project'Library_Kind;
for Library_Version use
"lib" & Project'Library_Name & GnatColl.So_Ext & "." & Gnatcoll.Version;
@@ -105,7 +105,7 @@ index 2cf696a..6660c43 100644
for Source_List_File use "gnatcoll/" & Project'Library_Name & ".lgpr";
for Library_Kind use GnatColl.GnatColl_Kind;
- for Library_Dir use GnatColl.Libdir;
-+ for Library_Dir use Directories.Libdir & "/gnatcoll/";
++ for Library_Dir use Directories.Libdir & "/gnatcoll/" & Project'Library_Kind;
for Library_Version use
"lib" & Project'Library_Name & GnatColl.So_Ext & "." & Gnatcoll.Version;
diff --git a/gnatcoll.spec b/gnatcoll.spec
index 2f77a3a..e09a8a9 100644
--- a/gnatcoll.spec
+++ b/gnatcoll.spec
@@ -99,8 +99,8 @@ rm -f %{buildroot}/%{_datadir}/%{name}/dborm.pyo
%changelog
-* Sat Oct 11 2014 Pavel Zhukov <landgraf at fedoraproject.org> - 2013-10
-- Rebuild with new gcc5
+* Tue Mar 31 2015 Pavel Zhukov <landgraf at fedoraproject.org> - 2013-10
+- Fix library dir
* Sat Oct 11 2014 Pavel Zhukov <landgraf at fedoraproject.org> - 2013-9
- Do not build on arm
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/gnatcoll.git/commit/?h=f22&id=00125821aad7ea36a603735152a5b48c4dc4b038
More information about the scm-commits
mailing list