diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-08-14 10:45:27 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-08-14 10:45:27 +0000 |
| commit | dda19de483301630ec144979b44e4950d5950e05 (patch) | |
| tree | 48137721edf9b0015417d80161eaf2a7b98f888d | |
| parent | b9eefde4830f86a4a9791071821d0e4b3d03edf5 (diff) | |
| download | ATCD-dda19de483301630ec144979b44e4950d5950e05.tar.gz | |
Sun Aug 14 10:44:32 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* rpmbuild/ace-tao.spec:
Added support for inline, thanks to Thomas Lockhart for providing
the patch
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/rpmbuild/ace-tao.spec | 25 |
2 files changed, 30 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 6ec44236393..f445ab26776 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Sun Aug 14 10:44:32 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * rpmbuild/ace-tao.spec: + Added support for inline, thanks to Thomas Lockhart for providing + the patch + Wed Aug 10 20:15:40 UTC 2011 Phil Mesnier <mesnier_p@ociweb.com> * ACE-INSTALL.html: diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec index cc1cf370757..efab5d8df1b 100644 --- a/ACE/rpmbuild/ace-tao.spec +++ b/ACE/rpmbuild/ace-tao.spec @@ -16,6 +16,7 @@ # --without xt (No xt support) # --without fox (No fox support) # --without qt (No qt support) +# --without inline (Code inlining disabled) # # Read: If neither macro exists, then add the default definition. @@ -29,6 +30,7 @@ %{!?_with_xt: %{!?_without_xt: %define _without_xt --without-xt}} %{!?_with_fox: %{!?_without_fox: %define _without_fox --without-fox}} %{!?_with_qt: %{!?_without_qt: %define _without_qt --without-qt}} +%{!?_with_inline: %{!?_without_inline: %define _without_inline 0}} # # Read: It's an error if both or neither required options exist. %{?_with_rnq: %{?_without_rnq: %{error: both _with_rnq and _without_rnq}}} @@ -41,6 +43,7 @@ %{?_with_xt: %{?_without_xt: %{error: both _with_xt and _without_xt}}} %{?_with_fox: %{?_without_fox: %{error: both _with_fox and _without_fox}}} %{?_with_qt: %{?_without_qt: %{error: both _with_qt and _without_qt}}} +%{?_with_inline: %{?_without_inline: %{error: both _with_inline and _without_inline}}} %{!?skip_make:%define skip_make 0} %{!?make_nosrc:%define make_nosrc 0} @@ -851,8 +854,20 @@ EOF cat >> $ACE_ROOT/include/makeinclude/platform_macros.GNU <<EOF ssl = 1 +EOF + +%if %{?_with_inline:1}%{!?_with_inline:0} +%define inline -D__ACE_INLINE__ -U__ACE_NO_INLINE__ +cat >> $ACE_ROOT/include/makeinclude/platform_macros.GNU <<EOF +inline = 1 +EOF +%else +%define inline +%define inline -D__ACE_NO_INLINE__ -U__ACE_INLINE__ +cat >> $ACE_ROOT/include/makeinclude/platform_macros.GNU <<EOF inline = 0 EOF +%endif %if %{?_with_xt:1}%{!?_with_xt:0} cat >> $ACE_ROOT/include/makeinclude/platform_macros.GNU <<EOF @@ -1096,7 +1111,8 @@ BASEHDR=`find \ for j in $BASEHDR; do echo $j >> rawhdrs.log echo '#include <'$j'>' | \ - g++ -I . \ + g++ %{inline} \ + -I . \ -I protocols \ -I TAO \ -I TAO/orbsvcs \ @@ -2580,3 +2596,10 @@ fi %doc TAO/README %endif + + +%changelog +* Thu Aug 11 2011 Thomas Lockhart <lockhart@fourpalms.org> 6.0.3-54 +- Parameterize code inlining. Defaults to not inlining which was the previous behavior. +- Implement the rpmbuild options "--with inline" and "--without inline". + |