63ebab179a
Copy from home:msmeissn:branches:hardware/wireless-tools via accept of submit request 30888 revision 2. Request was accepted with message: thank you OBS-URL: https://build.opensuse.org/request/show/30888 OBS-URL: https://build.opensuse.org/package/show/hardware/wireless-tools?expand=0&rev=8
74 lines
2.5 KiB
Plaintext
74 lines
2.5 KiB
Plaintext
Index: Makefile
|
|
===================================================================
|
|
--- Makefile.orig
|
|
+++ Makefile
|
|
@@ -19,7 +19,7 @@ RANLIB = ranlib
|
|
## a local version (non-root).
|
|
## Standard distros should comment that option to save space and to
|
|
## build libiw.so used by third parties...
|
|
-BUILD_STATIC = y
|
|
+#BUILD_STATIC = y
|
|
|
|
## Uncomment this to build without using libm (less efficient).
|
|
## This is mostly useful for embedded platforms without maths.
|
|
@@ -105,7 +105,7 @@ endif
|
|
|
|
# Other flags
|
|
CFLAGS=-Os -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow \
|
|
- -Wpointer-arith -Wcast-qual -Winline -I.
|
|
+ -Wpointer-arith -Wcast-qual -Winline -I. $(RPM_OPT_FLAGS) -fno-strict-aliasing
|
|
#CFLAGS=-O2 -W -Wall -Wstrict-prototypes -I.
|
|
DEPFLAGS=-MMD
|
|
XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) $(WELIB_FLAG) $(WEDEF_FLAG)
|
|
@@ -121,6 +121,9 @@ all:: $(IWLIB) $(PROGS)
|
|
%.so: %.c wireless.h
|
|
$(CC) $(XCFLAGS) $(PICFLAG) -c -o $@ $<
|
|
|
|
+iwlib.o: iwlib.c
|
|
+ $(CC) $(XCFLAGS) $(PICFLAG) -c -o $@ $<
|
|
+
|
|
iwconfig: iwconfig.o $(IWLIB)
|
|
|
|
iwlist: iwlist.o $(IWLIB)
|
|
Index: iwlib.h
|
|
===================================================================
|
|
--- iwlib.h.orig
|
|
+++ iwlib.h
|
|
@@ -60,36 +60,6 @@
|
|
/* Private copy of Wireless extensions (in this directoty) */
|
|
#include "wireless.h"
|
|
|
|
-/* Make gcc understant that when we say inline, we mean it.
|
|
- * I really hate when the compiler is trying to be more clever than me,
|
|
- * because in this case gcc is not able to figure out functions with a
|
|
- * single call site, so not only I have to tag those functions inline
|
|
- * by hand, but then it refuse to inline them properly.
|
|
- * Total saving for iwevent : 150B = 0.7%.
|
|
- * Fortunately, in gcc 3.4, they now automatically inline static functions
|
|
- * with a single call site. Hurrah !
|
|
- * Jean II */
|
|
-#undef IW_GCC_HAS_BROKEN_INLINE
|
|
-#if __GNUC__ == 3
|
|
-#if __GNUC_MINOR__ >= 1 && __GNUC_MINOR__ < 4
|
|
-#define IW_GCC_HAS_BROKEN_INLINE 1
|
|
-#endif /* __GNUC_MINOR__ */
|
|
-#endif /* __GNUC__ */
|
|
-/* However, gcc 4.0 has introduce a new "feature", when compiling with
|
|
- * '-Os', it does not want to inline iw_ether_cmp() and friends.
|
|
- * So, we need to fix inline again !
|
|
- * Jean II */
|
|
-#if __GNUC__ == 4
|
|
-#define IW_GCC_HAS_BROKEN_INLINE 1
|
|
-#endif /* __GNUC__ */
|
|
-/* Now, really fix the inline */
|
|
-#ifdef IW_GCC_HAS_BROKEN_INLINE
|
|
-#ifdef inline
|
|
-#undef inline
|
|
-#endif /* inline */
|
|
-#define inline inline __attribute__((always_inline))
|
|
-#endif /* IW_GCC_HAS_BROKEN_INLINE */
|
|
-
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|