From db41562f4374547ccb98d1799f715003161fa6a6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 12 Jan 2014 03:07:51 +0100 Subject: [PATCH] libpcap: convert to new package format Signed-off-by: Stephan Raue --- packages/devel/libpcap/build | 41 --------------------- packages/devel/libpcap/{meta => package.mk} | 24 ++++++++++-- 2 files changed, 21 insertions(+), 44 deletions(-) delete mode 100755 packages/devel/libpcap/build rename packages/devel/libpcap/{meta => package.mk} (69%) diff --git a/packages/devel/libpcap/build b/packages/devel/libpcap/build deleted file mode 100755 index 7ae62ba8bb..0000000000 --- a/packages/devel/libpcap/build +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# OpenELEC is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC. If not, see . -################################################################################ - -. config/options $1 - -cd $BUILD/$1* - -# When cross-compiling, configure can't set linux version -# forcing it -sed -i -e 's/ac_cv_linux_vers=unknown/ac_cv_linux_vers=2/' configure - -LIBS="-lpthread" \ -ac_cv_header_libusb_1_0_libusb_h=no \ -./configure \ - --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --disable-shared \ - --with-pcap=linux \ - --disable-bluetooth \ - --disable-can \ - --disable-canusb \ - -$MAKEINSTALL diff --git a/packages/devel/libpcap/meta b/packages/devel/libpcap/package.mk similarity index 69% rename from packages/devel/libpcap/meta rename to packages/devel/libpcap/package.mk index 92415a0e14..034b8f5a42 100644 --- a/packages/devel/libpcap/meta +++ b/packages/devel/libpcap/package.mk @@ -23,12 +23,30 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.tcpdump.org/" PKG_URL="http://www.tcpdump.org/release/libpcap-${PKG_VERSION}.tar.gz" -PKG_DEPENDS="libusb" -PKG_BUILD_DEPENDS="toolchain libusb" +PKG_DEPENDS_TARGET="libusb" +PKG_BUILD_DEPENDS_TARGET="toolchain libusb" PKG_PRIORITY="optional" PKG_SECTION="devel" PKG_SHORTDESC="system interface for user-level packet capture" PKG_LONGDESC="libpcap (Packet CAPture) provides a portable framework for low-level network monitoring. Applications include network statistics collection, security monitoring, network debugging, etc." -PKG_IS_ADDON="no" +PKG_IS_ADDON="no" PKG_AUTORECONF="yes" + +PKG_CONFIGURE_OPTS_TARGET="LIBS=-lpthread \ + ac_cv_header_libusb_1_0_libusb_h=no \ + --disable-shared \ + --with-pcap=linux \ + --disable-bluetooth \ + --disable-can \ + --disable-canusb" + +pre_configure_target() { +# When cross-compiling, configure can't set linux version +# forcing it + sed -i -e 's/ac_cv_linux_vers=unknown/ac_cv_linux_vers=2/' ../configure +} + +post_makeinstall_target() { + rm -rf $INSTALL/usr/bin +}