aboutsummaryrefslogtreecommitdiffstats
path: root/package/libpcap
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2005-04-18 22:21:01 +0000
committerNicolas Thill <nico@openwrt.org>2005-04-18 22:21:01 +0000
commitcfcad6a2be7764e86699856c2ff5c7b681b53796 (patch)
tree1faa6a47d66a57de635f98815c41e5cbe8990d1d /package/libpcap
parentfd307250a0f0dffe68b1dbb2a6cbec25837c4f71 (diff)
downloadupstream-cfcad6a2be7764e86699856c2ff5c7b681b53796.tar.gz
upstream-cfcad6a2be7764e86699856c2ff5c7b681b53796.tar.bz2
upstream-cfcad6a2be7764e86699856c2ff5c7b681b53796.zip
Change libpcap, uniformize package makefile, put back control file in ./ipkg
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@682 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/libpcap')
-rw-r--r--package/libpcap/Makefile56
-rw-r--r--package/libpcap/ipkg/libpcap.control (renamed from package/libpcap/libpcap.control)0
2 files changed, 28 insertions, 28 deletions
diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index 974d9afc48..0a0e5181f8 100644
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -29,37 +29,37 @@ $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
touch $(PKG_BUILD_DIR)/.prepared
$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
- (cd $(PKG_BUILD_DIR); rm -rf config.cache config.status; \
+ (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
ac_cv_linux_vers=$(BR2_DEFAULT_KERNEL_HEADERS) \
./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --program-prefix="" \
- --program-suffix="" \
- --prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --datadir=/usr/share \
- --includedir=/usr/include \
- --infodir=/usr/share/info \
- --libdir=/usr/lib \
- --libexecdir=/usr/lib \
- --localstatedir=/var \
- --mandir=/usr/share/man \
- --sbindir=/usr/sbin \
- --sysconfdir=/etc \
- $(DISABLE_NLS) \
- $(DISABLE_LARGEFILE) \
- --enable-shared \
- --enable-static \
- --disable-yydebug \
- --with-build-cc=$(HOSTCC) \
- --with-pcap=linux \
+ --target=$(GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --program-prefix="" \
+ --program-suffix="" \
+ --prefix=/usr \
+ --exec-prefix=/usr \
+ --bindir=/usr/bin \
+ --datadir=/usr/share \
+ --includedir=/usr/include \
+ --infodir=/usr/share/info \
+ --libdir=/usr/lib \
+ --libexecdir=/usr/lib \
+ --localstatedir=/var \
+ --mandir=/usr/share/man \
+ --sbindir=/usr/sbin \
+ --sysconfdir=/etc \
+ $(DISABLE_NLS) \
+ $(DISABLE_LARGEFILE) \
+ --enable-shared \
+ --enable-static \
+ --disable-yydebug \
+ --with-build-cc=$(HOSTCC) \
+ --with-pcap=linux \
);
touch $(PKG_BUILD_DIR)/.configured
@@ -74,10 +74,10 @@ $(STAGING_DIR)/usr/lib/libpcap.so: $(PKG_BUILD_DIR)/.built
install
$(IPKG_LIBPCAP): $(STAGING_DIR)/usr/lib/libpcap.so
- $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBPCAP) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
- mkdir -p $(IDIR_LIBPCAP)/usr/lib
+ $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBPCAP) ./ipkg/$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+ install -m0755 -d $(IDIR_LIBPCAP)/usr/lib
cp -fpR $(STAGING_DIR)/usr/lib/libpcap.so.* $(IDIR_LIBPCAP)/usr/lib/
- $(STRIP) $(IDIR_LIBPCAP)/usr/lib/lib*.so*
+ $(RSTRIP) $(IDIR_LIBPCAP)
mkdir -p $(PACKAGE_DIR)
$(IPKG_BUILD) $(IDIR_LIBPCAP) $(PACKAGE_DIR)
diff --git a/package/libpcap/libpcap.control b/package/libpcap/ipkg/libpcap.control
index 4251be8090..4251be8090 100644
--- a/package/libpcap/libpcap.control
+++ b/package/libpcap/ipkg/libpcap.control