Changeset 15835


Ignore:
Timestamp:
2009-05-14T09:13:06+02:00 (9 years ago)
Author:
agb
Message:

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

Location:
packages
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • packages/Xorg/lib/gtk2/Makefile

    r15480 r15835  
    122122endef 
    123123 
    124 $(eval $(call BuildPackage,gtk2)) 
    125 $(eval $(call BuildPackage,gtk2-cups)) 
    126124$(eval $(call RequireCommand,gdk-pixbuf-csource, \ 
    127125        Please install gtk2.0-dev \ 
    128126)) 
     127 
     128$(eval $(call BuildPackage,gtk2)) 
     129$(eval $(call BuildPackage,gtk2-cups)) 
     130 
  • packages/Xorg/lib/vte/Makefile

    r15244 r15835  
    11# 
    2 # Copyright (C) 2008 OpenWrt.org 
     2# Copyright (C) 2008-2009 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    104104endef 
    105105 
     106$(eval $(call RequireCommand,intltool-update, \ 
     107    $(PKG_NAME) requires intltool >= 0.35.0 \ 
     108)) 
     109 
    106110$(eval $(call BuildPackage,vte)) 
    107111$(eval $(call BuildPackage,python-vte)) 
    108112 
    109 $(eval $(call RequireCommand,intltool-update, \ 
    110     $(PKG_NAME) requires intltool >= 0.35.0 \ 
    111 )) 
  • packages/Xorg/xorg/font/font-misc-misc/Makefile

    r13294 r15835  
    1 #  
    2 # Copyright (C) 2007 OpenWrt.org 
     1# 
     2# Copyright (C) 2007-2009 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    2727  $(call Package/font-misc-misc/Default) 
    2828  DEPENDS:=+xserver +font-util @DISPLAY_SUPPORT 
    29   TITLE:=font-base  
     29  TITLE:=font-base 
    3030  URL:=http://xorg.freedesktop.org/ 
    3131endef 
     
    3434  $(call Package/font-misc-misc/Default) 
    3535  DEPENDS:=font-base 
    36   TITLE:=font-misc-misc  
     36  TITLE:=font-misc-misc 
    3737  URL:=http://xorg.freedesktop.org/ 
    3838endef 
     
    4545        DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install 
    4646        find $(PKG_INSTALL_DIR) -name fonts.dir | \ 
    47                 xargs rm   
     47                xargs rm 
    4848endef 
    4949 
     
    121121endef 
    122122 
    123 $(eval $(call BuildPackage,font-misc-misc)) 
    124 $(eval $(call BuildPackage,font-base)) 
    125  
    126123# FIXME: replace with native versions 
    127124$(eval $(call RequireCommand,mkfontscale, \ 
     
    132129)) 
    133130 
     131$(eval $(call BuildPackage,font-misc-misc)) 
     132$(eval $(call BuildPackage,font-base)) 
     133 
     134 
  • packages/lang/numpy/Makefile

    r14760 r15835  
    11# 
    2 # Copyright (C) 2008 OpenWrt.org 
     2# Copyright (C) 2008-2009 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    4040endef 
    4141 
    42 $(eval $(call BuildPackage,numpy)) 
    43  
    4442define Require/python25-dev 
    4543[ -e /usr/include/python2.5/pyconfig.h ] 
     
    4947        Please install Python 2.5 (including development headers and libraries) \ 
    5048)) 
     49 
     50$(eval $(call BuildPackage,numpy)) 
     51 
  • packages/lang/perl/Makefile

    r15480 r15835  
    185185endef 
    186186 
    187 $(eval $(call BuildPackage,microperl)) 
    188 $(eval $(call BuildPackage,perl)) 
    189  
    190187$(eval $(call RequireCommand,rsync, \ 
    191188        $(PKG_NAME) requires rsync installed on the host-system. \ 
    192189)) 
    193190 
     191$(eval $(call BuildPackage,microperl)) 
     192$(eval $(call BuildPackage,perl)) 
     193 
    194194-include perlbase.mk 
  • packages/lang/ruby/Makefile

    r15813 r15835  
    11# 
    2 # Copyright (C) 2006-2008 OpenWrt.org 
     2# Copyright (C) 2006-2009 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    269269                $(1)/usr/lib/ruby/1.8/yaml \ 
    270270                $(1)/usr/lib/ruby/1.8/yaml.rb \ 
    271                 $(1)/usr/lib/ruby/1.8/*/syck.so \ 
    272                  
     271                $(1)/usr/lib/ruby/1.8/*/syck.so 
     272 
    273273        find $(1) -name '*.h' | xargs rm -f 
    274274endef 
     
    411411        ) | ( cd $(1); $(TAR) -xf - ) 
    412412endef 
     413 
     414$(eval $(call RequireCommand,ruby, \ 
     415        $(PKG_NAME) requires ruby installed on the host-system. \ 
     416)) 
    413417 
    414418$(eval $(call BuildPackage,ruby)) 
     
    435439$(eval $(call BuildPackage,ruby-zlib)) 
    436440 
    437 $(eval $(call RequireCommand,ruby, \ 
    438         $(PKG_NAME) requires ruby installed on the host-system. \ 
    439 )) 
    440  
  • packages/lang/sablevm-sdk/Makefile

    r15247 r15835  
    11# 
    2 # Copyright (C) 2006,2007 OpenWrt.org 
     2# Copyright (C) 2006-2009 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    8585endef 
    8686 
    87 define Build/Compile     
     87define Build/Compile 
    8888        $(MAKE) -C $(PKG_BUILD_DIR) \ 
    8989                EARLY_CONFIGURE= \ 
     
    127127endef 
    128128 
    129 $(eval $(call BuildPackage,sablevm)) 
    130 $(eval $(call BuildPackage,sablevm-mini)) 
    131  
    132129$(foreach command, jikes fastjar, \ 
    133130  $(eval $(call RequireCommand,$(command), \ 
     
    136133) 
    137134 
     135$(eval $(call BuildPackage,sablevm)) 
     136$(eval $(call BuildPackage,sablevm-mini)) 
     137 
  • packages/lang/telepathy-python/Makefile

    r15247 r15835  
    11# 
    2 # Copyright (C) 2008 OpenWrt.org 
     2# Copyright (C) 2008-2009 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    4242endef 
    4343 
    44 $(eval $(call BuildPackage,telepathy-python)) 
    45  
    4644$(eval $(call RequireCommand,xsltproc, \ 
    4745        $(PKG_NAME) requires xsltproc installed on the host-system. \ 
    4846)) 
     47 
     48$(eval $(call BuildPackage,telepathy-python)) 
     49 
  • packages/libs/avahi/Makefile

    r15609 r15835  
    11# 
    2  
    3 # Copyright (C) 2007 OpenWrt.org 
     2# Copyright (C) 2007-2009 OpenWrt.org 
    43# 
    54# This is free software, licensed under the GNU General Public License v2. 
     
    4948 
    5049define Package/libavahi/description 
    51 $(call Package/avahi/Default/description)  
     50$(call Package/avahi/Default/description) 
    5251 . 
    5352 This package contains the mDNS/DNS-SD shared libraries, used by other programs. 
     
    199198endef 
    200199 
     200$(eval $(call RequireCommand,intltool-update, \ 
     201        $(PKG_NAME) requires intltool >= 0.35.0 \ 
     202)) 
     203 
    201204$(eval $(call BuildPackage,libavahi)) 
    202205$(eval $(call BuildPackage,avahi-autoipd)) 
     
    204207$(eval $(call BuildPackage,avahi-dnsconfd)) 
    205208 
    206 $(eval $(call RequireCommand,intltool-update, \ 
    207         $(PKG_NAME) requires intltool >= 0.35.0 \ 
    208 )) 
    209  
  • packages/libs/popt/Makefile

    r15247 r15835  
    11# 
    2 # Copyright (C) 2006 OpenWrt.org 
     2# Copyright (C) 2006-2009 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    5252endef 
    5353 
    54 $(eval $(call BuildPackage,libpopt)) 
    55  
    5654$(eval $(call RequireCommand,xgettext, \ 
    5755        $(PKG_NAME) requires the GNU gettext development package installed on the local system to build. \ 
    5856)) 
     57 
     58$(eval $(call BuildPackage,libpopt)) 
     59 
  • packages/net/nrpe/Makefile

    r12142 r15835  
    11# 
    2 # Copyright (C) 2007 OpenWrt.org 
     2# Copyright (C) 2007-2009 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    8585endef 
    8686 
    87 $(eval $(call BuildPackage,nrpe)) 
    88  
    8987$(eval $(call RequireCommand,openssl, \ 
    9088        $(PKG_NAME) requires openssl installed on the host-system. \ 
    9189)) 
    9290 
     91$(eval $(call BuildPackage,nrpe)) 
     92 
  • packages/net/squid/Makefile

    r15480 r15835  
    128128        --enable-external-acl-helpers="ip_user unix_group" \ 
    129129        --enable-epoll \ 
    130         --with-maxfd=4096 \ 
    131          
     130        --with-maxfd=4096 
     131 
    132132CONFIGURE_VARS += \ 
    133133        ac_cv_header_linux_netfilter_ipv4_h=yes \ 
     
    169169endef 
    170170 
     171$(eval $(call RequireHeader,/usr/include/openssl/ssl.h, \ 
     172        $(PKG_NAME) requires the openssl development (named like libssl-dev, \ 
     173        depending of your package manager) package be installed on the host-system. \ 
     174)) 
     175 
    171176$(eval $(call BuildPackage,squid)) 
    172177$(eval $(call BuildPackage,squid-mod-cachemgr)) 
     
    180185$(eval $(call BuildPlugin,squid-mod-ntlm-auth-smb-auth,ntlm_auth)) 
    181186 
    182 $(eval $(call RequireHeader,/usr/include/openssl/ssl.h, \ 
    183         $(PKG_NAME) requires the openssl development (named like libssl-dev, \ 
    184         depending of your package manager) package be installed on the host-system. \ 
    185 )) 
  • packages/utils/firmwarehotplug/Makefile

    r15247 r15835  
    1 #  
    2 # Copyright (C) 2006 OpenWrt.org 
     1# 
     2# Copyright (C) 2006-2009 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    4949endef 
    5050 
    51 $(eval $(call BuildPackage,firmwarehotplug)) 
    52  
    5351define Require/working-sdcc 
    5452        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 
     
    6462        installing the non-free version. \ 
    6563)) 
     64 
     65$(eval $(call BuildPackage,firmwarehotplug)) 
     66 
  • packages/utils/lilo/Makefile

    r15247 r15835  
    1 #  
    2 # Copyright (C) 2006 OpenWrt.org 
     1# 
     2# Copyright (C) 2006-2009 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    4242endef 
    4343 
    44 $(eval $(call BuildPackage,lilo)) 
    45  
    4644$(foreach command, as86 ld86, \ 
    4745  $(eval $(call RequireCommand,$(command), \ 
     
    4947  )) \ 
    5048) 
     49 
     50$(eval $(call BuildPackage,lilo)) 
     51 
Note: See TracChangeset for help on using the changeset viewer.