diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/asterisk/Makefile | 2 | ||||
| -rw-r--r-- | package/cfgfs/Makefile | 2 | ||||
| -rw-r--r-- | package/gdb/Makefile | 1 | ||||
| -rw-r--r-- | package/linux-atm/Makefile | 5 | ||||
| -rw-r--r-- | package/mplayer/Makefile | 2 | ||||
| -rw-r--r-- | package/pkgmaker | 14 | ||||
| -rw-r--r-- | package/swconfig/Makefile | 2 | ||||
| -rw-r--r-- | package/valgrind/Makefile | 2 | ||||
| -rw-r--r-- | package/xf86-video-cirrus/Makefile | 2 | ||||
| -rw-r--r-- | package/xf86-video-geode/Makefile | 2 |
10 files changed, 29 insertions, 5 deletions
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 87b47015e..7dd463cac 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -21,6 +21,8 @@ PKG_NOPARALLEL:= 1 PKG_URL:= http://www.asterisk.org PKG_SITES:= http://downloads.asterisk.org/pub/telephony/asterisk/releases/ +PKG_TARGET_DEPENDS:= !foxboard + PKG_DEPENDS_MAIN:= asterisk PKG_DESCR_CHAN_MGCP:= Media Gateway Control Protocol implementation PKG_DESCR_CHAN_SKINNY:= Skinny Client Control Protocol implementation diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index 99ac7055a..a5f24a96f 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -13,6 +13,8 @@ PKG_TARGET_DEPENDS:= alix1c alix2d wrap foxboard ag241 rb532 WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 +CFLINE_CFGFS:= select BUSYBOX_COMM\\n\\tselect BUSYBOX_MD5SUM + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CFGFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/gdb/Makefile b/package/gdb/Makefile index 17d37ef55..139d6b54b 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -8,6 +8,7 @@ PKG_DESCR:= GNU debugger PKG_SECTION:= comp PKG_DEPENDS:= libthread-db libncurses PKG_BUILDDEP+= ncurses readline +PKG_TARGET_DEPENDS:= !foxboard include ${TOPDIR}/mk/package.mk diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile index a999be5d6..b3a8fbd48 100644 --- a/package/linux-atm/Makefile +++ b/package/linux-atm/Makefile @@ -12,15 +12,14 @@ PKG_SECTION:= libs PKG_URL:= http://linux-atm.sourceforge.net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=linux-atm/} +PKG_HOST_DEPENDS:= !freebsd + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz PKG_DESCR_1:= br2684ctl PKG_DEPENDS_1:= libatm PKG_SECTION_1:= net -CFLINE_LIBATM:= depends on !ADK_HOST_FREEBSD -CFLINE_BR2684CTL:= depends on !ADK_HOST_FREEBSD - include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBATM,libatm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index ac0c50c92..89127b715 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -14,6 +14,8 @@ PKG_DEPENDS:= zlib libncurses libmad alsa-lib libvorbis libogg libfaad2 libpthr PKG_URL:= http://www.mplayerhq.hu PKG_SITES:= http://openadk.org/distfiles/ +PKG_TARGET_DEPENDS:= alix1c x86_qemu x86_64_qemu + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MPLAYER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/pkgmaker b/package/pkgmaker index f8061010d..f00285192 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -57,7 +57,7 @@ for dn in */Makefile; do # PKGDFLT_*: subpackage 'default {:-n}', by subpackage option # CFLINE_*: one free-format Config.in line per subpackage option # PKGFD_*: flavour description, per package flavour option - # PKG_{HOST,TARGET}_DEPENDS: wbx@’s weird ideas + # PKG_{HOST,TARGET}_DEPENDS: add host or target dependencies eval $($GMAKE dump="PKG_NAME PKG_FLAVOURS PKG_DESCR PKG_URL PKG_CXX \ ALL_PKGOPTS \$(foreach x,\${ALL_PKGOPTS},PKGNAME_\${x} \ PKGDESC_\${x} PKGDEPS_\${x} PKGDFLT_\${x} CFLINE_\${x}) \ @@ -120,7 +120,13 @@ for dn in */Makefile; do if [[ -n $PKG_TARGET_DEPENDS ]]; then ptd='\tdepends on' sp=' ' # local sp: space (or ' || ') + if [[ $PKG_TARGET_DEPENDS = *\!* ]]; then + sp=' !' + else + sp=' ' + fi for x in $PKG_TARGET_DEPENDS; do + x=${x#!} #XXX cache this with mksh R40+ found=0 while read friendlyname sym; do @@ -133,7 +139,11 @@ for dn in */Makefile; do exit 1 fi ptd="$ptd${sp}$sym" - sp=' || ' + if [[ $PKG_TARGET_DEPENDS = *\!* ]]; then + sp=' && !' + else + sp=' || ' + fi done fi diff --git a/package/swconfig/Makefile b/package/swconfig/Makefile index 2c4586712..f9f183b10 100644 --- a/package/swconfig/Makefile +++ b/package/swconfig/Makefile @@ -10,6 +10,8 @@ PKG_BUILDDEP+= libnl PKG_DESCR:= switch configuration utility PKG_SECTION:= misc +PKG_TARGET_CONFIG:= rb433 + WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 diff --git a/package/valgrind/Makefile b/package/valgrind/Makefile index bb8ae3b07..bf0c1710d 100644 --- a/package/valgrind/Makefile +++ b/package/valgrind/Makefile @@ -12,6 +12,8 @@ PKG_SECTION:= utils PKG_URL:= http://valgrind.org PKG_SITES:= http://valgrind.org/downloads/ +PKG_TARGET_DEPENDS:= x86 x86_64 + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include $(TOPDIR)/mk/package.mk diff --git a/package/xf86-video-cirrus/Makefile b/package/xf86-video-cirrus/Makefile index 370aac976..a86ba2730 100644 --- a/package/xf86-video-cirrus/Makefile +++ b/package/xf86-video-cirrus/Makefile @@ -13,6 +13,8 @@ PKG_SECTION:= x11 PKG_DEPENDS:= xorg-server PKG_SITES:= http://xorg.freedesktop.org/releases/individual/driver/ +PKG_TARGET_DEPENDS:= x86_qemu x86_64_qemu + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XF86_VIDEO_CIRRUS,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/xf86-video-geode/Makefile b/package/xf86-video-geode/Makefile index f124fc201..b98613082 100644 --- a/package/xf86-video-geode/Makefile +++ b/package/xf86-video-geode/Makefile @@ -13,6 +13,8 @@ PKG_SECTION:= x11 PKG_DEPENDS:= xorg-server PKG_SITES:= http://xorg.freedesktop.org/releases/individual/driver/ +PKG_TARGET_DEPENDS:= alix1c + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XF86_VIDEO_GEODE,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) |