| Message ID | dae1250b24404f7f21e7bd8aeeb304565d175de4.1442951872.git.crobinso@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 09/22/2015 01:57 PM, Cole Robinson wrote: > $ rpmbuild -ba libvirt.spec > warning: Macro expanded in comment on line 5: # If neither fedora nor rhel was defined, try to guess them from %{dist} > > warning: Macro %enable_autotools defined but not used within scope > warning: Macro %client_only defined but not used within scope > ... > --- > libvirt.spec.in | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > # Default to skipping autoreconf. Distros can change just this one line > # (or provide a command-line override) if they backport any patches that > # touch configure.ac or Makefile.am. > -%{!?enable_autotools:%define enable_autotools 0} > +%{!?enable_autotools:%global enable_autotools 0} I guess %global works. I might have tried: %if !0%{?enable_autotools} %define enable_autotools 0 %endif but that's longer. ACK
On 09/22/2015 04:40 PM, Eric Blake wrote: > On 09/22/2015 01:57 PM, Cole Robinson wrote: >> $ rpmbuild -ba libvirt.spec >> warning: Macro expanded in comment on line 5: # If neither fedora nor rhel was defined, try to guess them from %{dist} >> >> warning: Macro %enable_autotools defined but not used within scope >> warning: Macro %client_only defined but not used within scope >> ... >> --- >> libvirt.spec.in | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) > >> # Default to skipping autoreconf. Distros can change just this one line >> # (or provide a command-line override) if they backport any patches that >> # touch configure.ac or Makefile.am. >> -%{!?enable_autotools:%define enable_autotools 0} >> +%{!?enable_autotools:%global enable_autotools 0} > > I guess %global works. I might have tried: > > %if !0%{?enable_autotools} > %define enable_autotools 0 > %endif > > but that's longer. > > ACK > Thanks, pushed now - Cole -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
diff --git a/libvirt.spec.in b/libvirt.spec.in index 48461e8..853d2ec 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2,7 +2,7 @@ # This spec file assumes you are building for Fedora 13 or newer, # or for RHEL 5 or newer. It may need some tweaks for other distros. -# If neither fedora nor rhel was defined, try to guess them from %{dist} +# If neither fedora nor rhel was defined, try to guess them from dist %if !0%{?rhel} && !0%{?fedora} %{expand:%(echo "%{?dist}" | \ sed -ne 's/^\.el\([0-9]\+\).*/%%define rhel \1/p')} @@ -13,13 +13,13 @@ # Default to skipping autoreconf. Distros can change just this one line # (or provide a command-line override) if they backport any patches that # touch configure.ac or Makefile.am. -%{!?enable_autotools:%define enable_autotools 0} +%{!?enable_autotools:%global enable_autotools 0} # A client only build will create a libvirt.so only containing # the generic RPC driver, and test driver and no libvirtd # Default to a full server + client build, but with the possibility # of a command-line or ~/.rpmmacros override for client-only. -%{!?client_only:%define client_only 0} +%{!?client_only:%global client_only 0} # Now turn off server build in certain cases
$ rpmbuild -ba libvirt.spec warning: Macro expanded in comment on line 5: # If neither fedora nor rhel was defined, try to guess them from %{dist} warning: Macro %enable_autotools defined but not used within scope warning: Macro %client_only defined but not used within scope ... --- libvirt.spec.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)