summaryrefslogtreecommitdiff
path: root/package/libnet
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-12-30 22:45:29 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-12-30 22:45:29 +0100
commit220a96f9926788ed531717f78e44fdf1e7ab3b34 (patch)
tree406f65eea71fabd8cf66c2bd1108ec63f8c349ee /package/libnet
parent38af8185ea05a1c5d1abb32a68a025e3b4afa4d6 (diff)
rework architecture / embedded systems concept
Make configuration of new targets cheap. Just add a new file in target/arch/sys-enabled/foo. See other files for syntax. While doing runtime tests with the new infrastructure I've updated a lot of other stuff: - gcc 4.5.2 - uClibc 0.9.32-rc1 (NPTL) - strongswan, php, miredo, parted, util-linux-ng, e2fsprogs I promise, this is the last big fat commit this year ;)
Diffstat (limited to 'package/libnet')
-rw-r--r--package/libnet/Makefile18
-rw-r--r--package/libnet/patches/patch-configure83
2 files changed, 11 insertions, 90 deletions
diff --git a/package/libnet/Makefile b/package/libnet/Makefile
index 12a168824..5309c68ec 100644
--- a/package/libnet/Makefile
+++ b/package/libnet/Makefile
@@ -4,15 +4,15 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= libnet
-PKG_VERSION:= 1.1.4
+PKG_VERSION:= 1.1.5
PKG_RELEASE:= 1
-PKG_MD5SUM:= c5e06418a89cc4209f677a776a798fd9
+PKG_MD5SUM:= a9bc1d75a610efcfee200d3e28d8eb8f
PKG_DESCR:= a low-level packet creation library
PKG_SECTION:= libs
PKG_DEPENDS:= libpcap
PKG_BUILDDEP:= libpcap
PKG_URL:= http://sourceforge.net/projects/libnet-dev/
-PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libnet-dev/libnet-${PKG_VERSION}/}
+PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libnet-dev/}
include ${TOPDIR}/mk/package.mk
@@ -20,14 +20,18 @@ ENDIAN:=lil
ifeq (${CPU_ARCH},mips)
ENDIAN:=big
endif
+ifeq (${CPU_ARCH},mips64)
+ENDIAN:=big
+endif
+ifeq (${CPU_ARCH},ppc)
+ENDIAN:=big
+endif
$(eval $(call PKG_template,LIBNET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-CONFIGURE_ENV+= ac_libnet_have_pf_packet=yes \
- ac_cv_libnet_endianess=${ENDIAN} \
- LL_INT_TYPE=linux \
+CONFIGURE_ENV+= ac_cv_libnet_endianess=${ENDIAN} \
ac_cv_lbl_unaligned_fail=no
-CONFIGURE_ARGS+= --with-pf_packet=yes
+#CONFIGURE_ARGS+= --with-pf_packet=yes
post-install:
${INSTALL_DIR} ${IDIR_LIBNET}/usr/lib
diff --git a/package/libnet/patches/patch-configure b/package/libnet/patches/patch-configure
deleted file mode 100644
index dceedf213..000000000
--- a/package/libnet/patches/patch-configure
+++ /dev/null
@@ -1,83 +0,0 @@
---- libnet-1.1.4.orig/configure 2009-06-10 01:13:22.000000000 +0200
-+++ libnet-1.1.4/configure 2009-12-11 11:45:26.000000000 +0100
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.61 for libnet 1.1.4.
- #
-@@ -19678,57 +19678,6 @@ done
- { echo "$as_me:$LINENO: checking machine endianess" >&5
- echo $ECHO_N "checking machine endianess... $ECHO_C" >&6; }
-
-- cat > conftest.c << EOF
--# include <stdio.h>
--# include <stdlib.h>
--
-- int main()
-- {
-- union
-- {
-- short s;
-- char c[sizeof(short)];
-- } un;
--
-- un.s = 0x0102;
-- if (sizeof (short) == 2)
-- {
-- if (un.c [0] == 1 && un.c [1] == 2)
-- {
-- printf("B\n");
-- }
-- else
-- {
-- if (un.c [0] == 2 && un.c [1] == 1)
-- {
-- printf("L\n");
-- }
-- }
-- }
-- else
-- {
-- printf("?\n");
-- }
-- return (EXIT_SUCCESS);
-- }
--EOF
-- ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS > /dev/null 2>&1
-- # Oopz 4.3 BSD doesn't have this. Sorry.
-- if test ! -x conftest ; then
-- ac_cv_libnet_endianess=unknown
-- else
-- ./conftest > conftest.out
-- result=`cat conftest.out`
-- if test $result = "B"; then
-- ac_cv_libnet_endianess=big
-- elif test $result = "L"; then
-- ac_cv_libnet_endianess=lil
-- else
-- ac_cv_libnet_endianess=unknown
-- fi
-- fi
-- rm -f conftest* core core.conftest
--
- { echo "$as_me:$LINENO: result: $ac_cv_libnet_endianess" >&5
- echo "${ECHO_T}$ac_cv_libnet_endianess" >&6; }
-
-@@ -19836,7 +19785,15 @@ _ACEOF
- { echo "$as_me:$LINENO: checking link-layer packet interface type" >&5
- echo $ECHO_N "checking link-layer packet interface type... $ECHO_C" >&6; }
-
--if test -r /dev/bpf0 ; then
-+if test -n "$LL_INT_TYPE"; then
-+ case $LIBOBJS in
-+ "libnet_link_$LL_INT_TYPE.$ac_objext" | \
-+ *" libnet_link_$LL_INT_TYPE.$ac_objext" | \
-+ "libnet_link_$LL_INT_TYPE.$ac_objext "* | \
-+ *" libnet_link_$LL_INT_TYPE.$ac_objext "* ) ;;
-+ *) LIBOBJS="$LIBOBJS libnet_link_$LL_INT_TYPE.$ac_objext" ;;
-+esac
-+elif test -r /dev/bpf0 ; then
- case " $LIBOBJS " in
- *" libnet_link_bpf.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS libnet_link_bpf.$ac_objext"