From 517022211cab2644bac88865e29af726f1aafeaf Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 18 Dec 2011 17:27:43 +0100 Subject: avr32 workarounds --- package/bluez/Makefile | 8 ++- package/ccid/Makefile | 2 + package/conntrack-tools/Makefile | 2 + package/cxxtools/Makefile | 2 +- package/digitemp/Makefile | 2 + package/ebtables/Makefile | 10 +-- package/ebtables/patches/patch-Makefile | 64 +++++++------------ package/fluxbox/Makefile | 2 + package/forked-daapd/Makefile | 2 +- package/gcc/Makefile | 2 + package/gdb/Makefile | 2 +- package/gdbserver/Makefile | 2 + package/huawei/Makefile | 2 + package/iperf/Makefile | 2 + package/ipset/Makefile | 14 +---- package/jamvm/Makefile | 2 +- package/kexec-tools/Makefile | 2 +- package/libtorrent/Makefile | 2 + package/miax/Makefile | 2 + package/microperl/Makefile | 2 + package/mrd6/Makefile | 2 + package/nut/Makefile | 2 + package/obexftp/Makefile | 2 + package/openais/Makefile | 2 + package/openct/Makefile | 1 + package/openobex/Makefile | 2 + package/opensc/Makefile | 2 + package/openswan/Makefile | 2 + package/oprofile/Makefile | 2 +- package/pcc-libs/Makefile | 2 +- package/pcc/Makefile | 2 +- package/pcsc-lite/Makefile | 2 + package/php/Makefile | 2 +- package/rtorrent/Makefile | 2 + package/rxvt-unicode/Makefile | 2 + package/samba/Makefile | 2 + package/sane-backends/Makefile | 2 +- package/sispmctl/Makefile | 2 + package/squid/Makefile | 2 + package/tntnet/Makefile | 2 +- package/twm/Makefile | 2 +- package/uclibc++/Makefile | 3 + package/usbutils/Makefile | 2 + package/ussp-push/Makefile | 2 + package/util-linux-ng/Makefile | 72 ---------------------- .../util-linux-ng/patches/patch-config_ltmain_sh | 11 ---- package/util-linux-ng/patches/patch-configure | 16 ----- .../patches/patch-shlibs_blkid_src_Makefile_in | 11 ---- package/util-linux/Makefile | 1 + package/vlc/Makefile | 2 +- package/xf86-input-evdev/Makefile | 2 + package/xf86-input-evtouch/Makefile | 1 + package/xf86-input-keyboard/Makefile | 1 + package/xf86-input-mouse/Makefile | 1 + package/xf86-video-ati/Makefile | 1 + package/xf86-video-cirrus/Makefile | 1 + package/xf86-video-fbdev/Makefile | 1 + package/xf86-video-intel/Makefile | 1 + package/xf86-video-siliconmotion/Makefile | 1 + package/xfsprogs/Makefile | 1 + package/xinit/Makefile | 2 +- package/xorg-server/Makefile | 2 +- 62 files changed, 118 insertions(+), 186 deletions(-) delete mode 100644 package/util-linux-ng/Makefile delete mode 100644 package/util-linux-ng/patches/patch-config_ltmain_sh delete mode 100644 package/util-linux-ng/patches/patch-configure delete mode 100644 package/util-linux-ng/patches/patch-shlibs_blkid_src_Makefile_in (limited to 'package') diff --git a/package/bluez/Makefile b/package/bluez/Makefile index e359b8f77..a4fa983e3 100644 --- a/package/bluez/Makefile +++ b/package/bluez/Makefile @@ -4,15 +4,17 @@ include ${TOPDIR}/rules.mk PKG_NAME:= bluez -PKG_VERSION:= 4.92 +PKG_VERSION:= 4.96 PKG_RELEASE:= 1 -PKG_MD5SUM:= abe5b76df95939f4eb6fa493f4764a95 +PKG_MD5SUM:= 296111afac49e3f9035085ac14daf518 PKG_DESCR:= bluetooth libraries and applications PKG_SECTION:= bluetooth PKG_DEPENDS:= kmod-bt libusb glib dbus PKG_BUILDDEP:= libusb dbus glib libusb-compat PKG_URL:= http://www.bluez.org/ -PKG_SITES:= ${MASTER_SITE_KERNEL:=bluetooth/} +PKG_SITES:= http://mirror.anl.gov/pub/linux/bluetooth/ + +PKG_ARCH_DEPENDS:= !avr32 include ${TOPDIR}/mk/package.mk diff --git a/package/ccid/Makefile b/package/ccid/Makefile index 068dfc043..e11ca53f9 100644 --- a/package/ccid/Makefile +++ b/package/ccid/Makefile @@ -13,6 +13,8 @@ PKG_BUILDDEP:= pcsc-lite PKG_URL:= http://pcsclite.alioth.debian.org/ccid.html PKG_SITES:= http://alioth.debian.org/frs/download.php/3579/ +PKG_ARCH_DEPENDS:= !avr32 + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include $(TOPDIR)/mk/package.mk diff --git a/package/conntrack-tools/Makefile b/package/conntrack-tools/Makefile index af4cf2c53..2ded1f78b 100644 --- a/package/conntrack-tools/Makefile +++ b/package/conntrack-tools/Makefile @@ -14,6 +14,8 @@ PKG_BUILDDEP:= libnetfilter_conntrack PKG_URL:= http://conntrack-tools.netfilter.org/ PKG_SITES:= http://www.netfilter.org/projects/conntrack-tools/files/ +PKG_ARCH_DEPENDS:= !avr32 + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include $(TOPDIR)/mk/package.mk diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile index 2c019d4b0..e1e1c9497 100644 --- a/package/cxxtools/Makefile +++ b/package/cxxtools/Makefile @@ -15,7 +15,7 @@ PKG_URL:= http://www.tntnet.org/ PKG_SITES:= http://www.tntnet.org/download/ PKG_NEED_CXX:= 1 -PKG_ARCH_DEPENDS:= !arm +PKG_ARCH_DEPENDS:= !arm !avr32 PKG_SUBPKGS:= CXXTOOLS CXXTOOLS_DEV PKGSC_CXXTOOLS_DEV:= devel diff --git a/package/digitemp/Makefile b/package/digitemp/Makefile index 9e090989a..c771708c4 100644 --- a/package/digitemp/Makefile +++ b/package/digitemp/Makefile @@ -14,6 +14,8 @@ PKG_BUILDDEP:= libusb libusb-compat PKG_URL:= http://www.digitemp.com/software/linux/ PKG_SITES:= http://www.digitemp.com/software/linux/ +PKG_ARCH_DEPENDS:= !avr32 + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,DIGITEMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile index 35339bb74..a84888d99 100644 --- a/package/ebtables/Makefile +++ b/package/ebtables/Makefile @@ -4,16 +4,18 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ebtables -PKG_VERSION:= 2.0.9 +PKG_VERSION:= 2.0.10 PKG_RELEASE:= 1 -PKG_MD5SUM:= 0e0c20adf2bba6d91dbd0b74a1a38c33 +PKG_MD5SUM:= 6df055d6476d3ce6bd7eed302a39c40c PKG_DESCR:= ethernet bridging firewall tool PKG_SECTION:= firewall PKG_URL:= http://ebtables.sourceforge.net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=ebtables/} -DISTFILES:= ${PKG_NAME}-v${PKG_VERSION}-1.tar.gz -WRKDIST= ${WRKDIR}/${PKG_NAME}-v${PKG_VERSION}-1 +PKG_ARCH_DEPENDS:= !avr32 + +DISTFILES:= ${PKG_NAME}-v${PKG_VERSION}-3.tar.gz +WRKDIST= ${WRKDIR}/${PKG_NAME}-v${PKG_VERSION}-3 include ${TOPDIR}/mk/package.mk diff --git a/package/ebtables/patches/patch-Makefile b/package/ebtables/patches/patch-Makefile index f05da74c9..ff5934a70 100644 --- a/package/ebtables/patches/patch-Makefile +++ b/package/ebtables/patches/patch-Makefile @@ -1,6 +1,6 @@ ---- ebtables-v2.0.9-1.orig/Makefile 2009-06-21 15:13:25.000000000 +0200 -+++ ebtables-v2.0.9-1/Makefile 2011-01-14 22:24:16.000000000 +0100 -@@ -8,17 +8,17 @@ PROGDATE:=June\ 2009 +--- ebtables-v2.0.10-3.orig/Makefile 2011-12-04 10:46:26.000000000 +0100 ++++ ebtables-v2.0.10-3/Makefile 2011-12-11 16:35:34.619464748 +0100 +@@ -10,16 +10,16 @@ LOCKDIR:=$(shell echo $(LOCKFILE) | sed # default paths LIBDIR:=/usr/lib @@ -14,60 +14,42 @@ SYSCONFIGDIR:=/etc/sysconfig DESTDIR:= --CFLAGS:=-Wall -Wunused -+CFLAGS?=-Wall -Wunused -+LDFLAGS?= - CFLAGS_SH_LIB:=-fPIC +-CFLAGS:=-Wall -Wunused -Werror ++CFLAGS?=-Wall -Wunused -Werror + CFLAGS_SH_LIB:=-fPIC -O3 -CC:=gcc --LD:=ld +CC?=gcc ifeq ($(shell uname -m),sparc64) CFLAGS+=-DEBT_MIN_ALIGN=8 -DKERNEL_64_USERSPACE_32 -@@ -85,14 +85,14 @@ ebtables-standalone.o: ebtables-standalo - - .PHONY: libebtc - libebtc: $(OBJECTS2) -- $(LD) -shared -soname libebtc.so -o libebtc.so -lc $(OBJECTS2) -+ $(CC) -shared $(LDFLAGS) -o libebtc.so -lc $(OBJECTS2) - - ebtables: $(OBJECTS) ebtables-standalone.o libebtc -- $(CC) $(CFLAGS) $(CFLAGS_SH_LIB) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \ -+ $(CC) $(LDFLAGS) $(CFLAGS) $(CFLAGS_SH_LIB) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \ - -Wl,-rpath,$(LIBDIR) - - ebtablesu: ebtablesu.c -- $(CC) $(CFLAGS) $(PROGSPECSD) $< -o $@ -+ $(CC) $(LDFLAGS) $(CFLAGS) $(PROGSPECSD) $< -o $@ - - ebtablesd.o: ebtablesd.c include/ebtables_u.h - $(CC) $(CFLAGS) $(PROGSPECSD) -c $< -o $@ -I$(KERNEL_INCLUDES) -@@ -154,28 +154,29 @@ tmp3:=$(shell printf $(PIPE) | sed 's/\/ - .PHONY: scripts +@@ -157,31 +157,31 @@ tmp3:=$(shell printf $(PIPE) | sed 's/\/ scripts: ebtables-save ebtables.sysv ebtables-config cat ebtables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > ebtables-save_ + mkdir -p $(DESTDIR)$(BINDIR) - install -m 0755 -o root -g root ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save + install -m 0755 ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save cat ebtables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables.sysv_ -- install -m 0755 -o root -g root ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables -+ mkdir -p $(DESTDIR)$(INITDIR) -+ install -m 0755 ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables + if [ "$(DESTDIR)" != "" ]; then mkdir -p $(DESTDIR)$(INITDIR); fi +- if test -d $(DESTDIR)$(INITDIR); then install -m 0755 -o root -g root ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables; fi ++ if test -d $(DESTDIR)$(INITDIR); then install -m 0755 ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables; fi cat ebtables-config | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables-config_ -- install -m 0600 -o root -g root ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config -+ #install -m 0600 ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config + if [ "$(DESTDIR)" != "" ]; then mkdir -p $(DESTDIR)$(SYSCONFIGDIR); fi +- if test -d $(DESTDIR)$(SYSCONFIGDIR); then install -m 0600 -o root -g root ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config; fi ++ if test -d $(DESTDIR)$(SYSCONFIGDIR); then install -m 0600 ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config; fi rm -f ebtables-save_ ebtables.sysv_ ebtables-config_ + tmp4:=$(shell printf $(LOCKFILE) | sed 's/\//\\\//g') $(MANDIR)/man8/ebtables.8: ebtables.8 mkdir -p $(DESTDIR)$(@D) - sed 's/$$(VERSION)/$(PROGVERSION)/' ebtables.8 | sed 's/$$(DATE)/$(PROGDATE)/' > ebtables.8_ + sed -e 's/$$(VERSION)/$(PROGVERSION)/' -e 's/$$(DATE)/$(PROGDATE)/' -e 's/$$(LOCKFILE)/$(tmp4)/' ebtables.8 > ebtables.8_ - install -m 0644 -o root -g root ebtables.8_ $(DESTDIR)$@ + install -m 0644 ebtables.8_ $(DESTDIR)$@ rm -f ebtables.8_ - $(ETHERTYPESFILE): ethertypes - mkdir -p $(DESTDIR)$(@D) -- install -m 0644 -o root -g root $< $(DESTDIR)$@ -+ install -m 0644 $< $(DESTDIR)$@ + $(DESTDIR)$(ETHERTYPESFILE): ethertypes + mkdir -p $(@D) +- install -m 0644 -o root -g root $< $@ ++ install -m 0644 $< $@ .PHONY: exec exec: ebtables ebtables-restore @@ -78,8 +60,8 @@ + install -m 0755 ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore .PHONY: install - install: $(MANDIR)/man8/ebtables.8 $(ETHERTYPESFILE) exec scripts -@@ -199,18 +200,18 @@ release: + install: $(MANDIR)/man8/ebtables.8 $(DESTDIR)$(ETHERTYPESFILE) exec scripts +@@ -205,18 +205,18 @@ release: rm -f extensions/ebt_inat.c rm -rf $(CVSDIRS) mkdir -p include/linux/netfilter_bridge @@ -99,7 +81,7 @@ $(KERNEL_INCLUDES)/linux/netfilter_bridge/*.h \ include/linux/netfilter_bridge/ - install -m 0644 -o root -g root \ -+ install -m 0644 \ ++ install -m 0644 \ include/ebtables.h include/linux/netfilter_bridge/ make clean touch * diff --git a/package/fluxbox/Makefile b/package/fluxbox/Makefile index 5ebdf3793..280e81af0 100644 --- a/package/fluxbox/Makefile +++ b/package/fluxbox/Makefile @@ -14,6 +14,8 @@ PKG_BUILDDEP:= libXpm libXft PKG_URL:= http://www.fluxbox.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=fluxbox/} +PKG_ARCH_DEPENDS:= !avr32 + PKG_FLAVOURS_FLUXBOX:= WITH_IMLIB2 PKGFD_WITH_IMLIB2:= enable imlib2 support PKGFS_WITH_IMLIB2:= imlib2 diff --git a/package/forked-daapd/Makefile b/package/forked-daapd/Makefile index 49583bb11..5d79e5fe5 100644 --- a/package/forked-daapd/Makefile +++ b/package/forked-daapd/Makefile @@ -17,7 +17,7 @@ PKG_BUILDDEP+= mxml libevent libavl libantlr3c alsa-lib libgcrypt PKG_SITES:= http://alioth.debian.org/~jblache/forked-daapd/ PKG_CFLINE_FORKED_DAAPD:= select ADK_KERNEL_INOTIFY_USER -PKG_ARCH_DEPENDS:= !ppc +PKG_ARCH_DEPENDS:= !ppc !avr32 # gperf problem PKG_HOST_DEPENDS:= !freebsd diff --git a/package/gcc/Makefile b/package/gcc/Makefile index 125b9ad5e..e0dd34e84 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -10,6 +10,8 @@ PKG_OPTS:= noremove PKG_DEPENDS:= libmpc libgmp mpfr PKG_BUILDDEP:= libmpc gmp mpfr +PKG_ARCH_DEPENDS:= !avr32 + WRKBUILD= ${WRKDIR}/${PKG_NAME}-obj include ${TOPDIR}/mk/package.mk diff --git a/package/gdb/Makefile b/package/gdb/Makefile index c29c48e65..0d91b5600 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -10,7 +10,7 @@ PKG_DEPENDS:= libthread-db libncurses libiconv libexpat PKG_BUILDDEP:= ncurses readline libiconv expat PKG_NOPARALLEL:= 1 -PKG_ARCH_DEPENDS:= !cris +PKG_ARCH_DEPENDS:= !cris !avr32 include ${TOPDIR}/mk/package.mk diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile index e13e4ec53..8cabcef12 100644 --- a/package/gdbserver/Makefile +++ b/package/gdbserver/Makefile @@ -9,6 +9,8 @@ PKG_SECTION:= debug PKG_DEPENDS:= libthread-db PKG_SUBPKGS:= GDBSERVER +PKG_ARCH_DEPENDS:= !avr32 + WRKSRC= ${WRKDIST}/gdb/gdbserver include ${TOPDIR}/mk/package.mk diff --git a/package/huawei/Makefile b/package/huawei/Makefile index 9d780f37e..6ea2fe069 100644 --- a/package/huawei/Makefile +++ b/package/huawei/Makefile @@ -11,6 +11,8 @@ PKG_SECTION:= utils PKG_DEPENDS:= libusb PKG_BUILDDEP:= libusb +PKG_ARCH_DEPENDS:= !avr32 + NO_DISTFILES:= 1 include $(TOPDIR)/mk/package.mk diff --git a/package/iperf/Makefile b/package/iperf/Makefile index 154175fc5..8956a6530 100644 --- a/package/iperf/Makefile +++ b/package/iperf/Makefile @@ -15,6 +15,8 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=iperf/} PKG_NEED_CXX:= 1 PKG_CXX:= IPERF +PKG_ARCH_DEPENDS:= !avr32 + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,IPERF,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/ipset/Makefile b/package/ipset/Makefile index 3e08c8ee6..1b2d8a65f 100644 --- a/package/ipset/Makefile +++ b/package/ipset/Makefile @@ -12,35 +12,23 @@ PKG_SECTION:= firewall PKG_URL:= http://ipset.netfilter.org/ PKG_SITES:= http://ipset.netfilter.org/ -PKG_ARCH_DEPENDS:= !arm +PKG_ARCH_DEPENDS:= !arm !avr32 PKG_CFLINE_IPSET:= depends on !ADK_TOOLCHAIN_ONLY -PKG_SUBPKGS:= IPSET IPSET_KMOD -PKGSD_IPSET_KMOD:= ipset kernel module -PKGSC_IPSET_KMOD:= kernel - DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,IPSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,IPSET_KMOD,ipset-kmod,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKGSD_IPSET_KMOD},${PKGSC_IPSET_KMOD})) CONFIG_STYLE:= manual XAKE_FLAGS+= PREFIX=/usr ALL_TARGET:= binaries INSTALL_TARGET:= binaries_install -pre-build: - $(MAKE) -C ${WRKBUILD} $(KERNEL_MODULE_FLAGS) modules - post-install: ${INSTALL_DIR} ${IDIR_IPSET}/usr/sbin ${IDIR_IPSET}/usr/lib/ipset ${INSTALL_BIN} ${WRKINST}/usr/sbin/ipset ${IDIR_IPSET}/usr/sbin ${CP} ${WRKINST}/usr/lib/ipset/*.so ${IDIR_IPSET}/usr/lib/ipset/ - # kernel modules (no autoload at the moment) - ${INSTALL_DIR} ${IDIR_IPSET_KMOD}/lib/modules/${KERNEL_VERSION}/ - ${INSTALL_DATA} ${WRKBUILD}/kernel/*.ko \ - ${IDIR_IPSET_KMOD}/lib/modules/${KERNEL_VERSION} include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile index 19de6da0c..aeb37e177 100644 --- a/package/jamvm/Makefile +++ b/package/jamvm/Makefile @@ -14,7 +14,7 @@ PKG_BUILDDEP:= libffi zlib PKG_URL:= http://jamvm.sourceforge.net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jamvm/} -PKG_ARCH_DEPENDS:= !cris !mips +PKG_ARCH_DEPENDS:= !cris !mips !avr32 include ${TOPDIR}/mk/package.mk diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile index bb7636cd4..24e5b1bbf 100644 --- a/package/kexec-tools/Makefile +++ b/package/kexec-tools/Makefile @@ -14,7 +14,7 @@ PKG_BUILDEP:= zlib PKG_URL:= http://kernel.org/pub/linux/utils/kernel/kexec/ PKG_SITES:= http://kernel.org/pub/linux/utils/kernel/kexec/ -PKG_ARCH_DEPENDS:= !cris +PKG_ARCH_DEPENDS:= !cris !avr32 PKG_CFLINE_KEXEC_TOOLS:= select ADK_KERNEL_KEXEC include $(TOPDIR)/mk/package.mk diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile index 4cb06c3a9..a46914b42 100644 --- a/package/libtorrent/Makefile +++ b/package/libtorrent/Makefile @@ -14,6 +14,8 @@ PKG_BUILDDEP:= openssl libsigc++ PKG_URL:= http://libtorrent.rakshasa.no/ PKG_SITES:= http://libtorrent.rakshasa.no/downloads/ +PKG_ARCH_DEPENDS:= !avr32 + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/miax/Makefile b/package/miax/Makefile index 40f08ae89..37e23eb9d 100644 --- a/package/miax/Makefile +++ b/package/miax/Makefile @@ -14,6 +14,8 @@ PKG_BUILDDEP:= bluez PKG_URL:= http://sourceforge.net/projects/miax PKG_SITES:= http://mesh.dl.sourceforge.net/sourceforge/miax/ +PKG_ARCH_DEPENDS:= !avr32 + DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/${PKG_NAME} diff --git a/package/microperl/Makefile b/package/microperl/Makefile index 6507939b5..3ca58919a 100644 --- a/package/microperl/Makefile +++ b/package/microperl/Makefile @@ -12,6 +12,8 @@ PKG_SECTION:= lang PKG_URL:= http://www.perl.org/ PKG_SITES:= ftp://ftp.cpan.org/pub/CPAN/src/5.0/ +PKG_ARCH_DEPENDS:= !avr32 + DISTFILES:= perl-${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/perl-${PKG_VERSION} diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile index 49a39ad96..783a03cd5 100644 --- a/package/mrd6/Makefile +++ b/package/mrd6/Makefile @@ -14,6 +14,8 @@ PKG_SITES:= http://www.openadk.org/distfiles/ PKG_NEED_CXX:= 1 PKG_CXX:= MRD6 +PKG_ARCH_DEPENDS:= !avr32 + WRKBUILD= ${WRKSRC}/src include ${TOPDIR}/mk/package.mk diff --git a/package/nut/Makefile b/package/nut/Makefile index 5cf4406f6..f3ed9083b 100644 --- a/package/nut/Makefile +++ b/package/nut/Makefile @@ -12,6 +12,8 @@ PKG_SECTION:= net/misc PKG_URL:= http://www.networkupstools.org/ PKG_SITES:= http://www.networkupstools.org/source/2.4/ +PKG_ARCH_DEPENDS:= !avr32 + PKG_FLAVOURS_NUT:= WITH_SSL WITH_SNMP WITH_USB PKGFD_WITH_SNMP:= enable SNMP support PKGFS_WITH_SNMP:= libnetsnmp diff --git a/package/obexftp/Makefile b/package/obexftp/Makefile index e39401aaf..152755561 100644 --- a/package/obexftp/Makefile +++ b/package/obexftp/Makefile @@ -14,6 +14,8 @@ PKG_BUILDDEP:= openobex libiconv PKG_URL:= http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=openobex/} +PKG_ARCH_DEPENDS:= !avr32 + PKG_SUBPKGS:= OBEXFTP LIBOBEXFTP PKGSD_LIBOBEXFTP:= obexftp library PKGSC_LIBOBEXFTP:= libs diff --git a/package/openais/Makefile b/package/openais/Makefile index 0d96cbc1b..102a7d5f6 100644 --- a/package/openais/Makefile +++ b/package/openais/Makefile @@ -14,6 +14,8 @@ PKG_DEPENDS:= corosync PKG_URL:= http://www.openais.org/ PKG_SITES:= ftp://ftp:download@ftp.openais.org/downloads/openais-1.1.4/ +PKG_ARCH_DEPENDS:= !avr32 + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,OPENAIS,openais,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/openct/Makefile b/package/openct/Makefile index 7329d8eff..9b3443db1 100644 --- a/package/openct/Makefile +++ b/package/openct/Makefile @@ -10,6 +10,7 @@ PKG_MD5SUM:= a1da3358ab798f1cb9232f1dbababc21 PKG_DESCR:= drivers for smart card readers PKG_SECTION:= crypto PKG_DEPENDS:= libopenct +PKG_BUILDDEP:= libtool PKG_URL:= http://www.opensc-project.org/openct/ PKG_SITES:= http://www.opensc-project.org/files/openct/ diff --git a/package/openobex/Makefile b/package/openobex/Makefile index 84cc3df8f..4ec3d8d56 100644 --- a/package/openobex/Makefile +++ b/package/openobex/Makefile @@ -13,6 +13,8 @@ PKG_BUILDDEP:= bluez PKG_URL:= http://dev.zuckschwerdt.org/openobex/wiki/WikiStart PKG_SITES:= ${MASTER_SITE_KERNEL:=bluetooth/} +PKG_ARCH_DEPENDS:= !avr32 + ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly endif diff --git a/package/opensc/Makefile b/package/opensc/Makefile index e0440eece..b1fcda2e8 100644 --- a/package/opensc/Makefile +++ b/package/opensc/Makefile @@ -14,6 +14,8 @@ PKG_DEPENDS:= libopensc libopenct pcsc-lite libopenssl libreadline PKG_URL:= http://www.opensc-project.org/opensc/ PKG_SITES:= http://www.opensc-project.org/files/opensc/ +PKG_ARCH_DEPENDS:= !avr32 + PKG_SUBPKGS:= OPENSC LIBOPENSC LIBOPENSC_DEV PKGSD_LIBOPENSC:= opensc library PKGSC_LIBOPENSC:= libs diff --git a/package/openswan/Makefile b/package/openswan/Makefile index 60d725705..e63435c2c 100644 --- a/package/openswan/Makefile +++ b/package/openswan/Makefile @@ -20,6 +20,8 @@ PKG_URL:= http://www.openswan.org/ PKG_SITES:= http://www.openswan.org/download/ PKG_NOPARALLEL:= 1 +PKG_ARCH_DEPENDS:= !avr32 + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,OPENSWAN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile index aaa6a3c1c..e3ff2f6e7 100644 --- a/package/oprofile/Makefile +++ b/package/oprofile/Makefile @@ -14,7 +14,7 @@ PKG_BUILDDEP:= popt binutils PKG_URL:= http://oprofile.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=oprofile/} -PKG_ARCH_DEPENDS:= !cris +PKG_ARCH_DEPENDS:= !cris !avr32 PKG_CFLINE_OPROFILE:= select BUSYBOX_EXPR diff --git a/package/pcc-libs/Makefile b/package/pcc-libs/Makefile index bce74cd8d..0603810e8 100644 --- a/package/pcc-libs/Makefile +++ b/package/pcc-libs/Makefile @@ -12,7 +12,7 @@ PKG_SECTION:= lang PKG_URL:= http://pcc.ludd.ltu.se/ PKG_SITES:= http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/ -PKG_ARCH_DEPENDS:= !arm !cris !mips !ppc +PKG_ARCH_DEPENDS:= !arm !cris !mips !ppc !avr32 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz include $(TOPDIR)/mk/package.mk diff --git a/package/pcc/Makefile b/package/pcc/Makefile index d305c55a1..c38faccfc 100644 --- a/package/pcc/Makefile +++ b/package/pcc/Makefile @@ -14,7 +14,7 @@ PKG_URL:= http://pcc.ludd.ltu.se/ PKG_SITES:= http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/ PKG_NOPARALLEL:= 1 -PKG_ARCH_DEPENDS:= !arm !cris !mips !ppc +PKG_ARCH_DEPENDS:= !arm !cris !mips !ppc !avr32 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz include $(TOPDIR)/mk/package.mk diff --git a/package/pcsc-lite/Makefile b/package/pcsc-lite/Makefile index 6164ca12f..d935610a6 100644 --- a/package/pcsc-lite/Makefile +++ b/package/pcsc-lite/Makefile @@ -14,6 +14,8 @@ PKG_BUILDDEP:= libusb libusb-compat PKG_URL:= http://pcsclite.alioth.debian.org/ PKG_SITES:= http://alioth.debian.org/frs/download.php/3598/ +PKG_ARCH_DEPENDS:= !avr32 + PKG_SUBPKGS:= PCSC_LITE PCSC_LITE_DEV PKGSD_PCSC_LITE_DEV:= header files for pcsc-lite PKGSC_PCSC_LITE_DEV:= devel diff --git a/package/php/Makefile b/package/php/Makefile index 33f07fbce..e37ba548d 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -48,7 +48,7 @@ PKGFD_MOD_XML:= XML support PKGFB_MOD_XML:= expat PKGFS_MOD_XML:= libexpat -PKG_ARCH_DEPENDS:= !cris +PKG_ARCH_DEPENDS:= !cris !avr32 PKG_HOST_DEPENDS:= !cygwin include $(TOPDIR)/mk/package.mk diff --git a/package/rtorrent/Makefile b/package/rtorrent/Makefile index d47cce446..81e24f493 100644 --- a/package/rtorrent/Makefile +++ b/package/rtorrent/Makefile @@ -14,6 +14,8 @@ PKG_BUILDDEP:= ncurses libtorrent curl PKG_URL:= http://libtorrent.rakshasa.no/ PKG_SITES:= http://libtorrent.rakshasa.no/downloads/ +PKG_ARCH_DEPENDS:= !avr32 + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,RTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/rxvt-unicode/Makefile b/package/rxvt-unicode/Makefile index 8b8d27c3e..9e6b54fc8 100644 --- a/package/rxvt-unicode/Makefile +++ b/package/rxvt-unicode/Makefile @@ -15,6 +15,8 @@ PKG_URL:= http://software.schmorp.de/pkg/rxvt-unicode.html PKG_SITES:= http://dist.schmorp.de/rxvt-unicode/ PKG_NEED_CXX:= 1 +PKG_ARCH_DEPENDS:= !avr32 + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include $(TOPDIR)/mk/package.mk diff --git a/package/samba/Makefile b/package/samba/Makefile index 91813ac29..31bc4d133 100644 --- a/package/samba/Makefile +++ b/package/samba/Makefile @@ -14,6 +14,8 @@ PKG_DEPENDS:= libintl PKG_URL:= http://www.samba.org/ PKG_SITES:= http://samba.org/samba/ftp/stable/ +PKG_ARCH_DEPENDS:= !avr32 + PKG_SUBPKGS:= SAMBA SAMBA_CLIENT SAMBA_PASSWD WRKSRC= ${WRKDIST}/source3 diff --git a/package/sane-backends/Makefile b/package/sane-backends/Makefile index ce8b7fe53..8deca8f19 100644 --- a/package/sane-backends/Makefile +++ b/package/sane-backends/Makefile @@ -15,7 +15,7 @@ PKG_URL:= http://www.sane-project.org/ PKG_SITES:= ftp://ftp2.sane-project.org/pub/sane/${PKG_NAME}-${PKG_VERSION}/ PKG_MULTI:= 1 -PKG_ARCH_DEPENDS:= !cris +PKG_ARCH_DEPENDS:= !cris !avr32 PKG_SUBPKGS:= SANE_BACKENDS SANE_BACKEND_NET SANE_BACKEND_ABATON SANE_BACKEND_AGFAFOCUS PKG_SUBPKGS+= SANE_BACKEND_APPLE SANE_BACKEND_ARTEC_EPLUS48U SANE_BACKEND_ARTEC SANE_BACKEND_AS6E diff --git a/package/sispmctl/Makefile b/package/sispmctl/Makefile index 13bac7bc4..d01da091c 100644 --- a/package/sispmctl/Makefile +++ b/package/sispmctl/Makefile @@ -14,6 +14,8 @@ PKG_BUILDDEP:= libusb libusb-compat PKG_URL:= http://sispmctl.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=sispmctl/} +PKG_ARCH_DEPENDS:= !avr32 + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,SISPMCTL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/squid/Makefile b/package/squid/Makefile index b2b9d0af2..561e70fd9 100644 --- a/package/squid/Makefile +++ b/package/squid/Makefile @@ -16,6 +16,8 @@ PKG_SITES:= http://www.squid-cache.org/Versions/v3/3.1/ PKG_MULTI:= 1 PKG_NEED_CXX:= 1 +PKG_ARCH_DEPENDS:= !avr32 + PKG_SUBPKGS:= SQUID SQUID_MOD_BASIC_AUTH_GETPWNAM SQUID_MOD_BASIC_AUTH_NCSA PKG_SUBPKGS+= SQUID_MOD_BASIC_AUTH_SMB SQUID_MOD_DIGEST_AUTH_PASSWORD PKG_SUBPKGS+= SQUID_MOD_EXTERNAL_ACL_IP_USER SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile index c1287bc52..4875fb449 100644 --- a/package/tntnet/Makefile +++ b/package/tntnet/Makefile @@ -15,7 +15,7 @@ PKG_URL:= http://www.tntnet.org/ PKG_SITES:= http://www.tntnet.org/download/ PKG_NEED_CXX:= 1 -PKG_ARCH_DEPENDS:= !arm +PKG_ARCH_DEPENDS:= !arm !avr32 PKG_CHOICES_TNTNET:= WITHOUT_SSL WITH_OPENSSL WITH_GNUTLS PKGCD_WITHOUT_SSL:= use no SSL diff --git a/package/twm/Makefile b/package/twm/Makefile index 50cc9af80..bfdc1899a 100644 --- a/package/twm/Makefile +++ b/package/twm/Makefile @@ -15,7 +15,7 @@ PKG_URL:= http://xorg.freedesktop.org/ PKG_SITES:= http://xorg.freedesktop.org/archive/individual/app/ PKG_NEED_CXX:= 1 -PKG_ARCH_DEPENDS:= !cris +PKG_ARCH_DEPENDS:= !cris !avr32 include $(TOPDIR)/mk/package.mk diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile index ff18a3838..0db591b90 100644 --- a/package/uclibc++/Makefile +++ b/package/uclibc++/Makefile @@ -29,6 +29,9 @@ MAKE_FLAGS+= TOPDIR="${WRKBUILD}/" \ ${TARGET_CONFIGURE_OPTS} \ ARCH_CFLAGS="${TARGET_CFLAGS}" \ CROSS="${TARGET_CROSS}" +ifeq ($(ADK_LINUX_AVR32),y) +MAKE_FLAGS+= check_as_needed= +endif TARGET_CONFIGURE_OPTS= do-configure: diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile index e4c903bef..36054eba1 100644 --- a/package/usbutils/Makefile +++ b/package/usbutils/Makefile @@ -13,6 +13,8 @@ PKG_DEPENDS:= libusb libusb-compat libpthread zlib PKG_BUILDDEP:= libusb libusb-compat zlib PKG_SITES:= http://www.kernel.org/pub/linux/utils/usb/usbutils/ +PKG_ARCH_DEPENDS:= !avr32 + PKG_SUBPKGS:= LSUSB include ${TOPDIR}/mk/package.mk diff --git a/package/ussp-push/Makefile b/package/ussp-push/Makefile index 962bb3050..e3731e46e 100644 --- a/package/ussp-push/Makefile +++ b/package/ussp-push/Makefile @@ -13,6 +13,8 @@ PKG_DEPENDS:= openobex PKG_BUILDDEP:= openobex PKG_SITES:= http://xmailserver.org/ +PKG_ARCH_DEPENDS:= !avr32 + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,USSP_PUSH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/util-linux-ng/Makefile b/package/util-linux-ng/Makefile deleted file mode 100644 index 8ac4dba8f..000000000 --- a/package/util-linux-ng/Makefile +++ /dev/null @@ -1,72 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include ${TOPDIR}/rules.mk - -PKG_NAME:= util-linux-ng -PKG_VERSION:= 2.18 -PKG_RELEASE:= 2 -PKG_MD5SUM:= aff22adfff1bf39cd3f13371b95a3d3a -PKG_DESCR:= Linux utilities -PKG_SECTION:= fs -PKG_BUILDDEP:= e2fsprogs ncurses -PKG_URL:= http://userweb.kernel.org/~kzak/util-linux-ng -PKG_SITES:= ${MASTER_SITE_KERNEL:=utils/util-linux-ng/v$(PKG_VERSION)/} - -PKG_SUBPKGS:= FDISK SFDISK SWAP_UTILS LOSETUP MOUNT MCOOKIE -PKGSD_FDISK:= Partition table manipulation utility -PKGSD_SFDISK:= Scriptable Partition table manipulation utility -PKGSD_SWAP_UTILS:= Swap space management utilities -PKGSS_SWAP_UTILS:= libblkid -PKGSD_LOSETUP:= Loop devices management utilities -PKGSS_LOSETUP:= kmod-blk-dev-loop -PKGSD_MOUNT:= mount/umount utilities -PKGSS_MOUNT:= libblkid -PKGSD_MCOOKIE:= Generate magic cookies for xauth -PKGSC_MCOOKIE:= x11/apps - -include ${TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,FDISK,fdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FDISK},${PKG_SECTION})) -$(eval $(call PKG_template,SFDISK,sfdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_SFDISK},${PKG_SECTION})) -$(eval $(call PKG_template,SWAP_UTILS,swap-utils,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_SWAP_UTILS},${PKGSD_SWAP_UTILS},${PKG_SECTION})) -$(eval $(call PKG_template,LOSETUP,losetup,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LOSETUP},${PKGSD_LOSETUP},${PKG_SECTION})) -$(eval $(call PKG_template,MOUNT,mount,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_MOUNT},${PKG_SECTION})) -$(eval $(call PKG_template,MCOOKIE,mcookie,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_MCOOKIE},${PKGSC_MCOOKIE})) - -CONFIGURE_ARGS+= --disable-use-tty-group \ - --disable-schedutils \ - --disable-cramfs \ - --disable-libuuid \ - --disable-libblkid \ - --enable-libmount \ - --enable-mount -FAKE_FLAGS+= INSTALLSUID="install -m 4755" -TARGET_CFLAGS+= -DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK - -fdisk-install: - ${INSTALL_DIR} ${IDIR_FDISK}/usr/sbin - ${CP} ${WRKINST}/sbin/fdisk ${IDIR_FDISK}/usr/sbin - -sfdisk-install: - ${INSTALL_DIR} ${IDIR_SFDISK}/usr/sbin - ${CP} ${WRKINST}/sbin/sfdisk ${IDIR_SFDISK}/usr/sbin - -losetup-install: - ${INSTALL_DIR} ${IDIR_LOSETUP}/usr/sbin - ${CP} ${WRKINST}/sbin/losetup ${IDIR_LOSETUP}/usr/sbin - -swap-utils-install: - ${INSTALL_DIR} ${IDIR_SWAP_UTILS}/usr/sbin - ${CP} ${WRKINST}/sbin/mkswap ${IDIR_SWAP_UTILS}/usr/sbin - ${CP} ${WRKINST}/sbin/swap{on,off} ${IDIR_SWAP_UTILS}/usr/sbin - -mount-install: - ${INSTALL_DIR} ${IDIR_MOUNT}/usr/bin - ${INSTALL_BIN} ${WRKINST}/usr/bin/{u,}mount ${IDIR_MOUNT}/usr/bin - -mcookie-install: - ${INSTALL_DIR} ${IDIR_MCOOKIE}/usr/bin - ${INSTALL_BIN} ${WRKINST}/usr/bin/mcookie ${IDIR_MCOOKIE}/usr/bin - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/util-linux-ng/patches/patch-config_ltmain_sh b/package/util-linux-ng/patches/patch-config_ltmain_sh deleted file mode 100644 index 86ee09448..000000000 --- a/package/util-linux-ng/patches/patch-config_ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- util-linux-ng-2.18.orig/config/ltmain.sh 2010-02-04 12:53:55.000000000 +0100 -+++ util-linux-ng-2.18/config/ltmain.sh 2011-01-17 16:27:39.000000000 +0100 -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" diff --git a/package/util-linux-ng/patches/patch-configure b/package/util-linux-ng/patches/patch-configure deleted file mode 100644 index 4c61b8640..000000000 --- a/package/util-linux-ng/patches/patch-configure +++ /dev/null @@ -1,16 +0,0 @@ ---- util-linux-ng-2.18.orig/configure 2010-06-30 14:53:01.000000000 +0200 -+++ util-linux-ng-2.18/configure 2011-02-01 16:31:25.000000000 +0100 -@@ -15816,13 +15816,6 @@ else - fi - - --case "$enable_libblkid:$enable_libmount" in --no:yes) -- { { $as_echo "$as_me:$LINENO: error: cannot enable libmount when libblkid is disabled" >&5 --$as_echo "$as_me: error: cannot enable libmount when libblkid is disabled" >&2;} -- { (exit 1); exit 1; }; } ;; --esac -- - - - diff --git a/package/util-linux-ng/patches/patch-shlibs_blkid_src_Makefile_in b/package/util-linux-ng/patches/patch-shlibs_blkid_src_Makefile_in deleted file mode 100644 index ff041b5a5..000000000 --- a/package/util-linux-ng/patches/patch-shlibs_blkid_src_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- util-linux-ng-2.18.orig/shlibs/blkid/src/Makefile.in 2010-06-30 14:53:06.000000000 +0200 -+++ util-linux-ng-2.18/shlibs/blkid/src/Makefile.in 2011-01-24 11:53:06.000000000 +0100 -@@ -261,7 +261,7 @@ SUID_CFLAGS = @SUID_CFLAGS@ - SUID_LDFLAGS = @SUID_LDFLAGS@ - USE_NLS = @USE_NLS@ - UUID_CFLAGS = @UUID_CFLAGS@ --UUID_LIBS = @UUID_LIBS@ -+UUID_LIBS = -luuid - VERSION = @VERSION@ - XGETTEXT = @XGETTEXT@ - XSLTPROC = @XSLTPROC@ diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index 7e414bde8..c0dad7d06 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -53,6 +53,7 @@ CONFIGURE_ARGS+= --disable-use-tty-group \ --enable-libblkid \ --enable-libmount \ --enable-mount \ + --with-ncurses=$(STAGING_DIR)/usr/include \ --libdir=/usr/lib FAKE_FLAGS+= INSTALLSUID="install -m 4755" TARGET_CFLAGS+= -DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK diff --git a/package/vlc/Makefile b/package/vlc/Makefile index 163028ca2..25edd3edc 100644 --- a/package/vlc/Makefile +++ b/package/vlc/Makefile @@ -14,7 +14,7 @@ PKG_DEPENDS:= libffmpeg xcb-util libtheora libgcrypt PKG_URL:= http://www.videolan.org/vlc/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=vlc/1.1.11/} -PKG_ARCH_DEPENDS:= !cris +PKG_ARCH_DEPENDS:= !cris !avr32 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/xf86-input-evdev/Makefile b/package/xf86-input-evdev/Makefile index c2dcf7c03..f5534ab10 100644 --- a/package/xf86-input-evdev/Makefile +++ b/package/xf86-input-evdev/Makefile @@ -13,6 +13,8 @@ PKG_DEPENDS:= xorg-server kmod-input-evdev PKG_BUILDDEP:= xorg-server PKG_SITES:= ${MASTER_SITE_XORG} +PKG_ARCH_DEPENDS:= !avr32 + PKG_CFLINE_XF86_INPUT_EVDEV:= depends on ADK_TARGET_WITH_INPUT include $(TOPDIR)/mk/package.mk diff --git a/package/xf86-input-evtouch/Makefile b/package/xf86-input-evtouch/Makefile index 2e70bbcfe..c2650e5aa 100644 --- a/package/xf86-input-evtouch/Makefile +++ b/package/xf86-input-evtouch/Makefile @@ -14,6 +14,7 @@ PKG_BUILDDEP:= xorg-server PKG_SITES:= http://www.conan.de/touchscreen/ PKG_NEED_CXX:= 1 +PKG_ARCH_DEPENDS:= !avr32 PKG_CFLINE_XF86_INPUT_EVTOUCH:= depends on ADK_TARGET_WITH_INPUT DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/xf86-input-keyboard/Makefile b/package/xf86-input-keyboard/Makefile index 4bad9c26d..2561b210c 100644 --- a/package/xf86-input-keyboard/Makefile +++ b/package/xf86-input-keyboard/Makefile @@ -14,6 +14,7 @@ PKG_BUILDDEP:= xorg-server PKG_SITES:= ${MASTER_SITE_XORG} PKG_NEED_CXX:= 1 +PKG_ARCH_DEPENDS:= !avr32 PKG_CFLINE_XF86_INPUT_KEYBOARD:= depends on ADK_TARGET_WITH_INPUT include $(TOPDIR)/mk/package.mk diff --git a/package/xf86-input-mouse/Makefile b/package/xf86-input-mouse/Makefile index a229f0b8b..1e152fd47 100644 --- a/package/xf86-input-mouse/Makefile +++ b/package/xf86-input-mouse/Makefile @@ -14,6 +14,7 @@ PKG_BUILDDEP:= xorg-server PKG_SITES:= ${MASTER_SITE_XORG} PKG_NEED_CXX:= 1 +PKG_ARCH_DEPENDS:= !avr32 PKG_CFLINE_XF86_INPUT_MOUSE:= depends on ADK_TARGET_WITH_INPUT include $(TOPDIR)/mk/package.mk diff --git a/package/xf86-video-ati/Makefile b/package/xf86-video-ati/Makefile index f89f63af5..ca85a7c20 100644 --- a/package/xf86-video-ati/Makefile +++ b/package/xf86-video-ati/Makefile @@ -14,6 +14,7 @@ PKG_DEPENDS:= xorg-server libdrm mesalib udev PKG_SITES:= ${MASTER_SITE_XORG} PKG_NEED_CXX:= 1 +PKG_ARCH_DEPENDS:= !avr32 PKG_CFLINE_XF86_VIDEO_ATI:=depends on ADK_TARGET_WITH_VGA include $(TOPDIR)/mk/package.mk diff --git a/package/xf86-video-cirrus/Makefile b/package/xf86-video-cirrus/Makefile index 592f40d5a..2675854bd 100644 --- a/package/xf86-video-cirrus/Makefile +++ b/package/xf86-video-cirrus/Makefile @@ -14,6 +14,7 @@ PKG_BUILDDEP:= xorg-server PKG_SITES:= ${MASTER_SITE_XORG} PKG_NEED_CXX:= 1 +PKG_ARCH_DEPENDS:= !avr32 PKG_CFLINE_XF86_VIDEO_CIRRUS:=depends on ADK_TARGET_WITH_VGA include $(TOPDIR)/mk/package.mk diff --git a/package/xf86-video-fbdev/Makefile b/package/xf86-video-fbdev/Makefile index 41a2bc6d5..5d996a5c3 100644 --- a/package/xf86-video-fbdev/Makefile +++ b/package/xf86-video-fbdev/Makefile @@ -14,6 +14,7 @@ PKG_BUILDDEP:= xorg-server PKG_SITES:= ${MASTER_SITE_XORG} PKG_NEED_CXX:= 1 +PKG_ARCH_DEPENDS:= !avr32 PKG_CFLINE_XF86_VIDEO_FBDEV:= depends on ADK_TARGET_WITH_VGA include $(TOPDIR)/mk/package.mk diff --git a/package/xf86-video-intel/Makefile b/package/xf86-video-intel/Makefile index 1fcaf9f3e..3ca23fa1e 100644 --- a/package/xf86-video-intel/Makefile +++ b/package/xf86-video-intel/Makefile @@ -14,6 +14,7 @@ PKG_BUILDDEP:= xorg-server libdrm xf86driproto MesaLib PKG_SITES:= ${MASTER_SITE_XORG} PKG_NEED_CXX:= 1 +PKG_ARCH_DEPENDS:= !avr32 PKG_CFLINE_XF86_VIDEO_INTEL:=depends on ADK_TARGET_WITH_VGA include $(TOPDIR)/mk/package.mk diff --git a/package/xf86-video-siliconmotion/Makefile b/package/xf86-video-siliconmotion/Makefile index e58f699fe..a1565c7d4 100644 --- a/package/xf86-video-siliconmotion/Makefile +++ b/package/xf86-video-siliconmotion/Makefile @@ -14,6 +14,7 @@ PKG_BUILDDEP:= xorg-server PKG_SITES:= ${MASTER_SITE_XORG} PKG_NEED_CXX:= 1 +PKG_ARCH_DEPENDS:= !avr32 PKG_CFLINE_XF86_VIDEO_SILICONMOTION:=depends on ADK_TARGET_WITH_VGA include $(TOPDIR)/mk/package.mk diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile index a5b49b895..1cc5c9756 100644 --- a/package/xfsprogs/Makefile +++ b/package/xfsprogs/Makefile @@ -16,6 +16,7 @@ PKG_SITES:= ftp://oss.sgi.com/projects/xfs/cmd_tars/ \ ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/ PKG_CFLINE_XFSPROGS:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC +PKG_TARGET_DEPENDS:= !atmel-ngw100 include ${TOPDIR}/mk/package.mk diff --git a/package/xinit/Makefile b/package/xinit/Makefile index 431cd8564..b2ae34a69 100644 --- a/package/xinit/Makefile +++ b/package/xinit/Makefile @@ -15,7 +15,7 @@ PKG_URL:= http://xorg.freedesktop.org/ PKG_SITES:= http://xorg.freedesktop.org/archive/individual/app/ PKG_NEED_CXX:= 1 -PKG_ARCH_DEPENDS:= !cris +PKG_ARCH_DEPENDS:= !cris !avr32 include $(TOPDIR)/mk/package.mk diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 063fa92e7..730d5c093 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -26,7 +26,7 @@ PKGSD_XORG_SERVER_DEV:= Xorg server development files PKGSC_XORG_SERVER_DEV:= x11/devel PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA -PKG_ARCH_DEPENDS:= !cris +PKG_ARCH_DEPENDS:= !cris !avr32 PKG_FLAVOURS_XORG_SERVER:= WITH_DRI WITH_KDRIVE PKGFS_WITH_DRI:= mesalib -- cgit v1.2.3