[oe-commits] org.oe.dev libnet 1.1.2.1: Modify so that it no longer uses a patch configure by

[lenehan commit]

libnet 1.1.2.1: Modify so that it no longer uses a patch configure by
forcing the regerneration of the configure script. Closes #467.

Author: lenehan at openembedded.org
Branch: org.openembedded.dev
Revision: 19b357baca48f91a2d470c3fd3810c371cd5fd1f
ViewMTN: http://monotone.openembedded.org/revision.psp?id=19b357baca48f91a2d470c3fd3810c371cd5fd1f
Files:
1
packages/libnet/libnet-1.1.2.1/configure.patch
packages/libnet/libnet-1.1.2.1/fix-endianess-test.patch
packages/libnet/libnet_1.1.2.1.bb
Diffs:

#
# mt diff -r8ae482dbfdcc52b57e6935b0347cb14612111b28 -r19b357baca48f91a2d470c3fd3810c371cd5fd1f
#
# 
# 
# delete "packages/libnet/libnet-1.1.2.1/configure.patch"
# 
# patch "packages/libnet/libnet-1.1.2.1/fix-endianess-test.patch"
#  from [df207d2e06ebba2a7bf53fd6b36ce78612f6285c]
#    to [ecf9e4c5d8af4999400b3e217434a68bc5f51aaf]
# 
# patch "packages/libnet/libnet_1.1.2.1.bb"
#  from [b36d79d3434c500d6410626e78810c9b68ae354f]
#    to [d0a7771e6cbe8f88d09c1da72a2e31eb6e6d169f]
# 
============================================================
--- packages/libnet/libnet-1.1.2.1/fix-endianess-test.patch	df207d2e06ebba2a7bf53fd6b36ce78612f6285c
+++ packages/libnet/libnet-1.1.2.1/fix-endianess-test.patch	ecf9e4c5d8af4999400b3e217434a68bc5f51aaf
@@ -34,93 +34,3 @@ Also remove the old test from aclocal.m4
  AC_LBL_UNALIGNED_ACCESS
  dnl AC_LBL_LIBRARY_NET
  
---- libnet/aclocal.m4	2005/11/15 04:02:01	1.1
-+++ libnet/aclocal.m4	2005/11/15 04:03:43
-@@ -279,87 +279,6 @@
- 
- 
- dnl
--dnl Checks endianess
--dnl
--dnl usage:
--dnl
--dnl     AC_LIBNET_ENDIAN_CHECK
--dnl
--dnl results:
--dnl
--dnl     LIBNET_BIG_ENDIAN = 1   or
--dnl     LIBNET_LIL_ENDIAN = 1
--dnl
--
--AC_DEFUN(AC_LIBNET_ENDIAN_CHECK,
--    [AC_MSG_CHECKING(machine endianess)
--
--    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
--dnl failed to compile for some reason
--            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
--
--        AC_MSG_RESULT($ac_cv_libnet_endianess)
--
--        if test $ac_cv_libnet_endianess = big ; then
--            AC_DEFINE(LIBNET_BIG_ENDIAN)
--            ENDIANESS="LIBNET_BIG_ENDIAN"
--            LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DLIBNET_BIG_ENDIAN"
--        elif test $ac_cv_libnet_endianess = lil ; then
--            AC_DEFINE(LIBNET_LIL_ENDIAN)
--            ENDIANESS="LIBNET_LIL_ENDIAN"
--            LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DLIBNET_LIL_ENDIAN"
--        fi
--    ])
--
--dnl
- dnl Improved version of AC_CHECK_LIB
- dnl
- dnl Thanks to John Hawkinson (jhawk at mit.edu)
============================================================
--- packages/libnet/libnet_1.1.2.1.bb	b36d79d3434c500d6410626e78810c9b68ae354f
+++ packages/libnet/libnet_1.1.2.1.bb	d0a7771e6cbe8f88d09c1da72a2e31eb6e6d169f
@@ -1,18 +1,17 @@ DEPENDS = "libpcap"
 SECTION = "libs"
 DESCRIPTION = "A packet dissection and creation library"
 HOMEPAGE = "http://www.packetfactory.net/libnet/"
 LICENSE = "BSD"
 PRIORITY = "optional"
 DEPENDS = "libpcap"
-PR = "r0"
+PR = "r1"
 
 # There are major API changes beween libnet v1.0 and libnet v1.1
 PROVIDES = "libnet-1.1"
 
 SRC_URI = "http://www.packetfactory.net/libnet/dist/libnet-${PV}.tar.gz \
 	   file://support-uclibc.patch;patch=1 \
-	   file://fix-endianess-test.patch;patch=1 \
-	   file://configure.patch;patch=1"
+	   file://fix-endianess-test.patch;patch=1"
 
 S = "${WORKDIR}/libnet"
 
@@ -20,8 +19,8 @@ CPPFLAGS_prepend = "-I${S}/libnet/includ
 
 CPPFLAGS_prepend = "-I${S}/libnet/include "
 
-do_configure() {
-	oe_runconf
+do_configure_prepend() {
+        rm -f aclocal.m4 Makefile.am ltmain.sh
 }
 
 do_stage () {