Bug 133651

Would this be considered bad form at Red Hat?

--- wireless-tools.spec.orig    2004-08-31 07:20:03.000000000 +0200
+++ wireless-tools.spec 2004-09-27 21:01:31.577324656 +0200
@@ -22,6 +22,8 @@
 %prep
 %setup -n wireless_tools.%{version}
 %patch1 -p1 -b .makefile
+sed -i 's/^\(CFLAGS.*\)-Os\(.*\)/\1\$(RPM_OPT_FLAGS) \2/' Makefile
+
 
 %build
 make clean

Alternatively, patch the makefile so we can pass RPM_OPT_FLAGS on the
make command line ;)

--- wireless_tools.27/Makefile.makefile 2004-06-15 14:40:12.000000000
-0400
+++ wireless_tools.27/Makefile  2004-09-27 15:12:49.000000000 -0400
@@ -77,12 +77,15 @@
   LIBS= -lm
 endif
  
+ifndef RPM_OPT_FLAGS
+  RPM_OPT_FLAGS=
+endif
 # Other flags
 CFLAGS=-Os -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow \
        -Wpointer-arith -Wcast-qual -Winline -I.
 #CFLAGS=-O2 -W -Wall -Wstrict-prototypes -I.
 DEPFLAGS=-MMD
-XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) $(WELIB_FLAG)
+XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) $(WELIB_FLAG)
$(RPM_OPT_FLAGS) PICFLAG=-fPIC
  
 # Standard compilation targets

OK, something like this seems to work. Just test compiled it.

The "sed" approach achieves a similar thing:

--- Makefile.orig       2004-09-27 21:41:23.863641856 +0200
+++ Makefile    2004-09-27 21:41:27.624070184 +0200
@@ -78,7 +78,7 @@
 endif
 
 # Other flags
-CFLAGS=-Os -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow \
+CFLAGS=$(RPM_OPT_FLAGS)  -W -Wall -Wstrict-prototypes
-Wmissing-prototypes -Wshadow \
        -Wpointer-arith -Wcast-qual -Winline -I.
 #CFLAGS=-O2 -W -Wall -Wstrict-prototypes -I.
 DEPFLAGS=-MMD


So, you can pass RPM_OPT_FLAGS on the command-line, too (rpmbuild
exports it already).

If you patch the Makefile, you probably want to apply this (OPT_FLAGS
is not used anywhere in the tarball):

--- wireless-tools.spec.orig    2004-08-31 07:20:03.000000000 +0200
+++ wireless-tools.spec 2004-09-27 21:43:23.557445632 +0200
@@ -25,7 +25,7 @@
 
 %build
 make clean
-make OPT_FLAGS="$RPM_OPT_FLAGS" BUILD_SHARED=1 FORCE_WEXT_VERSION=16
+make BUILD_SHARED=1 FORCE_WEXT_VERSION=16
 
 %install
 rm -rf $RPM_BUILD_ROOT

It does, but it doesn't look quite as future-proof.  I could imagine
the upstream maintainers adding something in front of the -Os one day,
causing the sed to remove an option it shouldn't remove...

I've applied the patch from comment #2, except using OPT_FLAGS instead
of RPM_OPT_FLAGS.  This way the Makefile does use the OPT_FLAGS
argument passed to it and things get compiled right.

Thanks for helping fix this. wireless-tools-0.27-pre25-2 should be
correct.

Okay. The sed expression does not remove anything else than -Os,
however. \1 and \2 put back the parts around -Os.

Fedora Core 3 is now maintained by the Fedora Legacy project for security
updates only. If this problem is a security issue, please reopen and
reassign to the Fedora Legacy product. If it is not a security issue and
hasn't been resolved in the current FC5 updates or in the FC6 test
release, reopen and change the version to match.

Thank you!

This looks fixed anyway.