From 089b57687af34c73058a00065ec1d056f428faa3 Mon Sep 17 00:00:00 2001 From: Stefan Tomanek Date: Sat, 8 Jul 2017 00:36:25 +0200 Subject: [PATCH 1/2] libnet-1.2.x: simplify build dep installation Install include files and libraries into a common place; this makes compiling depending packages easier. Signed-off-by: Stefan Tomanek --- libs/libnet-1.2.x/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/libnet-1.2.x/Makefile b/libs/libnet-1.2.x/Makefile index 84591f01d..c4ec90bfc 100644 --- a/libs/libnet-1.2.x/Makefile +++ b/libs/libnet-1.2.x/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libnet PKG_VERSION:=1.2-rc3 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://sourceforge.net/projects/libnet-dev/files/ @@ -53,14 +53,14 @@ endef define Build/InstallDev - $(INSTALL_DIR) $(STAGING_DIR)/usr/lib/libnet-1.2.x/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/libnet.h $(STAGING_DIR)/usr/lib/libnet-1.2.x/include + $(INSTALL_DIR) $(STAGING_DIR)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/libnet.h $(STAGING_DIR)/usr/include - $(INSTALL_DIR) $(STAGING_DIR)/usr/lib/libnet-1.2.x/include/libnet - $(CP) $(PKG_INSTALL_DIR)/usr/include/libnet/libnet-*.h $(STAGING_DIR)/usr/lib/libnet-1.2.x/include/libnet + $(INSTALL_DIR) $(STAGING_DIR)/usr/include/libnet + $(CP) $(PKG_INSTALL_DIR)/usr/include/libnet/libnet-*.h $(STAGING_DIR)/usr/include/libnet - $(INSTALL_DIR) $(STAGING_DIR)/usr/lib/libnet-1.2.x/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.{a,la,so*} $(STAGING_DIR)/usr/lib/libnet-1.2.x/lib + $(INSTALL_DIR) $(STAGING_DIR)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.{a,la,so*} $(STAGING_DIR)/usr/lib endef define Package/libnet-1.2.x/install From 56f5368abefbc1e3d58e1f291132a8687194565b Mon Sep 17 00:00:00 2001 From: Stefan Tomanek Date: Sat, 8 Jul 2017 00:36:25 +0200 Subject: [PATCH 2/2] netdiscover: use simplified libnet header location Use the common location for libnet include files and libraries. Signed-off-by: Stefan Tomanek --- net/netdiscover/Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/net/netdiscover/Makefile b/net/netdiscover/Makefile index 8002d8439..a17313f5f 100644 --- a/net/netdiscover/Makefile +++ b/net/netdiscover/Makefile @@ -30,10 +30,6 @@ define Package/netdiscover URL:=https://sourceforge.net/projects/netdiscover endef -CONFIGURE_VARS+= \ - CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/lib/libnet-1.2.x/lib" \ - LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/libnet-1.2.x/lib" - define Package/netdiscover/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/netdiscover $(1)/usr/sbin/