Browse Source

Stefan Fiedler:


			
			
				rocklinux
			
			
		
Stefan Fiedler 17 years ago
parent
commit
5749872538
3 changed files with 29 additions and 6 deletions
  1. +2
    -6
      package/base/iproute2/iproute2.conf
  2. +10
    -0
      package/base/iproute2/libutil.patch
  3. +17
    -0
      package/base/iproute2/remove_conflicting_defines.patch

+ 2
- 6
package/base/iproute2/iproute2.conf

@ -35,14 +35,10 @@ ipr2_pm() {
}
runconf=0
makeopt="KERNEL_INCLUDE=$root/usr/include"
makeinstopt="SBINDIR=/sbin DESTDIR=$root install"
var_append makeopt " " "KERNEL_INCLUDE=$root/usr/include"
var_append makeinstopt " " "SBINDIR=/sbin DESTDIR=$root"
postmake="ipr2_pm"
pkginstalled bdb.. && [ $stagelevel -gt 1 ] || \
var_append patchfiles ' ' $confdir/bdb_unavailable.diff
# use real kernel headers for building iproute2
var_append CC_WRAPPER_APPEND " " "-I/usr/src/linux/include"

+ 10
- 0
package/base/iproute2/libutil.patch

@ -0,0 +1,10 @@
--- iproute2/Makefile~ 2007-03-13 22:50:56.000000000 +0100
+++ iproute2/Makefile 2007-07-17 20:03:59.000000000 +0200
@@ -29,6 +29,7 @@
SUBDIRS=lib ip tc misc netem genl
+LIBUTIL=../lib/libutil.a
LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
all: Config

+ 17
- 0
package/base/iproute2/remove_conflicting_defines.patch

@ -0,0 +1,17 @@
These defines are not used anywhere in iproute2 (and the header is not
exported), but cause errors in include/linux/types.h.
--- iproute2/include/iptables_common.h~ 2007-03-13 22:50:56.000000000 +0100
+++ iproute2/include/iptables_common.h 2007-07-17 20:00:14.000000000 +0200
@@ -43,9 +43,11 @@
extern void init_extensions(void);
#endif
+/*
#define __be32 u_int32_t
#define __le32 u_int32_t
#define __be16 u_int16_t
#define __le16 u_int16_t
+*/
#endif /*_IPTABLES_COMMON_H*/

Loading…
Cancel
Save