packages: depend on libelf1 instead of libelf

Signed-off-by: Florian Fainelli <florian@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/packages@34905 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2012-12-28 09:42:41 +00:00
parent 61a3f0b49f
commit 583b452905
6 changed files with 8 additions and 11 deletions

View File

@ -20,7 +20,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/make define Package/make
SECTION:=devel SECTION:=devel
CATEGORY:=Development CATEGORY:=Development
DEPENDS:=+libelf DEPENDS:=+libelf1
TITLE:=make TITLE:=make
URL:=http://www.gnu.org/software/make/ URL:=http://www.gnu.org/software/make/
endef endef

View File

@ -38,7 +38,7 @@ define Package/libnetsnmp
$(call Package/net-snmp/Default) $(call Package/net-snmp/Default)
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
DEPENDS:=+libelf DEPENDS:=+libelf1
TITLE:=Open source SNMP implementation (libraries) TITLE:=Open source SNMP implementation (libraries)
endef endef
@ -78,7 +78,7 @@ endef
define Package/snmpd-static define Package/snmpd-static
$(call Package/net-snmp/Default) $(call Package/net-snmp/Default)
TITLE:=Open source SNMP implementation (daemon) TITLE:=Open source SNMP implementation (daemon)
DEPENDS:=+libelf DEPENDS:=+libelf1
endef endef
define Package/snmpd-static/description define Package/snmpd-static/description

View File

@ -17,7 +17,7 @@ PKG_MD5SUM:=00df80a84ec9528fcfb09498075525bc
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
PKG_BUILD_DEPENDS:=libelf PKG_BUILD_DEPENDS:=libelf1
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
PKG_LIBTOOL_PATHS:=. sntp PKG_LIBTOOL_PATHS:=. sntp
@ -117,9 +117,6 @@ define Package/ntpd/conffiles
/etc/ntp.conf /etc/ntp.conf
endef endef
TARGET_CPPFLAGS += \
-I$(STAGING_DIR)/usr/include/libelf
CONFIGURE_VARS += \ CONFIGURE_VARS += \
ac_cv_header_md5_h=no \ ac_cv_header_md5_h=no \
ac_cv_lib_rt_sched_setscheduler=no \ ac_cv_lib_rt_sched_setscheduler=no \

View File

@ -25,7 +25,7 @@ define Package/pure-ftpd/Default
SUBMENU:=File Transfer SUBMENU:=File Transfer
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
DEPENDS:=+libelf DEPENDS:=+libelf1
TITLE:=Secure FTP made easy! TITLE:=Secure FTP made easy!
URL:=http://www.pureftpd.org/project/pure-ftpd URL:=http://www.pureftpd.org/project/pure-ftpd
endef endef

View File

@ -20,7 +20,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/at define Package/at
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
DEPENDS:=+libelf DEPENDS:=+libelf1
TITLE:=Delayed job execution and batch processing TITLE:=Delayed job execution and batch processing
URL:=http://packages.debian.org/stable/at URL:=http://packages.debian.org/stable/at
MAINTAINER:=Luka Perkov <openwrt@lukaperkov.net> MAINTAINER:=Luka Perkov <openwrt@lukaperkov.net>
@ -32,7 +32,7 @@ define Package/at/description
endef endef
export SENDMAIL=/bin/true export SENDMAIL=/bin/true
EXTRA_CFLAGS:=-DNEED_YYWRAP -I$(PKG_BUILD_DIR) -I$(STAGING_DIR)/usr/include/libelf \ EXTRA_CFLAGS:=-DNEED_YYWRAP -I$(PKG_BUILD_DIR) \
$(TARGET_LDFLAGS) $(TARGET_LDFLAGS)
CONFIGURE_ARGS+=--prefix=/usr \ CONFIGURE_ARGS+=--prefix=/usr \

View File

@ -33,7 +33,7 @@ COREUTILS_APPLETS := \
DEPENDS_sort = +libpthread DEPENDS_sort = +libpthread
DEPENDS_timeout = +librt DEPENDS_timeout = +librt
DEPENDS_uptime = +libelf DEPENDS_uptime = +libelf1
DEPENDS_expr = +libgmp DEPENDS_expr = +libgmp
DEPENDS_factor = +libgmp DEPENDS_factor = +libgmp