Changeset 3841


Ignore:
Timestamp:
2006-05-30T19:09:21+02:00 (10 years ago)
Author:
nbd
Message:

add proper build depends

Location:
branches/buildroot-ng/openwrt
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/buildroot-ng/openwrt/package/Makefile

    r3786 r3841  
    2121 
    2222 
    23 .pkgdeps: $(TOPDIR)/.pkginfo FORCE 
     23.pkgdeps: $(TOPDIR)/.pkginfo 
    2424        @$(TOPDIR)/scripts/gen_deps.pl < $< > $@ || rm -f $@ 
    2525 
  • branches/buildroot-ng/openwrt/package/ppp/Makefile

    r3826 r3841  
    66PKG_VERSION:=2.4.3 
    77PKG_RELEASE:=7 
     8PKG_BUILDDEP:=libpcap 
    89 
    910PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) 
     
    2021 SECTION:=net 
    2122 CATEGORY:=Network 
    22  NEEDS:=libpcap 
    2323 MENU:=1 
    2424 DEFAULT:=y 
  • branches/buildroot-ng/openwrt/package/rules.mk

    r3831 r3841  
    5050  CATEGORY:=Extra packages 
    5151  DEPENDS:= 
    52   NEEDS:= 
    5352  MAINTAINER:=OpenWrt Developers Team <openwrt-devel@openwrt.org> 
    5453  SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd}) 
     
    9392 
    9493  IDEPEND_$(1):=$$(strip $$(DEPENDS)) 
    95   INEED_$(1):=$$(strip $$(NEEDS)) 
    9694 
    9795  DUMPINFO += \ 
     
    111109        echo "Version: $(VERSION)"; \ 
    112110        echo "Depends: $$(IDEPEND_$(1))"; \ 
    113         echo "Needs: $$(INEED_$(1))"; \ 
     111        echo "Build-Depends: $(PKG_BUILDDEP)"; \ 
    114112        echo "Category: $(CATEGORY)"; \ 
    115113        echo "Title: $(TITLE)"; \ 
     
    135133        echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control 
    136134        echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control 
    137         #FIXME: there should be a better way to do it 
    138         D="$$(IDEPEND_$(1))"; D="$$$${D}$$$${D:+, }$$(INEED_$(1))"; echo "Depends: $$$${D}" >> $$(IDIR_$(1))/CONTROL/control 
     135        echo "Depends: $$(IDEPEND_$(1))" >> $$(IDIR_$(1))/CONTROL/control 
    139136        echo "Source: $(SOURCE)" >> $$(IDIR_$(1))/CONTROL/control 
    140137        echo "Section: $(SECTION)" >> $$(IDIR_$(1))/CONTROL/control 
     
    156153  $$(INFO_$(1)): $$(IPKG_$(1)) 
    157154        $(IPKG) install $$(IPKG_$(1)) 
    158  
    159   compile-targets: $(PKG_BUILD_DIR)/.dev-installed 
    160155 
    161156  $(1)-clean: 
     
    260255  configure: $(PKG_BUILD_DIR)/.configured 
    261256 
    262   compile-targets: 
     257  compile-targets: $(PKG_BUILD_DIR)/.dev-installed 
    263258  compile: compile-targets 
    264259 
  • branches/buildroot-ng/openwrt/scripts/gen_deps.pl

    r3786 r3841  
    1919                $pkg{$name}->{src} = $src; 
    2020        }; 
    21         $line =~ /^Depends: \s*(.+)\s*$/ and do { 
    22                 my @dep = split /,\s*/, $1; 
     21        $line =~ /^(Build-)?Depends: \s*(.+)\s*$/ and do { 
     22                my @dep = split /,\s*/, $2; 
    2323                $pkg{$name}->{depends} = \@dep; 
    2424        }; 
  • branches/buildroot-ng/openwrt/scripts/gen_menuconfig.pl

    r3824 r3841  
    2828                        foreach my $depend (@{$pkg->{depends}}) { 
    2929                                print "\t\tdepends PACKAGE_$depend\n"; 
    30                         } 
    31                         foreach my $need (@{$pkg->{needs}}) { 
    32                                 print "\t\tselect PACKAGE_$need\n"; 
    3330                        } 
    3431                        print "\t\thelp\n"; 
     
    6764                $pkg->{depends} = \@dep; 
    6865        }; 
    69         $line =~ /^Needs: \s*(.+)\s*$/ and do { 
    70                 my @need = split /,\s*/, $1; 
    71                 $pkg->{needs} = \@need; 
    72         }; 
    7366        $line =~ /^Category: \s*(.+)\s*$/ and do { 
    7467                $pkg->{category} = $1; 
Note: See TracChangeset for help on using the changeset viewer.