diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/Makefile | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/Makefile')
| -rw-r--r-- | package/Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/package/Makefile b/package/Makefile index 4fb421de7..079405854 100644 --- a/package/Makefile +++ b/package/Makefile @@ -66,7 +66,7 @@ package-$(ADK_PACKAGE_DECO) += deco package-$(ADK_PACKAGE_DEVICE_MAPPER) += device-mapper package-$(ADK_COMPILE_DHCP) += dhcp package-$(ADK_PACKAGE_DHCP_FORWARDER) += dhcp-forwarder -package-$(ADK_PACKAGE_DHCP6) += dhcp6 +package-$(ADK_COMPILE_DHCPV6) += dhcpv6 package-$(ADK_PACKAGE_DIGITEMP) += digitemp package-$(ADK_PACKAGE_DNSMASQ) += dnsmasq package-$(ADK_PACKAGE_DOSFSTOOLS) += dosfstools @@ -111,6 +111,9 @@ package-$(ADK_PACKAGE_GLIB2) += glib2 ifeq (${ADK_TARGET_LIB_GLIBC},y) package-$(ADK_PACKAGE_GLIBC) += glibc endif +ifeq (${ADK_NATIVE},y) +package-$(ADK_PACKAGE_LIBC) += libc +endif package-$(ADK_PACKAGE_GMEDIASERVER) += gmediaserver package-$(ADK_COMPILE_GMP) += gmp package-$(ADK_COMPILE_GNUTLS) += gnutls @@ -137,7 +140,6 @@ package-$(ADK_COMPILE_IPROUTE2) += iproute2 package-$(ADK_PACKAGE_IPSEC_TOOLS) += ipsec-tools package-$(ADK_PACKAGE_IPSET) += ipset package-$(ADK_COMPILE_IPTABLES) += iptables -package-$(ADK_PACKAGE_IPTABLES_SNMP) += iptables-snmp package-$(ADK_PACKAGE_IPTRAF) += iptraf package-$(ADK_PACKAGE_IRSSI) += irssi package-$(ADK_PACKAGE_IW) += iw @@ -256,7 +258,6 @@ package-$(ADK_PACKAGE_NETSTAT_NAT) += netstat-nat package-$(ADK_PACKAGE_NFS_UTILS) += nfs-utils package-$(ADK_PACKAGE_NFS_KERNEL_NFSD) += nfs-utils package-$(ADK_PACKAGE_NMAP) += nmap -package-$(ADK_PACKAGE_NOCATSPLASH) += nocatsplash package-$(ADK_PACKAGE_NTPCLIENT) += ntpclient package-$(ADK_PACKAGE_OBEXFTP) += obexftp package-$(ADK_PACKAGE_OLSRD) += olsrd @@ -343,7 +344,6 @@ package-$(ADK_PACKAGE_SSLTUNNEL) += ssltunnel package-$(ADK_PACKAGE_SSMTP) += ssmtp package-$(ADK_PACKAGE_STRACE) += strace package-$(ADK_PACKAGE_STRESS) += stress -package-$(ADK_PACKAGE_STRONGSWAN) += strongswan package-$(ADK_PACKAGE_SUBVERSION) += subversion package-$(ADK_PACKAGE_SWCONFIG) += swconfig package-$(ADK_PACKAGE_SYSLOG_NG) += syslog-ng @@ -360,7 +360,9 @@ package-$(ADK_PACKAGE_TOR) += tor package-$(ADK_PACKAGE_TRAFSHOW) += trafshow package-$(ADK_PACKAGE_TTCP) += ttcp ifneq (${ADK_TARGET_LIB_GLIBC},y) +ifneq (${ADK_NATIVE},y) package-$(ADK_PACKAGE_UCLIBC) += uclibc +endif package-$(ADK_PACKAGE_UCLIBCXX) += uclibc++ endif package-$(ADK_PACKAGE_UDEV) += udev @@ -408,7 +410,7 @@ package-$(ADK_PACKAGE_ZSH) += zsh # kernel addon packages package-$(ADK_PACKAGE_KMOD_EM28XX) += em28xx package-$(ADK_PACKAGE_KMOD_MAC80211) += mac80211 -package-$(ADK_PACKAGE_KMOD_FS_NTFS_3G) += ntfs-3g +package-$(ADK_PACKAGE_NTFS_3G) += ntfs-3g DOWNLOAD:=$(patsubst %,%-download,$(package-y) $(package-m)) COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m)) |