fix libnetfilter-queue: libtool linking libnetfilter-libipq with the host libc, cleanup

git-svn-id: svn://svn.openwrt.org/openwrt/packages@13976 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2009-01-11 04:37:43 +00:00
parent 8e3921434f
commit 07491d244f

View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2007-2008 OpenWrt.org # Copyright (C) 2007-2009 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -37,15 +37,15 @@ TARGET_CFLAGS += $(FPIC)
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--enable-static \ --enable-static \
--enable-shared \ --enable-shared \
CONFIGURE_VARS += \
LIBNFNETLINK_CFLAGS="-I$(STAGING_DIR)/usr/include" \ LIBNFNETLINK_CFLAGS="-I$(STAGING_DIR)/usr/include" \
LIBNFNETLINK_LIBS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" LIBNFNETLINK_LIBS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib"
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) all
CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \ $(call libtool_fixup_libdir)
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -lc -L$(TOOLCHAIN_DIR)/lib" \ $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
DESTDIR="$(PKG_INSTALL_DIR)" \
all install
endef endef
@ -68,7 +68,7 @@ endef
define Package/libnetfilter-queue/install define Package/libnetfilter-queue/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetfilter_queue*.so* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetfilter_queue*.so.* $(1)/usr/lib/
endef endef
$(eval $(call BuildPackage,libnetfilter-queue)) $(eval $(call BuildPackage,libnetfilter-queue))