bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] Require* calls must now be placed before BuildPackage calls

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@15835 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
agb 2009-05-14 07:13:06 +00:00
parent 38a63190fa
commit b5c97c27ea
14 changed files with 71 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Xorg/lib/gtk2/Makefile
View File

@ -121,8 +121,10 @@ define Package/gtk2-cups/install
$(1)/usr/lib/gtk-2.0/2.10.0/printbackends/
endef
$(eval $(call BuildPackage,gtk2))
$(eval $(call BuildPackage,gtk2-cups))
$(eval $(call RequireCommand,gdk-pixbuf-csource, \
Please install gtk2.0-dev \
))
$(eval $(call BuildPackage,gtk2))
$(eval $(call BuildPackage,gtk2-cups))

9
Xorg/lib/vte/Makefile
View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2008 OpenWrt.org
# Copyright (C) 2008-2009 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@ -103,9 +103,10 @@ define Package/python-vte/install
$(1)$(PYTHON_PKG_DIR)/gtk-2.0
endef
$(eval $(call BuildPackage,vte))
$(eval $(call BuildPackage,python-vte))
$(eval $(call RequireCommand,intltool-update, \
$(PKG_NAME) requires intltool >= 0.35.0 \
))
$(eval $(call BuildPackage,vte))
$(eval $(call BuildPackage,python-vte))

17
Xorg/xorg/font/font-misc-misc/Makefile
View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2007 OpenWrt.org
#
# Copyright (C) 2007-2009 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@ -26,14 +26,14 @@ endef
define Package/font-base
$(call Package/font-misc-misc/Default)
DEPENDS:=+xserver +font-util @DISPLAY_SUPPORT
TITLE:=font-base
TITLE:=font-base
URL:=http://xorg.freedesktop.org/
endef
define Package/font-misc-misc
$(call Package/font-misc-misc/Default)
DEPENDS:=font-base
TITLE:=font-misc-misc
TITLE:=font-misc-misc
URL:=http://xorg.freedesktop.org/
endef
@ -44,7 +44,7 @@ define Build/Compile
UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
find $(PKG_INSTALL_DIR) -name fonts.dir | \
xargs rm
xargs rm
endef
define Build/Configure
@ -120,9 +120,6 @@ if [ ! -z $${FILE_NEW} ]; then
fi
endef
$(eval $(call BuildPackage,font-misc-misc))
$(eval $(call BuildPackage,font-base))
# FIXME: replace with native versions
$(eval $(call RequireCommand,mkfontscale, \
Please install mkfontscale (usually in xfonts-utils) \
@ -131,3 +128,7 @@ $(eval $(call RequireCommand,mkfontdir, \
Please install mkfontdir (usually in xfonts-utils) \
))
$(eval $(call BuildPackage,font-misc-misc))
$(eval $(call BuildPackage,font-base))

7
lang/numpy/Makefile
View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2008 OpenWrt.org
# Copyright (C) 2008-2009 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@ -39,8 +39,6 @@ define Package/numpy/install
cp -r $(PKG_INSTALL_DIR)/* $(1)
endef
$(eval $(call BuildPackage,numpy))
define Require/python25-dev
[ -e /usr/include/python2.5/pyconfig.h ]
endef
@ -48,3 +46,6 @@ endef
$(eval $(call Require,python25-dev, \
Please install Python 2.5 (including development headers and libraries) \
))
$(eval $(call BuildPackage,numpy))

6
lang/perl/Makefile
View File

@ -184,11 +184,11 @@ endef
define Build/Compile
endef
$(eval $(call BuildPackage,microperl))
$(eval $(call BuildPackage,perl))
$(eval $(call RequireCommand,rsync, \
$(PKG_NAME) requires rsync installed on the host-system. \
))
$(eval $(call BuildPackage,microperl))
$(eval $(call BuildPackage,perl))
-include perlbase.mk

14
lang/ruby/Makefile
View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2006-2008 OpenWrt.org
# Copyright (C) 2006-2009 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@ -268,8 +268,8 @@ define Package/ruby-core/install
\
$(1)/usr/lib/ruby/1.8/yaml \
$(1)/usr/lib/ruby/1.8/yaml.rb \
$(1)/usr/lib/ruby/1.8/*/syck.so \
$(1)/usr/lib/ruby/1.8/*/syck.so
find $(1) -name '*.h' | xargs rm -f
endef
@ -411,6 +411,10 @@ define Package/ruby-zlib/install
) | ( cd $(1); $(TAR) -xf - )
endef
$(eval $(call RequireCommand,ruby, \
$(PKG_NAME) requires ruby installed on the host-system. \
))
$(eval $(call BuildPackage,ruby))
$(eval $(call BuildPackage,libruby))
$(eval $(call BuildPackage,ruby-core))
@ -434,7 +438,3 @@ $(eval $(call BuildPackage,ruby-xsd))
$(eval $(call BuildPackage,ruby-yaml))
$(eval $(call BuildPackage,ruby-zlib))
$(eval $(call RequireCommand,ruby, \
$(PKG_NAME) requires ruby installed on the host-system. \
))

10
lang/sablevm-sdk/Makefile
View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2006,2007 OpenWrt.org
# Copyright (C) 2006-2009 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@ -84,7 +84,7 @@ define Build/Configure
)
endef
define Build/Compile
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
EARLY_CONFIGURE= \
EXTRA_CONFIGURE= \
@ -126,12 +126,12 @@ define Package/sablevm-mini/install
$(1)/usr/share/sablevm/examples/
endef
$(eval $(call BuildPackage,sablevm))
$(eval $(call BuildPackage,sablevm-mini))
$(foreach command, jikes fastjar, \
$(eval $(call RequireCommand,$(command), \
$(PKG_NAME) requires $(command). \
)) \
)
$(eval $(call BuildPackage,sablevm))
$(eval $(call BuildPackage,sablevm-mini))

7
lang/telepathy-python/Makefile
View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2008 OpenWrt.org
# Copyright (C) 2008-2009 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@ -41,8 +41,9 @@ define Package/telepathy-python/install
$(1)$(PYTHON_PKG_DIR)
endef
$(eval $(call BuildPackage,telepathy-python))
$(eval $(call RequireCommand,xsltproc, \
$(PKG_NAME) requires xsltproc installed on the host-system. \
))
$(eval $(call BuildPackage,telepathy-python))

13
libs/avahi/Makefile
View File

@ -1,6 +1,5 @@
#
# Copyright (C) 2007 OpenWrt.org
# Copyright (C) 2007-2009 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@ -48,7 +47,7 @@ define Package/libavahi
endef
define Package/libavahi/description
$(call Package/avahi/Default/description)
$(call Package/avahi/Default/description)
.
This package contains the mDNS/DNS-SD shared libraries, used by other programs.
endef
@ -198,12 +197,12 @@ define Package/avahi-dnsconfd/install
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/avahi-dnsconfd $(1)/usr/sbin/
endef
$(eval $(call RequireCommand,intltool-update, \
$(PKG_NAME) requires intltool >= 0.35.0 \
))
$(eval $(call BuildPackage,libavahi))
$(eval $(call BuildPackage,avahi-autoipd))
$(eval $(call BuildPackage,avahi-daemon))
$(eval $(call BuildPackage,avahi-dnsconfd))
$(eval $(call RequireCommand,intltool-update, \
$(PKG_NAME) requires intltool >= 0.35.0 \
))

7
libs/popt/Makefile
View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2006 OpenWrt.org
# Copyright (C) 2006-2009 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@ -51,8 +51,9 @@ define Package/libpopt/install
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpopt.so.* $(1)/usr/lib/
endef
$(eval $(call BuildPackage,libpopt))
$(eval $(call RequireCommand,xgettext, \
$(PKG_NAME) requires the GNU gettext development package installed on the local system to build. \
))
$(eval $(call BuildPackage,libpopt))

6
net/nrpe/Makefile
View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2007 OpenWrt.org
# Copyright (C) 2007-2009 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@ -84,9 +84,9 @@ define Package/nrpe/install
$(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
endef
$(eval $(call BuildPackage,nrpe))
$(eval $(call RequireCommand,openssl, \
$(PKG_NAME) requires openssl installed on the host-system. \
))
$(eval $(call BuildPackage,nrpe))

13
net/squid/Makefile
View File

@ -127,8 +127,8 @@ CONFIGURE_ARGS += \
--enable-digest-auth-helpers="password" \
--enable-external-acl-helpers="ip_user unix_group" \
--enable-epoll \
--with-maxfd=4096 \
--with-maxfd=4096
CONFIGURE_VARS += \
ac_cv_header_linux_netfilter_ipv4_h=yes \
@ -168,6 +168,11 @@ define Package/squid-mod-cachemgr/install
$(CP) $(PKG_INSTALL_DIR)/usr/lib/squid/cachemgr.cgi $(1)/www/cgi-bin/
endef
$(eval $(call RequireHeader,/usr/include/openssl/ssl.h, \
$(PKG_NAME) requires the openssl development (named like libssl-dev, \
depending of your package manager) package be installed on the host-system. \
))
$(eval $(call BuildPackage,squid))
$(eval $(call BuildPackage,squid-mod-cachemgr))
$(eval $(call BuildPlugin,squid-mod-basic-auth-getpwnam,getpwname_auth))
@ -179,7 +184,3 @@ $(eval $(call BuildPlugin,squid-mod-external-acl-unix-group,squid_unix_group))
$(eval $(call BuildPlugin,squid-mod-ntlm-auth-fakeauth,fakeauth_auth))
$(eval $(call BuildPlugin,squid-mod-ntlm-auth-smb-auth,ntlm_auth))
$(eval $(call RequireHeader,/usr/include/openssl/ssl.h, \
$(PKG_NAME) requires the openssl development (named like libssl-dev, \
depending of your package manager) package be installed on the host-system. \
))

9
utils/firmwarehotplug/Makefile
View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2006 OpenWrt.org
#
# Copyright (C) 2006-2009 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@ -48,8 +48,6 @@ define Package/firmwarehotplug/install
install -m644 $(PKG_BUILD_DIR)/ezusb/midi/original/ezusbmidi2x2.ihx $(1)/usr/share/usb/ezusbmidi
endef
$(eval $(call BuildPackage,firmwarehotplug))
define Require/working-sdcc
sdcc -v 2>&1 | awk '($$$$1 == "SDCC") && ($$$$3 == "mcs51/gbz80/z80/avr/ds390/pic16/pic14/TININative/xa51/ds400/hc08") { print "ok" }' | grep ok > /dev/null
endef
@ -63,3 +61,6 @@ $(eval $(call Require,working-sdcc, \
mcs51/gbz80/z80/avr/ds390/pic16/pic14/TININative/xa51/ds400/hc08. You might consider \
installing the non-free version. \
))
$(eval $(call BuildPackage,firmwarehotplug))

9
utils/lilo/Makefile
View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2006 OpenWrt.org
#
# Copyright (C) 2006-2009 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@ -41,10 +41,11 @@ define Package/lilo/install
$(CP) ./files/boot.msg $(1)/etc/
endef
$(eval $(call BuildPackage,lilo))
$(foreach command, as86 ld86, \
$(eval $(call RequireCommand,$(command), \
$(PKG_NAME) requires $(command). \
)) \
)
$(eval $(call BuildPackage,lilo))