From 89f9d07d8e291c994469d015d39ef90fb39a4ec4 Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Mon, 16 Dec 2013 17:15:57 +0200 Subject: libpcap: upgrade to 1.5.2 aclocal.patch was updated, still needed. Signed-off-by: Cristian Iorga Signed-off-by: Saul Wold --- .../libpcap/libpcap/aclocal.patch | 8 +++---- meta/recipes-connectivity/libpcap/libpcap_1.4.0.bb | 27 ---------------------- meta/recipes-connectivity/libpcap/libpcap_1.5.2.bb | 27 ++++++++++++++++++++++ 3 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 meta/recipes-connectivity/libpcap/libpcap_1.4.0.bb create mode 100644 meta/recipes-connectivity/libpcap/libpcap_1.5.2.bb (limited to 'meta/recipes-connectivity') diff --git a/meta/recipes-connectivity/libpcap/libpcap/aclocal.patch b/meta/recipes-connectivity/libpcap/libpcap/aclocal.patch index 469d122eeb..21519825c3 100644 --- a/meta/recipes-connectivity/libpcap/libpcap/aclocal.patch +++ b/meta/recipes-connectivity/libpcap/libpcap/aclocal.patch @@ -9,16 +9,16 @@ diff -ruN libpcap-1.1.1-orig/aclocal.m4 libpcap-1.1.1/aclocal.m4 dnl -AC_DEFUN(AC_LBL_C_INIT_BEFORE_CC, +AC_DEFUN([AC_LBL_C_INIT_BEFORE_CC], - [AC_PREREQ(2.50) + [ AC_BEFORE([$0], [AC_LBL_C_INIT]) AC_BEFORE([$0], [AC_PROG_CC]) @@ -90,7 +90,7 @@ - dnl ac_cv_lbl_gcc_vers - dnl LBL_CFLAGS + dnl LDFLAGS + dnl LBL_CFLAGS dnl -AC_DEFUN(AC_LBL_C_INIT, +AC_DEFUN([AC_LBL_C_INIT], - [AC_PREREQ(2.50) + [ AC_BEFORE([$0], [AC_LBL_FIXINCLUDES]) AC_BEFORE([$0], [AC_LBL_DEVEL]) @@ -217,7 +217,7 @@ diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.4.0.bb b/meta/recipes-connectivity/libpcap/libpcap_1.4.0.bb deleted file mode 100644 index 75a540ecb4..0000000000 --- a/meta/recipes-connectivity/libpcap/libpcap_1.4.0.bb +++ /dev/null @@ -1,27 +0,0 @@ -require libpcap.inc - -PR = "${INC_PR}.0" - -SRC_URI += "file://aclocal.patch \ - file://ieee80215-arphrd.patch \ - " - -SRC_URI[md5sum] = "56e88a5aabdd1e04414985ac24f7e76c" -SRC_URI[sha256sum] = "7c6a2a4f71e8ab09804e6b4fb3aff998c5583108ac42c0e2967eee8e1dbc7406" - -# -# make install doesn't cover the shared lib -# make install-shared is just broken (no symlinks) -# - -do_configure_prepend () { - #remove hardcoded references to /usr/include - sed 's|\([ "^'\''I]\+\)/usr/include/|\1${STAGING_INCDIR}/|g' -i ${S}/configure.in -} - -do_install_prepend () { - install -d ${D}${libdir} - install -d ${D}${bindir} - oe_runmake install-shared DESTDIR=${D} - oe_libinstall -a -so libpcap ${D}${libdir} -} diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.5.2.bb b/meta/recipes-connectivity/libpcap/libpcap_1.5.2.bb new file mode 100644 index 0000000000..37cc141c03 --- /dev/null +++ b/meta/recipes-connectivity/libpcap/libpcap_1.5.2.bb @@ -0,0 +1,27 @@ +require libpcap.inc + +PR = "${INC_PR}.0" + +SRC_URI += "file://aclocal.patch \ + file://ieee80215-arphrd.patch \ + " + +SRC_URI[md5sum] = "33ba2f10f3a402cb5d34f5e2a904794a" +SRC_URI[sha256sum] = "806d4ba23b126476d39a458ad1468f73dfe63c92f9586208f7e4e18c13e52ddd" + +# +# make install doesn't cover the shared lib +# make install-shared is just broken (no symlinks) +# + +do_configure_prepend () { + #remove hardcoded references to /usr/include + sed 's|\([ "^'\''I]\+\)/usr/include/|\1${STAGING_INCDIR}/|g' -i ${S}/configure.in +} + +do_install_prepend () { + install -d ${D}${libdir} + install -d ${D}${bindir} + oe_runmake install-shared DESTDIR=${D} + oe_libinstall -a -so libpcap ${D}${libdir} +} -- cgit 1.2.3-korg