[zlib-ada] Took advantage of external_as_list for LDFLAGS.

Björn Persson rombobeorn at fedoraproject.org
Sat Aug 31 17:22:31 UTC 2013


commit 889170e4d5ab9f4406afb54d776de21f51a35fa9
Author: Björn Persson <bjorn at rombobjörn.se>
Date:   Sat Aug 31 19:17:53 2013 +0200

    Took advantage of external_as_list for LDFLAGS.

 build_zlib_ada.gpr |    2 +-
 zlib-ada.spec      |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/build_zlib_ada.gpr b/build_zlib_ada.gpr
index 6885927..6150b81 100644
--- a/build_zlib_ada.gpr
+++ b/build_zlib_ada.gpr
@@ -19,7 +19,7 @@ library project Build_Zlib_Ada is
    for Library_Src_Dir use Destdir & Directories.Includedir & "/zlib-ada";
    for Library_Dir     use Destdir & Directories.Libdir;
    for Library_ALI_Dir use Destdir & Directories.Libdir & "/zlib-ada";
-   for Library_Options use ("-lz", external("LDFLAGS"));
+   for Library_Options use ("-lz") & external_as_list("LDFLAGS", " ");
 
    -- Put the binder files for different architectures in subdirectories where
    -- they won't conflict with each other.
diff --git a/zlib-ada.spec b/zlib-ada.spec
index 94cbf6f..b8e3a07 100644
--- a/zlib-ada.spec
+++ b/zlib-ada.spec
@@ -16,7 +16,8 @@ Source:         zlib-ada-20120830.tar.bz2
 Source2:        build_zlib_ada.gpr
 Source3:        zlib_ada.gpr
 
-BuildRequires:  gcc-gnat fedora-gnat-project-common zlib-devel chrpath
+BuildRequires:  gcc-gnat >= 4.7 fedora-gnat-project-common zlib-devel chrpath
+# Gnatmake learned about external_as_list sometime between 4.4 and 4.7.
 # Build only on architectures where gcc-gnat is available:
 ExclusiveArch:  %{GNAT_arches}
 
@@ -58,7 +59,7 @@ cp %{SOURCE2} .
 
 
 %build
-gnatmake -P build_zlib_ada.gpr %{Gnatmake_optflags} -XDESTDIR=build_target -XLDFLAGS=%{__global_ldflags}
+gnatmake -P build_zlib_ada.gpr %{Gnatmake_optflags} -XDESTDIR=build_target -XLDFLAGS='%{__global_ldflags}'
 # Remove the unnecessary runpath that Gnatmake added.
 chrpath --delete build_target%{_libdir}/*.so.*
 


More information about the scm-commits mailing list