diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/libnl | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/libnl')
| -rw-r--r-- | package/libnl/Makefile | 7 | ||||
| -rw-r--r-- | package/libnl/ipkg/libnl.control | 4 | ||||
| -rw-r--r-- | package/libnl/patches/patch-include_netlink-local_h | 9 | ||||
| -rw-r--r-- | package/libnl/patches/patch-lib_object_c | 12 |
4 files changed, 25 insertions, 7 deletions
diff --git a/package/libnl/Makefile b/package/libnl/Makefile index 6c4b7cb18..d11f3e2bb 100644 --- a/package/libnl/Makefile +++ b/package/libnl/Makefile @@ -9,12 +9,13 @@ PKG_NAME:= libnl PKG_VERSION:= 1.1 PKG_RELEASE:= 1 PKG_MD5SUM:= ae970ccd9144e132b68664f98e7ceeb1 -MASTER_SITES:= http://downloads.openwrt.org/sources/ - +PKG_DESCR:= Netlink library +PKG_SECTION:= libs +PKG_SITES:= http://downloads.openwrt.org/sources/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBNL,libnl,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBNL,libnl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/libnl/ipkg/libnl.control b/package/libnl/ipkg/libnl.control deleted file mode 100644 index 8ad5fcce4..000000000 --- a/package/libnl/ipkg/libnl.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libnl -Priority: optional -Section: net -Description: Tools for setting up WiFi cards via netlink (nl80211) diff --git a/package/libnl/patches/patch-include_netlink-local_h b/package/libnl/patches/patch-include_netlink-local_h index c32825b23..02dc66130 100644 --- a/package/libnl/patches/patch-include_netlink-local_h +++ b/package/libnl/patches/patch-include_netlink-local_h @@ -9,3 +9,12 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ #include <arpa/inet.h> #include <netdb.h> +@@ -337,7 +337,7 @@ static inline int nl_cb_call(struct nl_c + } + + #define ARRAY_SIZE(X) (sizeof(X) / sizeof((X)[0])) +-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) ++#define __offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) + + #define __init __attribute__ ((constructor)) + #define __exit __attribute__ ((destructor)) diff --git a/package/libnl/patches/patch-lib_object_c b/package/libnl/patches/patch-lib_object_c new file mode 100644 index 000000000..6d4ba6c8c --- /dev/null +++ b/package/libnl/patches/patch-lib_object_c @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- libnl-1.1.orig/lib/object.c 2008-01-14 16:48:45.000000000 +0100 ++++ libnl-1.1/lib/object.c 2009-05-28 23:20:00.925639994 +0200 +@@ -96,7 +96,7 @@ struct nl_object *nl_object_clone(struct + { + struct nl_object *new; + struct nl_object_ops *ops = obj_ops(obj); +- int doff = offsetof(struct nl_derived_object, data); ++ int doff = __offsetof(struct nl_derived_object, data); + int size; + + new = nl_object_alloc(ops); |