Author: qboosh Date: Fri Apr 6 19:49:59 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- added dynamic bcond
---- Files affected:
packages/apparmor-parser:
apparmor-parser.spec (1.40 -> 1.41)
---- Diffs:
================================================================
Index: packages/apparmor-parser/apparmor-parser.spec
diff -u packages/apparmor-parser/apparmor-parser.spec:1.40
packages/apparmor-parser/apparmor-parser.spec:1.41
--- packages/apparmor-parser/apparmor-parser.spec:1.40 Thu Apr 5 22:49:54 2012
+++ packages/apparmor-parser/apparmor-parser.spec Fri Apr 6 21:49:54 2012
@@ -1,7 +1,9 @@
# $Revision$, $Date$
-
-%bcond_without tests
-
+#
+# Conditional build:
+%bcond_without tests # don't perform "make tests"
+%bcond_with dynamic # link libstdc++ and libgcc dynamically
+#
Summary: AppArmor userlevel parser utility
Summary(pl.UTF-8): Narzędzie przestrzeni użytkownika do przetwarzania
AppArmor
Name: apparmor-parser
@@ -21,12 +23,12 @@
BuildRequires: libcap-devel
BuildRequires: libstdc++-devel
# for apparmor_profile which links statically sometimes
-BuildRequires: libstdc++-static
-BuildRequires: perl-Test-Harness
-BuildRequires: perl-tools-devel
+%{!?with_dynamic:BuildRequires: libstdc++-static}
BuildRequires: perl-tools-pod
%if %{with tests}
BuildRequires: perl-Locale-gettext
+BuildRequires: perl-Test-Harness
+BuildRequires: perl-tools-devel
%endif
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -49,9 +51,14 @@
%{__make} -j1 -C parser \
CC="%{__cc}" \
CXX="%{__cxx}" \
- CFLAGS="%{rpmcflags} %{rpmcppflags}"
+ CFLAGS="%{rpmcflags} %{rpmcppflags}" \
+ %{?with_dynamic:AAREOBJECTS='$(AAREOBJECT)' AARE_LDFLAGS=}
-%{?with_tests:%{__make} -j1 -C parser tests}
+%if %{with tests}
+%{__make} -j1 -C parser tests \
+ CC="%{__cc}" \
+ %{?with_dynamic:AAREOBJECTS='$(AAREOBJECT)' AARE_LDFLAGS=-lstdc++}
+%endif
%install
rm -rf $RPM_BUILD_ROOT
@@ -103,6 +110,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.41 2012/04/06 19:49:54 qboosh
+- added dynamic bcond
+
Revision 1.40 2012/04/05 20:49:54 arekm
- up to 2.7.2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/apparmor-parser/apparmor-parser.spec?r1=1.40&r2=1.41
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
