[uuid/f17] enforce usage of our c(xx)flags

Michal Hlavinka mhlavink at fedoraproject.org
Tue Jun 19 12:07:21 UTC 2012


commit b1e2a500a6a4c81bc17208d36e1eed44e680ed3c
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Tue Jun 19 14:07:18 2012 +0200

    enforce usage of our c(xx)flags

 uuid.spec |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/uuid.spec b/uuid.spec
index 523411b..943a0fc 100644
--- a/uuid.spec
+++ b/uuid.spec
@@ -10,7 +10,7 @@
 
 Name:           uuid
 Version:        1.6.2
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Universally Unique Identifier library
 License:        MIT
 Group:          System Environment/Libraries
@@ -135,6 +135,8 @@ export DCE_NAME=libossp-uuid_dce.la
 export CXX_NAME=libossp-uuid++.la
 export PHP_NAME=$(pwd)/php/modules/ossp-uuid.so
 export PGSQL_NAME=$(pwd)/pgsql/libossp-uuid.so
+export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS"
 %configure \
     --disable-static \
     --without-perl \
@@ -143,7 +145,7 @@ export PGSQL_NAME=$(pwd)/pgsql/libossp-uuid.so
     --with-cxx \
     --with-pgsql
 
-make LIBTOOL=/usr/bin/libtool %{?_smp_mflags}
+make LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" %{?_smp_mflags}
 
 # Build the Perl module.
 pushd perl
@@ -158,7 +160,7 @@ export PHP_RPATH=no
 phpize
 CFLAGS="$RPM_OPT_FLAGS -I.. -L.. -L../.libs"
 %configure --enable-uuid
-make %{?_smp_mflags}
+make CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" %{?_smp_mflags}
 popd
 
 %install
@@ -277,6 +279,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libossp-uuid_dce.so
 
 %changelog
+* Tue Jun 19 2012 Michal Hlavinka <mhlavink at redhat.com> - 1.6.2-11
+- enforce usage of our c(xx)flags
+
 * Tue Jun 19 2012 Michal Hlavinka <mhlavink at redhat.com> - 1.6.2-10
 - fix debuginfo
 


More information about the scm-commits mailing list