Change libpcap, uniformize package makefile, put back control file in ./ipkg

SVN-Revision: 682
owl
Nicolas Thill 2005-04-18 22:21:01 +00:00
parent f774dee355
commit 1bc4a3a552
2 changed files with 28 additions and 28 deletions

View File

@ -29,37 +29,37 @@ $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
touch $(PKG_BUILD_DIR)/.prepared touch $(PKG_BUILD_DIR)/.prepared
$(PKG_BUILD_DIR)/.configured: $(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) \ $(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \ CFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
ac_cv_linux_vers=$(BR2_DEFAULT_KERNEL_HEADERS) \ ac_cv_linux_vers=$(BR2_DEFAULT_KERNEL_HEADERS) \
./configure \ ./configure \
--target=$(GNU_TARGET_NAME) \ --target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \ --build=$(GNU_HOST_NAME) \
--program-prefix="" \ --program-prefix="" \
--program-suffix="" \ --program-suffix="" \
--prefix=/usr \ --prefix=/usr \
--exec-prefix=/usr \ --exec-prefix=/usr \
--bindir=/usr/bin \ --bindir=/usr/bin \
--datadir=/usr/share \ --datadir=/usr/share \
--includedir=/usr/include \ --includedir=/usr/include \
--infodir=/usr/share/info \ --infodir=/usr/share/info \
--libdir=/usr/lib \ --libdir=/usr/lib \
--libexecdir=/usr/lib \ --libexecdir=/usr/lib \
--localstatedir=/var \ --localstatedir=/var \
--mandir=/usr/share/man \ --mandir=/usr/share/man \
--sbindir=/usr/sbin \ --sbindir=/usr/sbin \
--sysconfdir=/etc \ --sysconfdir=/etc \
$(DISABLE_NLS) \ $(DISABLE_NLS) \
$(DISABLE_LARGEFILE) \ $(DISABLE_LARGEFILE) \
--enable-shared \ --enable-shared \
--enable-static \ --enable-static \
--disable-yydebug \ --disable-yydebug \
--with-build-cc=$(HOSTCC) \ --with-build-cc=$(HOSTCC) \
--with-pcap=linux \ --with-pcap=linux \
); );
touch $(PKG_BUILD_DIR)/.configured touch $(PKG_BUILD_DIR)/.configured
@ -74,10 +74,10 @@ $(STAGING_DIR)/usr/lib/libpcap.so: $(PKG_BUILD_DIR)/.built
install install
$(IPKG_LIBPCAP): $(STAGING_DIR)/usr/lib/libpcap.so $(IPKG_LIBPCAP): $(STAGING_DIR)/usr/lib/libpcap.so
$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBPCAP) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBPCAP) ./ipkg/$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
mkdir -p $(IDIR_LIBPCAP)/usr/lib install -m0755 -d $(IDIR_LIBPCAP)/usr/lib
cp -fpR $(STAGING_DIR)/usr/lib/libpcap.so.* $(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) mkdir -p $(PACKAGE_DIR)
$(IPKG_BUILD) $(IDIR_LIBPCAP) $(PACKAGE_DIR) $(IPKG_BUILD) $(IDIR_LIBPCAP) $(PACKAGE_DIR)