From 9436a026e2e23d207fbdcb9e8bc9b076e3573700 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 22 Jan 2011 22:37:50 +0100 Subject: activate GCC cflags check, cleanup FLAGS stuff in OpenADK. * remove TCFLAGS/TLDFLAGS/TCPPFLAGS and only use TARGET_CFLAGS/TARGET_LDFLAGS/TARGET_CPPFLAGS, ... * activate GCC_HONOUR_COPTS and fix all packages to honour CFLAGS * use CC_FOR_BUILD, CFLAGS_FOR_BUILD, ... for all build compilation, remove HOST* variants * introduce KERNEL_MODULE_FLAGS for external kernel modules * mark rpm package as broken, mark syslinux for native builds only, mark libhugetlb for eglibc/glibc only usage --- package/aiccu/Makefile | 12 +- package/alix-switch/Makefile | 6 +- package/arpd/Makefile | 8 +- package/asterisk/Makefile | 9 +- package/atftp/Makefile | 9 +- package/aufs2-util/Makefile | 2 +- package/aufs2-util/patches/patch-Makefile | 8 +- package/avahi/Makefile | 2 +- package/axtls/Makefile | 4 +- package/bind/Makefile | 33 +- package/binutils/Makefile | 2 +- package/bitlbee/Makefile | 2 +- package/bzip2/Makefile | 3 +- package/cryptinit/Makefile | 4 +- package/cups/Makefile | 4 +- package/cutter/Makefile | 6 +- package/cxxtools/Makefile | 10 +- package/digitemp/Makefile | 2 +- package/dillo/Makefile | 5 +- package/e2fsprogs/Makefile | 10 +- package/eglibc/Makefile | 6 +- package/elinks/Makefile | 2 +- package/ether-wake/Makefile | 6 +- package/exmap/Makefile | 7 +- package/faad2/Makefile | 2 +- package/fakeidentd/Makefile | 6 +- package/ffmpeg/Makefile | 6 +- package/firefox/Makefile | 10 +- package/firefox/patches/patch-configure | 4 +- .../patches/patch-security_coreconf_Linux_mk | 15 + .../patches/patch-security_coreconf_command_mk | 11 + package/gatling/Makefile | 4 +- package/gcc/Makefile | 7 +- package/gdb/Makefile | 6 +- package/gpm/Makefile | 2 +- package/gpsd/Makefile | 8 +- package/haserl/Makefile | 2 +- package/heimdal/Makefile | 14 +- .../heimdal/patches/patch-lib_roken_Makefile_in | 2 +- package/httping/Makefile | 3 +- package/huawei/Makefile | 4 +- package/icecast/Makefile | 2 +- package/id3lib/Makefile | 6 +- package/igmpproxy/Makefile | 5 +- package/iperf/Makefile | 6 +- package/iproute2/Makefile | 4 +- package/ipset/Makefile | 5 +- package/ipset/patches/patch-Makefile | 36 + package/iptraf/patches/patch-src_Makefile | 70 +- package/iptraf/patches/patch-support_Makefile | 9 +- package/iw/Makefile | 2 +- package/knock/Makefile | 1 - package/krb5/Makefile | 2 +- package/libart/Makefile | 2 + package/libevent/Makefile | 3 +- package/libhugetlbfs/Makefile | 6 +- package/libhugetlbfs/patches/patch-Makefile | 6 +- package/libhugetlbfs/patches/patch-morecore_c | 11 + package/libhugetlbfs/patches/patch-version | 5 + package/libiconv/Makefile | 2 +- package/libid3tag/Makefile | 2 +- package/libid3tag/patches/patch-configure | 14 + package/libnet/Makefile | 1 - package/libosip2/patches/patch-configure | 11 + package/libowfat/Makefile | 2 +- package/libpcap/Makefile | 4 +- package/libpri/Makefile | 2 +- package/libpri/patches/patch-Makefile | 34 +- package/libupnp/Makefile | 2 +- package/libvirt/Makefile | 2 +- package/lighttpd/Makefile | 2 +- package/logrotate/Makefile | 2 +- package/lua/Makefile | 4 +- package/lynx/Makefile | 7 +- package/madplay/Makefile | 2 +- package/madplay/patches/patch-configure | 14 + package/maradns/Makefile | 7 +- package/maradns/patches/cross-compile-fix.patch | 18 +- package/maradns/patches/patch-Makefile | 22 +- package/maradns/patches/patch-build_Makefile_linux | 8 +- package/maradns/patches/patch-dns_Makefile | 23 +- .../maradns/patches/patch-dns_Makefile_recursive | 21 + package/maradns/patches/patch-libs_Makefile | 31 + package/maradns/patches/patch-parse_Makefile | 80 + .../maradns/patches/patch-qual_Makefile_threadsafe | 9 + .../maradns/patches/patch-rng_rng-32bit-tables_h | 4 +- package/maradns/patches/patch-server_Makefile | 40 +- .../patches/patch-server_Makefile_recursive | 37 + package/maradns/patches/patch-tcp_Makefile | 19 +- .../maradns/patches/patch-tcp_Makefile_recursive | 17 + .../maradns/patches/patch-tools_Makefile_recursive | 25 + package/mgetty/patches/patch-Makefile | 22 +- package/miax/Makefile | 6 +- package/microperl/Makefile | 2 +- package/microperl/patches/patch-Makefile_micro | 4 +- package/miredo/Makefile | 2 +- package/mksh/Makefile | 6 +- package/mpd/Makefile | 2 +- package/mplayer/Makefile | 4 +- package/mrd6/Makefile | 6 +- package/mt-daapd/Makefile | 2 +- package/mtd/Makefile | 4 +- package/mysql/Makefile | 26 +- package/mysql/patches/patch-include_config_h_in | 4 +- .../mysql/patches/patch-scripts_mysql_config_sh | 11 + package/nand/Makefile | 6 +- package/ncurses/Makefile | 2 +- package/net-snmp/Makefile | 2 +- package/net-snmp/patches/patch-net-snmp-config_in | 15 + package/nfs-utils/patches/patch-config_log | 5831 ++++++++++++++ .../nfs-utils/patches/patch-utils_gssd_Makefile_in | 25 + package/nmap/Makefile | 2 +- package/nspr/Makefile | 2 +- package/nss/Makefile | 12 +- package/ntpclient/Makefile | 2 +- package/nut/Makefile | 14 +- package/olsrd/Makefile | 2 +- package/openswan/patches/patch-Makefile_top | 11 + package/openswan/patches/patch-lib_libdns_Makefile | 22 +- .../openswan/patches/patch-lib_libdns_Makefile_in | 20 + package/openswan/patches/patch-lib_libisc_Makefile | 11 + .../openswan/patches/patch-lib_libisc_Makefile_in | 23 + package/osiris/Makefile | 2 +- package/osiris/patches/patch-configure | 23 +- .../patches/patch-src_osirisd_modules_Makefile_am | 11 + .../patches/patch-src_osirisd_modules_Makefile_in | 11 + package/owfs/Makefile | 2 +- package/palantir/Makefile | 6 +- package/palantir/patches/patch-server_Makefile | 26 + .../palantir/patches/patch-server_libgsm_Makefile | 53 + package/parprouted/Makefile | 4 +- package/pcre/Makefile | 2 +- package/php/Makefile | 2 +- package/picocom/Makefile | 1 - package/picocom/patches/patch-Makefile | 18 + package/pmacct/Makefile | 4 +- package/pmacct/patches/patch-configure | 41 + .../patches/patch-src_nfprobe_plugin_netflow9_c | 64 - package/portmap/Makefile | 6 +- package/portsentry/Makefile | 2 +- package/ppp/Makefile | 4 +- package/ppp/patches/patch-chat_Makefile_linux | 52 +- package/ppp/patches/patch-configure | 84 +- package/ppp/patches/patch-linux_Makefile_top | 17 + package/ppp/patches/patch-pppd_Makefile_linux | 224 +- package/ppp/patches/patch-pppd_ccp_c | 1362 ---- package/ppp/patches/patch-pppd_ccp_h | 20 - package/ppp/patches/patch-pppd_chap_ms_c | 22 - .../ppp/patches/patch-pppd_plugins_Makefile_linux | 32 +- .../patch-pppd_plugins_pppoatm_Makefile_linux | 50 +- .../patch-pppd_plugins_pppol2tp_Makefile_linux | 36 +- .../patch-pppd_plugins_radius_Makefile_linux | 88 +- .../patch-pppd_plugins_rp-pppoe_Makefile_linux | 64 +- package/ppp/patches/patch-pppd_sys-linux_c | 16 - package/ppp/patches/patch-pppdump_Makefile_linux | 37 +- package/ppp/patches/patch-pppstats_Makefile_linux | 48 +- package/ppp/src/linux/Makedefs.gcc | 21 + package/ppp/src/makedefs.linux | 14 - package/pptpd/Makefile | 2 +- package/privoxy/Makefile | 4 +- package/procmail/Makefile | 2 +- package/python/Makefile | 2 +- package/python2/Makefile | 2 +- package/python2/patches/patch-Makefile_pre | 267 + package/python2/patches/patch-Makefile_pre_in | 11 +- package/qemu/Makefile | 4 +- package/rarpd/Makefile | 2 +- package/rarpd/patches/patch-Makefile_in | 18 +- package/rpcbind/Makefile | 2 +- package/rpm/Makefile | 7 +- package/rpm/patches/patch-configure | 11 + package/rrdcollect/Makefile | 5 +- package/rrdtool/Makefile | 2 +- package/rtsp/Makefile | 5 +- package/samba/Makefile | 2 +- package/scsi-spin/Makefile | 6 +- package/serdisplib/Makefile | 7 +- package/setpwc/Makefile | 5 +- package/setserial/Makefile | 3 +- package/setserial/patches/patch-Makefile_in | 20 + package/sqlite/Makefile | 6 +- package/stress/patches/patch-src_Makefile_in | 11 + package/strongswan/patches/patch-configure | 19 + package/syslinux/Makefile | 2 + package/syslinux/patches/patch-MCONFIG | 19 + package/syslinux/patches/patch-MCONFIG_build | 12 + .../syslinux/patches/patch-com32_cmenu_complex_c32 | Bin 0 -> 74113 bytes .../syslinux/patches/patch-com32_cmenu_display_c32 | Bin 0 -> 28995 bytes .../syslinux/patches/patch-com32_cmenu_simple_c32 | Bin 0 -> 49545 bytes .../syslinux/patches/patch-com32_cmenu_test2_c32 | Bin 0 -> 73558 bytes .../syslinux/patches/patch-com32_cmenu_test_c32 | Bin 0 -> 71651 bytes .../patches/patch-com32_gfxboot_gfxboot_c32 | Bin 0 -> 44803 bytes package/syslinux/patches/patch-com32_hdt_hdt_c32 | Bin 0 -> 474295 bytes package/syslinux/patches/patch-com32_lib_MCONFIG | 27 + .../patches/patch-com32_libutil_libutil_com_a | Bin 0 -> 63705 bytes .../patches/patch-com32_libutil_libutil_lnx_a | Bin 0 -> 269249 bytes .../syslinux/patches/patch-com32_lua_src_lua_c32 | Bin 0 -> 415545 bytes .../syslinux/patches/patch-com32_mboot_mboot_c32 | Bin 0 -> 63379 bytes package/syslinux/patches/patch-com32_menu_menu_c32 | Bin 0 -> 115544 bytes .../syslinux/patches/patch-com32_menu_vesamenu_c32 | Bin 0 -> 269531 bytes .../syslinux/patches/patch-com32_modules_cat_c32 | Bin 0 -> 12237 bytes .../syslinux/patches/patch-com32_modules_chain_c32 | Bin 0 -> 36049 bytes .../syslinux/patches/patch-com32_modules_cmd_c32 | Bin 0 -> 1683 bytes .../patches/patch-com32_modules_config_c32 | Bin 0 -> 10319 bytes .../syslinux/patches/patch-com32_modules_cpuid_c32 | Bin 0 -> 11473 bytes .../patches/patch-com32_modules_cpuidtest_c32 | Bin 0 -> 22736 bytes .../syslinux/patches/patch-com32_modules_disk_c32 | Bin 0 -> 11360 bytes .../patches/patch-com32_modules_dmitest_c32 | Bin 0 -> 69719 bytes .../syslinux/patches/patch-com32_modules_elf_c32 | Bin 0 -> 53553 bytes .../patches/patch-com32_modules_ethersel_c32 | Bin 0 -> 54754 bytes .../patches/patch-com32_modules_gpxecmd_c32 | Bin 0 -> 5022 bytes .../syslinux/patches/patch-com32_modules_host_c32 | Bin 0 -> 9590 bytes .../patches/patch-com32_modules_ifcpu64_c32 | Bin 0 -> 2627 bytes .../syslinux/patches/patch-com32_modules_ifcpu_c32 | Bin 0 -> 28662 bytes .../patches/patch-com32_modules_ifplop_c32 | Bin 0 -> 4982 bytes .../patches/patch-com32_modules_kbdmap_c32 | Bin 0 -> 10637 bytes .../syslinux/patches/patch-com32_modules_linux_c32 | Bin 0 -> 34675 bytes .../syslinux/patches/patch-com32_modules_ls_c32 | Bin 0 -> 20023 bytes .../patches/patch-com32_modules_meminfo_c32 | Bin 0 -> 11147 bytes .../patches/patch-com32_modules_pcitest_c32 | Bin 0 -> 60465 bytes .../patches/patch-com32_modules_pmload_c32 | Bin 0 -> 27073 bytes .../syslinux/patches/patch-com32_modules_pwd_c32 | Bin 0 -> 4106 bytes .../patches/patch-com32_modules_sanboot_c32 | Bin 0 -> 5150 bytes .../syslinux/patches/patch-com32_modules_sdi_c32 | Bin 0 -> 47885 bytes .../patches/patch-com32_modules_vesainfo_c32 | Bin 0 -> 11300 bytes .../patches/patch-com32_modules_vpdtest_c32 | Bin 0 -> 12100 bytes .../patches/patch-com32_modules_whichsys_c32 | Bin 0 -> 5807 bytes package/syslinux/patches/patch-com32_rosh_rosh_c32 | Bin 0 -> 39736 bytes .../patches/patch-com32_samples_advdump_c32 | Bin 0 -> 10637 bytes .../patches/patch-com32_samples_entrydump_c32 | Bin 0 -> 9941 bytes .../patches/patch-com32_samples_fancyhello_c32 | Bin 0 -> 17857 bytes .../patches/patch-com32_samples_fancyhello_lnx | Bin 0 -> 25415 bytes .../syslinux/patches/patch-com32_samples_hello_c32 | Bin 0 -> 10645 bytes .../patches/patch-com32_samples_keytest_c32 | Bin 0 -> 19824 bytes .../patches/patch-com32_samples_keytest_lnx | Bin 0 -> 51699 bytes .../patches/patch-com32_samples_resolv_c32 | Bin 0 -> 9747 bytes .../patches/patch-com32_samples_serialinfo_c32 | Bin 0 -> 9802 bytes .../patches/patch-com32_sysdump_sysdump_c32 | Bin 0 -> 72542 bytes package/tcl/Makefile | 2 +- package/tcsh/patches/patch-Makefile_in | 2 +- package/tinc/patches/patch-src_Makefile_in | 11 + package/tntnet/Makefile | 6 +- package/traceroute/Makefile | 2 +- package/trafshow/Makefile | 5 +- package/trafshow/patches/patch-Makefile_in | 38 +- package/tslib/patches/autotool.patch | 2 +- package/tslib/patches/patch-ltmain_sh | 8416 -------------------- package/ttcp/Makefile | 6 +- package/tzdata/Makefile | 2 + package/tzdata/patches/patch-Makefile | 64 + package/ulogd/Makefile | 2 +- package/ussp-push/Makefile | 4 +- package/util-linux-ng/Makefile | 8 +- package/uvd/Makefile | 6 +- package/valgrind/patches/patch-configure | 52 +- package/vnc-reflector/Makefile | 5 +- package/vnc-reflector/patches/patch-Makefile | 55 + package/vnstat/patches/patch-src_Makefile | 9 + package/weechat/Makefile | 6 +- package/wpa_supplicant/Makefile | 6 +- package/xbindkeys/patches/patch-Makefile_in | 13 + package/xf86-input-evtouch/patches/patch-configure | 11 + package/xfsprogs/Makefile | 2 +- package/xfsprogs/patches/patch-configure | 352 + package/xfsprogs/patches/patch-copy_xfs_copy_c | 82 + package/xfsprogs/patches/patch-fsr_xfs_fsr_c | 57 + package/xfsprogs/patches/patch-libxfs_linux_c | 35 + package/xinetd/patches/ar.patch | 72 - package/xinetd/patches/destdir.patch | 28 - package/xinetd/patches/patch-Makefile_in | 36 + .../xinetd/patches/patch-libs_src_misc_Makefile_in | 11 + .../patches/patch-libs_src_portable_Makefile_in | 11 + .../xinetd/patches/patch-libs_src_pset_Makefile_in | 11 + .../xinetd/patches/patch-libs_src_sio_Makefile_in | 11 + .../xinetd/patches/patch-libs_src_str_Makefile_in | 11 + .../xinetd/patches/patch-libs_src_xlog_Makefile_in | 11 + 276 files changed, 8821 insertions(+), 10616 deletions(-) create mode 100644 package/firefox/patches/patch-security_coreconf_Linux_mk create mode 100644 package/firefox/patches/patch-security_coreconf_command_mk create mode 100644 package/ipset/patches/patch-Makefile create mode 100644 package/libhugetlbfs/patches/patch-morecore_c create mode 100644 package/libhugetlbfs/patches/patch-version create mode 100644 package/libid3tag/patches/patch-configure create mode 100644 package/libosip2/patches/patch-configure create mode 100644 package/madplay/patches/patch-configure create mode 100644 package/maradns/patches/patch-dns_Makefile_recursive create mode 100644 package/maradns/patches/patch-libs_Makefile create mode 100644 package/maradns/patches/patch-parse_Makefile create mode 100644 package/maradns/patches/patch-qual_Makefile_threadsafe create mode 100644 package/maradns/patches/patch-server_Makefile_recursive create mode 100644 package/maradns/patches/patch-tcp_Makefile_recursive create mode 100644 package/maradns/patches/patch-tools_Makefile_recursive create mode 100644 package/mysql/patches/patch-scripts_mysql_config_sh create mode 100644 package/net-snmp/patches/patch-net-snmp-config_in create mode 100644 package/nfs-utils/patches/patch-config_log create mode 100644 package/nfs-utils/patches/patch-utils_gssd_Makefile_in create mode 100644 package/openswan/patches/patch-Makefile_top create mode 100644 package/openswan/patches/patch-lib_libdns_Makefile_in create mode 100644 package/openswan/patches/patch-lib_libisc_Makefile create mode 100644 package/openswan/patches/patch-lib_libisc_Makefile_in create mode 100644 package/osiris/patches/patch-src_osirisd_modules_Makefile_am create mode 100644 package/osiris/patches/patch-src_osirisd_modules_Makefile_in create mode 100644 package/palantir/patches/patch-server_Makefile create mode 100644 package/palantir/patches/patch-server_libgsm_Makefile create mode 100644 package/picocom/patches/patch-Makefile create mode 100644 package/pmacct/patches/patch-configure delete mode 100644 package/pmacct/patches/patch-src_nfprobe_plugin_netflow9_c create mode 100644 package/ppp/patches/patch-linux_Makefile_top delete mode 100644 package/ppp/patches/patch-pppd_ccp_c delete mode 100644 package/ppp/patches/patch-pppd_ccp_h delete mode 100644 package/ppp/patches/patch-pppd_chap_ms_c delete mode 100644 package/ppp/patches/patch-pppd_sys-linux_c create mode 100644 package/ppp/src/linux/Makedefs.gcc delete mode 100644 package/ppp/src/makedefs.linux create mode 100644 package/python2/patches/patch-Makefile_pre create mode 100644 package/rpm/patches/patch-configure create mode 100644 package/setserial/patches/patch-Makefile_in create mode 100644 package/stress/patches/patch-src_Makefile_in create mode 100644 package/strongswan/patches/patch-configure create mode 100644 package/syslinux/patches/patch-MCONFIG create mode 100644 package/syslinux/patches/patch-MCONFIG_build create mode 100644 package/syslinux/patches/patch-com32_cmenu_complex_c32 create mode 100644 package/syslinux/patches/patch-com32_cmenu_display_c32 create mode 100644 package/syslinux/patches/patch-com32_cmenu_simple_c32 create mode 100644 package/syslinux/patches/patch-com32_cmenu_test2_c32 create mode 100644 package/syslinux/patches/patch-com32_cmenu_test_c32 create mode 100644 package/syslinux/patches/patch-com32_gfxboot_gfxboot_c32 create mode 100644 package/syslinux/patches/patch-com32_hdt_hdt_c32 create mode 100644 package/syslinux/patches/patch-com32_lib_MCONFIG create mode 100644 package/syslinux/patches/patch-com32_libutil_libutil_com_a create mode 100644 package/syslinux/patches/patch-com32_libutil_libutil_lnx_a create mode 100644 package/syslinux/patches/patch-com32_lua_src_lua_c32 create mode 100644 package/syslinux/patches/patch-com32_mboot_mboot_c32 create mode 100644 package/syslinux/patches/patch-com32_menu_menu_c32 create mode 100644 package/syslinux/patches/patch-com32_menu_vesamenu_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_cat_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_chain_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_cmd_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_config_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_cpuid_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_cpuidtest_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_disk_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_dmitest_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_elf_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_ethersel_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_gpxecmd_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_host_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_ifcpu64_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_ifcpu_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_ifplop_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_kbdmap_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_linux_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_ls_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_meminfo_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_pcitest_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_pmload_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_pwd_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_sanboot_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_sdi_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_vesainfo_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_vpdtest_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_whichsys_c32 create mode 100644 package/syslinux/patches/patch-com32_rosh_rosh_c32 create mode 100644 package/syslinux/patches/patch-com32_samples_advdump_c32 create mode 100644 package/syslinux/patches/patch-com32_samples_entrydump_c32 create mode 100644 package/syslinux/patches/patch-com32_samples_fancyhello_c32 create mode 100644 package/syslinux/patches/patch-com32_samples_fancyhello_lnx create mode 100644 package/syslinux/patches/patch-com32_samples_hello_c32 create mode 100644 package/syslinux/patches/patch-com32_samples_keytest_c32 create mode 100644 package/syslinux/patches/patch-com32_samples_keytest_lnx create mode 100644 package/syslinux/patches/patch-com32_samples_resolv_c32 create mode 100644 package/syslinux/patches/patch-com32_samples_serialinfo_c32 create mode 100644 package/syslinux/patches/patch-com32_sysdump_sysdump_c32 create mode 100644 package/tinc/patches/patch-src_Makefile_in delete mode 100644 package/tslib/patches/patch-ltmain_sh create mode 100644 package/tzdata/patches/patch-Makefile create mode 100644 package/vnc-reflector/patches/patch-Makefile create mode 100644 package/vnstat/patches/patch-src_Makefile create mode 100644 package/xbindkeys/patches/patch-Makefile_in create mode 100644 package/xf86-input-evtouch/patches/patch-configure create mode 100644 package/xfsprogs/patches/patch-configure create mode 100644 package/xfsprogs/patches/patch-copy_xfs_copy_c create mode 100644 package/xfsprogs/patches/patch-fsr_xfs_fsr_c create mode 100644 package/xfsprogs/patches/patch-libxfs_linux_c delete mode 100644 package/xinetd/patches/ar.patch delete mode 100644 package/xinetd/patches/destdir.patch create mode 100644 package/xinetd/patches/patch-Makefile_in create mode 100644 package/xinetd/patches/patch-libs_src_misc_Makefile_in create mode 100644 package/xinetd/patches/patch-libs_src_portable_Makefile_in create mode 100644 package/xinetd/patches/patch-libs_src_pset_Makefile_in create mode 100644 package/xinetd/patches/patch-libs_src_sio_Makefile_in create mode 100644 package/xinetd/patches/patch-libs_src_str_Makefile_in create mode 100644 package/xinetd/patches/patch-libs_src_xlog_Makefile_in (limited to 'package') diff --git a/package/aiccu/Makefile b/package/aiccu/Makefile index 5eeeac943..f9f12f0be 100644 --- a/package/aiccu/Makefile +++ b/package/aiccu/Makefile @@ -20,13 +20,13 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,AICCU,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIG_STYLE:= manual -INSTALL_STYLE:= manual +CONFIG_STYLE:= manual +INSTALL_STYLE:= manual -TCFLAGS+= -D_REENTRANT -D_GNU_SOURCE -DAICCU_CONSOLE \ - -D_LINUX -DHAS_IFHEAD -DAICCU_TYPE=\"linux\" -TLDFLAGS+= -pthread -lresolv -MAKE_FLAGS+= CC='${TARGET_CC}' CFLAGS='${TCFLAGS}' LDFLAGS='${TLDFLAGS}' +TARGET_CPPFLAGS+= -D_REENTRANT -D_GNU_SOURCE -DAICCU_CONSOLE \ + -D_LINUX -DHAS_IFHEAD -DAICCU_TYPE=\"linux\" +TARGET_LDFLAGS+= -pthread -lresolv +MAKE_FLAGS+= CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS}' LDFLAGS='${TARGET_LDFLAGS}' do-install: $(INSTALL_DIR) $(IDIR_AICCU)/usr/sbin $(IDIR_AICCU)/etc diff --git a/package/alix-switch/Makefile b/package/alix-switch/Makefile index 0317fdf7d..873594dea 100644 --- a/package/alix-switch/Makefile +++ b/package/alix-switch/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= alix-switch PKG_VERSION:= 1.0 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_DESCR:= daemon listening on button events PKG_SECTION:= base PKG_URL:= http://openadk.org/ @@ -20,8 +20,10 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual +TARGET_CFLAGS+= -Wall + do-build: - ${TARGET_CC} -Wall ${TCPPFLAGS} ${TCFLAGS} \ + ${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \ -o ${WRKBUILD}/alix-switchd ${WRKBUILD}/alix-switchd.c do-install: diff --git a/package/arpd/Makefile b/package/arpd/Makefile index 722faae9d..32730f11d 100644 --- a/package/arpd/Makefile +++ b/package/arpd/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= arpd PKG_VERSION:= 0.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= e2911fa9de1b92ef50deda1489ae944d PKG_DESCR:= Generates ARP responses for IP address ranges PKG_SECTION:= route @@ -23,9 +23,9 @@ $(eval $(call PKG_template,ARPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_ CONFIGURE_ARGS+= --with-libdnet=${STAGING_TARGET_DIR}/usr \ --with-libevent=${STAGING_TARGET_DIR}/usr \ --with-libpcap=${STAGING_TARGET_DIR}/usr -MAKE_FLAGS+= CFLAGS="${TCFLAGS}" \ - INCLS="-I. -I${STAGING_TARGET_DIR}/usr/include" \ - LIBS="-L${STAGING_TARGET_DIR}/usr/lib -lpcap -ldnet -levent" +MAKE_FLAGS+= CFLAGS="${TARGET_CFLAGS}" \ + INCLS="-I. ${TARGET_CPPFLAGS}" \ + LIBS="-lpcap -ldnet -levent" post-install: ${INSTALL_DIR} ${IDIR_ARPD}/usr/sbin diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 2b1fc70a5..73ac40acb 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -84,7 +84,7 @@ endif ifneq (${ADK_PACKAGE_ASTERISK_FORMAT_VORBIS},) CONFIGURE_ARGS+= --with-ogg=${STAGING_TARGET_DIR}/usr \ --with-vorbis=${STAGING_TARGET_DIR}/usr -TLDFLAGS+= -logg +TARGET_LDFLAGS+= -logg endif ifneq (${ADK_PACKAGE_ASTERISK_CURL},) CONFIGURE_ARGS+= --with-libcurl=${STAGING_TARGET_DIR}/usr @@ -99,12 +99,11 @@ endif INSTALL_STYLE:= manual -TLDFLAGS+= -lm -MAKE_ENV= ASTCFLAGS="${TCPPFLAGS} -DHAVE_STRTOQ" \ - ASTLDFLAGS="${TLDFLAGS}" +TARGET_LDFLAGS+= -lm +MAKE_ENV= ASTCFLAGS="${TARGET_CPPFLAGS} -DHAVE_STRTOQ" \ + ASTLDFLAGS="${TARGET_LDFLAGS}" MAKE_FLAGS+= DESTDIR="$(WRKINST)" \ OPTIMIZE="${TARGET_OPTIMIZATION}" \ - STRIP="${TARGET_CROSS}strip" \ NOISY_BUILD=1 ALL_TARGET:= all install samples diff --git a/package/atftp/Makefile b/package/atftp/Makefile index 601e9aba3..e7d759066 100644 --- a/package/atftp/Makefile +++ b/package/atftp/Makefile @@ -16,19 +16,20 @@ PKG_SITES:= ftp://ftp.mamalinux.com/pub/atftp/ PKG_SUBPKGS:= ATFTP ATFTPD PKGSD_ATFTPD:= TFTP server +PKGSS_ATFTPD:= libreadline libncurses include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,ATFTP,atftp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,ATFTPD,atftpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ATFTPD},${PKG_SECTION})) -MAKE_FLAGS+= CFLAGS="${TCFLAGS} -Wall -D_REENTRANT -fno-inline" +MAKE_FLAGS+= CFLAGS="${TARGET_CFLAGS} -Wall -D_REENTRANT -fno-inline" -post-install: - # atftp client +atftp-install: $(INSTALL_DIR) $(IDIR_ATFTP)/usr/bin $(INSTALL_BIN) $(WRKBUILD)/atftp $(IDIR_ATFTP)/usr/bin - # atftp server + +atftpd-install: $(INSTALL_DIR) $(IDIR_ATFTPD)/usr/sbin $(INSTALL_BIN) $(WRKBUILD)/atftpd $(IDIR_ATFTPD)/usr/sbin diff --git a/package/aufs2-util/Makefile b/package/aufs2-util/Makefile index f42767dbe..83e39c26e 100644 --- a/package/aufs2-util/Makefile +++ b/package/aufs2-util/Makefile @@ -29,7 +29,7 @@ $(eval $(call PKG_template,AUFS2_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}, $(eval $(call PKG_template,LIBAU,libau,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBAU},${PKG_SECTION})) CONFIG_STYLE:= manual -XAKE_FLAGS+= Install=install HOSTCPPFLAGS="-I${LINUX_HEADER_DIR}/include" +XAKE_FLAGS+= Install=install CPPFLAGS_FOR_BUILD="-I${LINUX_HEADER_DIR}/include" post-install: $(INSTALL_DIR) $(IDIR_AUFS2_UTIL)/sbin diff --git a/package/aufs2-util/patches/patch-Makefile b/package/aufs2-util/patches/patch-Makefile index d77ea81ec..6a8f74806 100644 --- a/package/aufs2-util/patches/patch-Makefile +++ b/package/aufs2-util/patches/patch-Makefile @@ -4,10 +4,10 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+c2sh c2tmac: CC = ${HOSTCC} -+c2sh c2tmac: CFLAGS= ${HOSTCFLAGS} -+c2sh c2tmac: LDFLAGS= ${HOSTLDFLAGS} -+c2sh c2tmac: CPPFLAGS= ${HOSTCPPFLAGS} -I./libau -I${LINUX_HEADER_DIR}/include ++c2sh c2tmac: CC = ${CC_FOR_BUILD} ++c2sh c2tmac: CFLAGS= ${CFLAGS_FOR_BUILD} ++c2sh c2tmac: LDFLAGS= ${LDFLAGS_FOR_BUILD} ++c2sh c2tmac: CPPFLAGS= ${CPPFLAGS_FOR_BUILD} -I./libau -I${LINUX_HEADER_DIR}/include + CFLAGS += -I./libau CFLAGS += -O -Wall diff --git a/package/avahi/Makefile b/package/avahi/Makefile index ebd811ca9..05ef2a39c 100644 --- a/package/avahi/Makefile +++ b/package/avahi/Makefile @@ -26,7 +26,7 @@ $(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEAS $(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_AVAHI_DNSCONFD},${PKGSD_AVAHI_DNSCONFD},${PKG_SECTION})) $(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBAVAHI},${PKGSC_LIBAVAHI})) -TLDFLAGS+= -lintl +TARGET_LDFLAGS+= -lintl CONFIGURE_ARGS+= --enable-glib \ --disable-qt3 \ --disable-qt4 \ diff --git a/package/axtls/Makefile b/package/axtls/Makefile index 62dbb7226..2d02e722e 100644 --- a/package/axtls/Makefile +++ b/package/axtls/Makefile @@ -29,9 +29,7 @@ CONFIG_STYLE:= manual INSTALL_STYLE:= manual XAKE_FLAGS+= STRIP='' \ - CC='${TARGET_CC}' \ - OPT_CFLAGS='${TARGET_CFLAGS} -fPIC' \ - OPT_LDFLAGS="" + CC='${TARGET_CC}' do-configure: ${CP} ./files/config ${WRKBUILD}/config/.config diff --git a/package/bind/Makefile b/package/bind/Makefile index 278982c4b..2e44d787b 100644 --- a/package/bind/Makefile +++ b/package/bind/Makefile @@ -51,45 +51,46 @@ else CONFIGURE_ARGS+= --disable-ipv6 endif -pre-build: - ${MAKE} -C ${WRKBUILD}/lib/dns \ - BUILD_CC="${HOSTCC}" \ - CC="${HOSTCC}" \ - CFLAGS='${HOSTCFLAGS}' \ - gen - -post-install: - # bind server +CONFIGURE_ENV+= BUILD_CC="${CC_FOR_BUILD}" BUILD_CFLAGS='${CFLAGS_FOR_BUILD}' + +bind-server-install: ${INSTALL_DIR} ${IDIR_BIND_SERVER}/usr/sbin ${IDIR_BIND_SERVER}/etc ${INSTALL_BIN} ${WRKINST}/usr/sbin/named ${IDIR_BIND_SERVER}/usr/sbin/ ${CP} ./files/bind ${IDIR_BIND_SERVER}/etc - # nsupdate + +bind-client-install: ${INSTALL_DIR} ${IDIR_BIND_CLIENT}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/nsupdate ${IDIR_BIND_CLIENT}/usr/bin/ - # rndc + +bind-rndc-install: ${INSTALL_DIR} ${IDIR_BIND_RNDC}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/rndc ${IDIR_BIND_RNDC}/usr/sbin/ ${INSTALL_BIN} ${WRKINST}/usr/sbin/rndc-confgen \ ${IDIR_BIND_RNDC}/usr/sbin/ - # bind check + +bind-check-install: ${INSTALL_DIR} ${IDIR_BIND_CHECK}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/named-checkconf \ ${IDIR_BIND_CHECK}/usr/sbin/ ${INSTALL_BIN} ${WRKINST}/usr/sbin/named-checkzone \ ${IDIR_BIND_CHECK}/usr/sbin/ - # dnsec tools + +bind-dnssec-install: ${INSTALL_DIR} ${IDIR_BIND_DNSSEC}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/dnssec-keygen \ ${IDIR_BIND_DNSSEC}/usr/sbin/ ${INSTALL_BIN} ${WRKINST}/usr/sbin/dnssec-signzone \ ${IDIR_BIND_DNSSEC}/usr/sbin/ - # host + +bind-host-install: ${INSTALL_DIR} ${IDIR_BIND_HOST}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/host ${IDIR_BIND_HOST}/usr/bin/ - # dig + +bind-dig-install: ${INSTALL_DIR} ${IDIR_BIND_DIG}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/dig ${IDIR_BIND_DIG}/usr/bin/ - # bind lib + +libbind-install: ${INSTALL_DIR} ${IDIR_LIBBIND}/usr/lib ${CP} ${WRKINST}/usr/lib/libbind9.so.* ${IDIR_LIBBIND}/usr/lib/ ${CP} ${WRKINST}/usr/lib/libdns.so.* ${IDIR_LIBBIND}/usr/lib/ diff --git a/package/binutils/Makefile b/package/binutils/Makefile index b076323d5..dd970c6c3 100644 --- a/package/binutils/Makefile +++ b/package/binutils/Makefile @@ -19,7 +19,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,BINUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBBFD,libbfd,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBFD},${PKGSC_LIBBFD})) -TCFLAGS+= -fPIC +TARGET_CFLAGS+= -fPIC CONFIGURE_ARGS+= --disable-werror \ --host=$(REAL_GNU_TARGET_NAME) \ --target=$(REAL_GNU_TARGET_NAME) diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile index 41b56a5ca..77bf2246f 100644 --- a/package/bitlbee/Makefile +++ b/package/bitlbee/Makefile @@ -19,7 +19,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,BITLBEE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= minimal -TCFLAGS+= -fPIC +TARGET_CFLAGS+= -fPIC CONFIGURE_ARGS:= --target=${REAL_GNU_TARGET_NAME} \ --prefix=/usr/ \ --bindir=/usr/sbin/ \ diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile index b94a29059..990bf1178 100644 --- a/package/bzip2/Makefile +++ b/package/bzip2/Makefile @@ -17,8 +17,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,BZIP2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= manual - -TCFLAGS+= -fPIC +TARGET_CFLAGS+= -fPIC XAKE_FLAGS+= PREFIX=${WRKINST}/usr post-install: diff --git a/package/cryptinit/Makefile b/package/cryptinit/Makefile index 7a42d671f..b63b87751 100644 --- a/package/cryptinit/Makefile +++ b/package/cryptinit/Makefile @@ -24,8 +24,8 @@ BUILD_STYLE:= manual INSTALL_STYLE:= manual do-build: - ${TARGET_CC} ${TCPPFLAGS} ${TCFLAGS} -c -o ${WRKBUILD}/cryptinit.o \ - ${WRKBUILD}/cryptinit.c + ${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} -c \ + -o ${WRKBUILD}/cryptinit.o ${WRKBUILD}/cryptinit.c ( cd ${WRKBUILD}; \ ${TARGET_CC} -static -o cryptinit cryptinit.o \ ${STAGING_TARGET_DIR}/usr/lib/libcryptsetup.a \ diff --git a/package/cups/Makefile b/package/cups/Makefile index aa3bea6fd..8f764ba1b 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -21,7 +21,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ENV+= ac_cv_func_sigset=no \ - OPTIM='-fPIC $(TARGET_CFLAGS)' + OPTIM='-fPIC' CONFIGURE_ARGS+= --with-cups-user=cups \ --with-cups-group=cups \ @@ -42,7 +42,7 @@ CONFIGURE_ARGS+= --with-cups-user=cups \ --disable-ssl FAKE_FLAGS+= DSTROOT="${WRKINST}" STRIP="/bin/true" -XAKE_FLAGS+= OPTIM='-fPIC $(TARGET_CFLAGS)' +XAKE_FLAGS+= OPTIM='-fPIC' post-install: ${INSTALL_DIR} ${IDIR_CUPS}/usr/bin diff --git a/package/cutter/Makefile b/package/cutter/Makefile index 0cf8a1c74..69af2e4ce 100755 --- a/package/cutter/Makefile +++ b/package/cutter/Makefile @@ -22,9 +22,11 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual +TARGET_CFLAGS+= -Wall + do-build: - ${TARGET_CC} -Wall ${TCPPFLAGS} ${TCFLAGS} ${WRKBUILD}/cutter.c \ - -o ${WRKBUILD}/cutter + ${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \ + ${WRKBUILD}/cutter.c -o ${WRKBUILD}/cutter do-install: ${INSTALL_DIR} ${IDIR_CUTTER}/usr/sbin diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile index c67b73579..fb1c36bd1 100644 --- a/package/cxxtools/Makefile +++ b/package/cxxtools/Makefile @@ -19,15 +19,15 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CXXTOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) -TCXXFLAGS+= -fno-builtin -nostdinc++ \ +TARGET_CXXFLAGS+= -fno-builtin -nostdinc++ \ -I${STAGING_TARGET_DIR}/usr/include/uClibc++ -Wl,-E -TLDFLAGS+= -luClibc++ -liconv -lm -nodefaultlibs -shared +TARGET_LDFLAGS+= -luClibc++ -liconv -lm -nodefaultlibs -shared else -TLDFLAGS+= -liconv -shared +TARGET_LDFLAGS+= -liconv -shared endif -TCFLAGS+= -fPIC -TCXXFLAGS+= -fPIC +TARGET_CFLAGS+= -fPIC +TARGET_CXXFLAGS+= -fPIC CONFIGURE_ARGS+= --with-libiconv-prefix='${STAGING_TARGET_DIR}/usr' post-install: diff --git a/package/digitemp/Makefile b/package/digitemp/Makefile index 390ac22a0..9e090989a 100644 --- a/package/digitemp/Makefile +++ b/package/digitemp/Makefile @@ -21,7 +21,7 @@ $(eval $(call PKG_template,DIGITEMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ CONFIG_STYLE:= manual INSTALL_STYLE:= manual -TCFLAGS+= -I./src -I./userial +TARGET_CPPFLAGS+= -I./src -I./userial ALL_TARGET= ds2490 do-install: diff --git a/package/dillo/Makefile b/package/dillo/Makefile index 1c2bcf500..56884def3 100644 --- a/package/dillo/Makefile +++ b/package/dillo/Makefile @@ -24,11 +24,10 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,DILLO,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TLDFLAGS+= -liconv +TARGET_LDLFAGS+= -liconv post-install: $(INSTALL_DIR) $(IDIR_DILLO)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/dillo \ - $(IDIR_DILLO)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/dillo $(IDIR_DILLO)/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 7b22a922d..3ce19d494 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -38,14 +38,14 @@ $(eval $(call PKG_template,E2FSCK_STATIC,e2fsck-static,${PKG_VERSION}-${PKG_RELE CONFIGURE_ARGS+= --enable-elf-shlibs --disable-rpath INSTALL_TARGET+= install-libs -TLDFLAGS+= -lpthread +TARGET_LDFLAGS+= -lpthread pre-build: ${MAKE} -C ${WRKBUILD}/util \ - BUILDCC="${HOSTCC}" \ - CFLAGS="" \ - LDFLAGS="" \ - CPPFLAGS="" \ + BUILDCC="${CC_FOR_BUILD}" \ + CFLAGS="${CFLAGS_FOR_BUILD}" \ + LDFLAGS="${LDFLAGS_FOR_BUILD}" \ + CPPFLAGS="${CPPFLAGS_FOR_BUILD}" \ subst post-build: diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index e3603353f..60d35f1ee 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -34,7 +34,8 @@ EGLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \ --enable-add-ons EGLIBC_ENV:= PATH='${TARGET_PATH}' \ - BUILD_CC=${HOSTCC} \ + GCC_HONOUR_COPTS=s \ + BUILD_CC=${CC_FOR_BUILD} \ CFLAGS="$(TARGET_CFLAGS)" \ CC=${REAL_GNU_TARGET_NAME}-gcc \ CXX=${REAL_GNU_TARGET_NAME}-g++ \ @@ -100,8 +101,7 @@ eglibc-dev-install: --with-headers=$(IDIR_EGLIBC_DEV)/usr/include \ ${EGLIBC_CONFOPTS} \ ); - PATH='${TARGET_PATH}' \ - $(MAKE) -C $(WRKBUILD) \ + PATH='${TARGET_PATH}' $(MAKE) -C $(WRKBUILD) \ install-headers install-bootstrap-headers=yes @touch $(IDIR_EGLIBC_DEV)/usr/include/gnu/stubs.h @find $(IDIR_EGLIBC_DEV) -name .install -exec rm {} \; diff --git a/package/elinks/Makefile b/package/elinks/Makefile index fe863ec55..ee0e2798a 100644 --- a/package/elinks/Makefile +++ b/package/elinks/Makefile @@ -23,7 +23,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,ELINKS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) INSTALL_STYLE:= manual -TCFLAGS+= -fPIC +TARGET_CFLAGS+= -fPIC CONFIGURE_ENV+= $(shell echo ac_cv_file_./features.conf | tr [:blank:]-/. _)=yes CONFIGURE_ENV+= $(shell echo ac_cv_file_${WRKBUILD}/features.conf | tr [:blank:]-/. _)=yes CONFIGURE_ARGS+= --enable-small \ diff --git a/package/ether-wake/Makefile b/package/ether-wake/Makefile index 39985ea08..335b6f441 100644 --- a/package/ether-wake/Makefile +++ b/package/ether-wake/Makefile @@ -19,9 +19,11 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual +TARGET_CFLAGS+= -Wall + do-build: - ${TARGET_CC} -Wall ${TCPPFLAGS} ${TCFLAGS} -o \ - ${WRKBUILD}/ether-wake ${WRKBUILD}/ether-wake.c + ${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \ + -o ${WRKBUILD}/ether-wake ${WRKBUILD}/ether-wake.c do-install: ${INSTALL_DIR} ${IDIR_ETHER_WAKE}/usr/sbin diff --git a/package/exmap/Makefile b/package/exmap/Makefile index 9b3c57740..ab6897d48 100644 --- a/package/exmap/Makefile +++ b/package/exmap/Makefile @@ -33,12 +33,7 @@ CONFIGURE_ARGS+= --disable-doc CONFIGURE_ENV+= LIBS="-lncurses" pre-build: - GCC_HONOUR_COPTS=s \ - KERNEL_PATH=${LINUX_DIR} \ - CROSS_COMPILE="${TARGET_CROSS}" \ - V=1 ARCH="${ARCH}" KERNELVERSION="2.6" \ - LDFLAGS="" \ - $(MAKE) -C ${WRKBUILD}/kernel + $(MAKE) -C ${WRKBUILD}/kernel $(KERNEL_MODULE_FLAGS) post-install: ${INSTALL_DIR} ${IDIR_EXMAP_KMOD}/etc/modules.d/ diff --git a/package/faad2/Makefile b/package/faad2/Makefile index 87a5f8e81..dab8ab734 100644 --- a/package/faad2/Makefile +++ b/package/faad2/Makefile @@ -22,7 +22,7 @@ $(eval $(call PKG_template,LIBFAAD2,libfaad2,${PKG_VERSION}-${PKG_RELEASE},${PKG CONFIGURE_ENV+= ac_cv_c99_lrintf=yes CONFIGURE_ARGS+= --without-mpeg4ip \ --without-xmms -TLDFLAGS+= -lm +TARGET_LDFLAGS+= -lm post-install: ${INSTALL_DIR} ${IDIR_LIBFAAD2}/usr/lib diff --git a/package/fakeidentd/Makefile b/package/fakeidentd/Makefile index d7180e6b0..876a1c551 100644 --- a/package/fakeidentd/Makefile +++ b/package/fakeidentd/Makefile @@ -22,9 +22,11 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual +TARGET_CFLAGS+= -Wall + do-build: - ${TARGET_CC} -Wall ${TCPPFLAGS} ${TCFLAGS} -o \ - ${WRKBUILD}/fakeidentd ${WRKBUILD}/identd.c + ${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \ + -o ${WRKBUILD}/fakeidentd ${WRKBUILD}/identd.c do-install: ${INSTALL_DIR} ${IDIR_FAKEIDENTD}/usr/sbin diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index 082bfe171..989393c2a 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -43,11 +43,7 @@ else CONFIGURE_CPU_OPTS:= --disable-sse endif -# gcc 4.5 produces internal compiler error with -Os -#TCFLAGS:=$(subst Os,O2,$(TCFLAGS)) - CONFIG_STYLE:= minimal - CONFIGURE_ARGS:= --prefix=/usr \ --target-os=linux \ --arch=${CPU_ARCH} \ @@ -56,7 +52,7 @@ CONFIGURE_ARGS:= --prefix=/usr \ --source-path=${WRKSRC} \ --cross-prefix=${TARGET_CROSS} \ --cc=$(TARGET_CC) \ - --host-cc=$(HOSTCC) \ + --host-cc=$(CC_FOR_BUILD) \ --disable-doc \ --disable-debug \ --disable-optimizations \ diff --git a/package/firefox/Makefile b/package/firefox/Makefile index b5d034065..895a2c76a 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -35,9 +35,12 @@ else CONFIGURE_ARGS+= --enable-ipc endif -CONFIGURE_ENV+= CROSS_COMPILE=1 HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}" \ - HOST_CXX="${HOSTCXX}" HOST_CXXFLAGS="${HOSTCXXFLAGS}" \ - HOST_LIBIDL_CONFIG="${HOST_LIBIDL_CONFIG}" \ +CONFIGURE_ENV+= CROSS_COMPILE=1 \ + HOST_CC="${CC_FOR_BUILD}" \ + HOST_CFLAGS="${CFLAGS_FOR_BUILD}" \ + HOST_CXX="${CXX_FOR_BUILD}" \ + HOST_CXXFLAGS="${CXXFLAGS_FOR_BUILD}" \ + BUILD_LIBIDL_CONFIG="${BUILD_LIBIDL_CONFIG}" \ PKG_HOSTLIB_DIR="${PKG_HOSTLIB_DIR}" \ HOST_RANLIB="ranlib" HOST_AR="ar" \ CPPFLAGS="-I${STAGING_TARGET_DIR}/usr/include/freetype2" \ @@ -67,6 +70,7 @@ CONFIGURE_ARGS+= --enable-application=browser \ --disable-crashreporter XAKE_FLAGS+= OS_RELEASE="2.6" +XAKE_FLAGS+= ARCHFLAG="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} ${TARGET_LDFLAGS}" post-install: $(INSTALL_DIR) $(IDIR_FIREFOX)/usr/bin diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure index 4a3499a7b..6ab49e7f0 100644 --- a/package/firefox/patches/patch-configure +++ b/package/firefox/patches/patch-configure @@ -42,8 +42,8 @@ - HOST_LIBIDL_LIBS="$LIBIDL_LIBS" - fi -fi -+HOST_LIBIDL_CFLAGS=`env PKG_CONFIG_LIBDIR=${PKG_HOSTLIB_DIR} ${HOST_LIBIDL_CONFIG} --cflags` -+HOST_LIBIDL_LIBS=`env PKG_CONFIG_LIBDIR=${PKG_HOSTLIB_DIR} ${HOST_LIBIDL_CONFIG} --libs` ++HOST_LIBIDL_CFLAGS=`env PKG_CONFIG_LIBDIR=${PKG_HOSTLIB_DIR} ${BUILD_LIBIDL_CONFIG} --cflags` ++HOST_LIBIDL_LIBS=`env PKG_CONFIG_LIBDIR=${PKG_HOSTLIB_DIR} ${BUILD_LIBIDL_CONFIG} --libs` + +echo "host libidl cflags: ${HOST_LIBIDL_CFLAGS}" +echo "host libidl libs: ${HOST_LIBIDL_LIBS}" diff --git a/package/firefox/patches/patch-security_coreconf_Linux_mk b/package/firefox/patches/patch-security_coreconf_Linux_mk new file mode 100644 index 000000000..26a3dc8f3 --- /dev/null +++ b/package/firefox/patches/patch-security_coreconf_Linux_mk @@ -0,0 +1,15 @@ +--- mozilla-1.9.2.orig/security/coreconf/Linux.mk 2010-12-03 16:48:49.000000000 +0100 ++++ mozilla-1.9.2/security/coreconf/Linux.mk 2011-01-20 20:18:26.904905227 +0100 +@@ -46,9 +46,9 @@ ifeq ($(USE_PTHREADS),1) + IMPL_STRATEGY = _PTH + endif + +-CC = gcc +-CCC = g++ +-RANLIB = ranlib ++CC ?= gcc ++CCC ?= g++ ++RANLIB ?= ranlib + + DEFAULT_COMPILER = gcc + diff --git a/package/firefox/patches/patch-security_coreconf_command_mk b/package/firefox/patches/patch-security_coreconf_command_mk new file mode 100644 index 000000000..fcf73b8a8 --- /dev/null +++ b/package/firefox/patches/patch-security_coreconf_command_mk @@ -0,0 +1,11 @@ +--- mozilla-1.9.2.orig/security/coreconf/command.mk 2010-12-03 16:48:49.000000000 +0100 ++++ mozilla-1.9.2/security/coreconf/command.mk 2011-01-20 20:18:56.214904993 +0100 +@@ -48,7 +48,7 @@ LINK_EXE = $(LINK) $(OS_LFLAGS) $(L + CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \ + $(XCFLAGS) + PERL = perl +-RANLIB = echo ++RANLIB = ranlib + TAR = /bin/tar + # + # For purify diff --git a/package/gatling/Makefile b/package/gatling/Makefile index 034f86f7c..e6813c29e 100644 --- a/package/gatling/Makefile +++ b/package/gatling/Makefile @@ -25,9 +25,9 @@ INSTALL_STYLE:= manual MAKE_FILE:= GNUmakefile ALL_TARGET:= gatling -TCPPFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/owfat +TARGET_CPPFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/owfat XAKE_FLAGS+= CC='${TARGET_CC}' \ - CFLAGS='${TCPPFLAGS} ${TCFLAGS}' \ + CFLAGS='${TARGET_CPPFLAGS} ${TARGET_CFLAGS}' \ ZLIB=0 DIET= prefix='${WRKINST}/usr' do-install: diff --git a/package/gcc/Makefile b/package/gcc/Makefile index faf1f9e31..fec6661e3 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -16,8 +16,8 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,GCC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -TCFLAGS:= '' -TCPPFLAGS:= '' +TARGET_CFLAGS:= '' +TARGET_CPPFLAGS:= '' ifeq ($(ADK_LINUX_64),y) CONFIGURE_ARGS+= --with-abi=64 @@ -39,6 +39,9 @@ CONFIGURE_ARGS+= --enable-languages=c,c++ \ --disable-libstdcxx-pch \ --enable-cxx-flags="${TARGET_LDFLAGS}" +# disable honour cflags stuff +XAKE_FLAGS+= GCC_HONOUR_COPTS:=s + post-install: ${INSTALL_DIR} ${IDIR_GCC}/usr/lib/gcc ${IDIR_GCC}/usr/bin ${INSTALL_DIR} ${IDIR_GCC}/lib ${IDIR_GCC}/usr/include/c++ diff --git a/package/gdb/Makefile b/package/gdb/Makefile index 5d3d60806..5e9f706d1 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -16,13 +16,15 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TCFLAGS+= ${TCPPFLAGS} -fPIC +TARGET_CFLAGS+= ${TARGET_CPPFLAGS} -fPIC CONFIGURE_ARGS+= --without-uiout --enable-gdbmi \ --disable-tui --disable-gdbtk --without-x \ --without-included-gettext --disable-sim \ --enable-threads --with-curses --disable-werror \ --enable-static --without-python -XAKE_FLAGS+= LDFLAGS='${TLDFLAGS}' +XAKE_FLAGS+= LDFLAGS='${TARGET_LDFLAGS}' +# disable honour cflags stuff +XAKE_FLAGS+= GCC_HONOUR_COPTS:=s post-install: ${INSTALL_DIR} ${IDIR_GDB}/usr/bin diff --git a/package/gpm/Makefile b/package/gpm/Makefile index 9d7df66f0..b20ec8889 100644 --- a/package/gpm/Makefile +++ b/package/gpm/Makefile @@ -16,7 +16,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,GPM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TCFLAGS+= -I${WRKSRC}/src/headers +TARGET_CPPFLAGS+= -I${WRKSRC}/src/headers post-install: ${INSTALL_DIR} ${IDIR_GPM}/usr/sbin ${IDIR_GPM}/usr/lib diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile index 24536e5c1..025e525b2 100644 --- a/package/gpsd/Makefile +++ b/package/gpsd/Makefile @@ -30,7 +30,7 @@ CONFIGURE_ENV+= EGREP="grep -E" \ ac_cv_func_strlcat=no \ ac_cv_lib_nsl_gethostbyname=no CONFIGURE_ARGS+= --disable-dbus -TCFLAGS+= -fPIC +TARGET_CFLAGS+= -fPIC LIBRARIES:=-nodefaultlibs -luClibc++ ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) @@ -38,11 +38,11 @@ LIBRARIES+=-lssp -lssp_nonshared endif ifeq ($(ADK_COMPILE_GPSD_WITH_UCLIBCXX),y) -TCXXFLAGS+= -fno-rtti -nostdinc++ \ +TARGET_CXXFLAGS+= -fno-rtti -nostdinc++ \ -I${STAGING_TARGET_DIR}/usr/include/uClibc++ -TLDFLAGS+= $(LIBRARIES) +TARGET_LDFLAGS+= $(LIBRARIES) else -TLDFLAGS+= -shared -pthread +TARGET_LDFLAGS+= -shared -pthread endif ifeq (${ADK_COMPILE_GPSD_WITH_UCLIBCXX},y) diff --git a/package/haserl/Makefile b/package/haserl/Makefile index 7dbfd208a..33cc8adde 100644 --- a/package/haserl/Makefile +++ b/package/haserl/Makefile @@ -16,7 +16,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,HASERL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TCFLAGS+= -DMAX_UPLOAD_KB=8192 +TARGET_CPPFLAGS+= -DMAX_UPLOAD_KB=8192 post-install: ${INSTALL_DIR} ${IDIR_HASERL}/usr/bin diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile index 9568237e0..0e027feae 100644 --- a/package/heimdal/Makefile +++ b/package/heimdal/Makefile @@ -69,7 +69,7 @@ CONFIGURE_OPTS+= --disable-pk-init \ --disable-kx509 endif -TCFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/et -pthread +TARGET_CFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/et -pthread CONFIGURE_ARGS+= ${CONFIGURE_OPTS} --with-cross-tools=${STAGING_HOST_DIR}/bin CONFIGURE_ENV+= cross_compiling=yes \ @@ -87,12 +87,12 @@ post-extract: ${MAKE} -C ${WRKBUILD}/lib/roken ${MAKE} -C ${WRKBUILD}/lib/vers ${MAKE} -C ${WRKBUILD}/lib/editline - env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/lib/com_err compile_et$(EXEEXT) - env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/lib/asn1 asn1_compile$(EXEEXT) - env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/lib/sl slc$(EXEEXT) - ${MAKE} -C ${WRKBUILD}/lib/roken install - ${MAKE} -C ${WRKBUILD}/lib/asn1 install - ${MAKE} -C ${WRKBUILD}/lib/sl install + ${MAKE} -C ${WRKBUILD}/lib/com_err compile_et$(EXEEXT) LDFLAGS="-all-static" + ${MAKE} -C ${WRKBUILD}/lib/asn1 asn1_compile$(EXEEXT) LDFLAGS="-all-static" + ${MAKE} -C ${WRKBUILD}/lib/sl slc$(EXEEXT) LDFLAGS="-all-static" + ${MAKE} -C ${WRKBUILD}/lib/roken install LDFLAGS="-all-static" + ${MAKE} -C ${WRKBUILD}/lib/asn1 install LDFLAGS="-all-static" + ${MAKE} -C ${WRKBUILD}/lib/sl install LDFLAGS="-all-static" $(CP) $(STAGING_HOST_DIR)/libexec/heimdal/{slc,asn1_compile} \ $(STAGING_HOST_DIR)/bin ${MAKE} -C ${WRKBUILD}/lib/sl clean diff --git a/package/heimdal/patches/patch-lib_roken_Makefile_in b/package/heimdal/patches/patch-lib_roken_Makefile_in index a702be6b7..a5b84a201 100644 --- a/package/heimdal/patches/patch-lib_roken_Makefile_in +++ b/package/heimdal/patches/patch-lib_roken_Makefile_in @@ -29,7 +29,7 @@ + $(AWK) -f $(srcdir)/roken.awk $(srcdir)/roken.h.in > make-roken.c + +make-roken$(EXEEXT): make-roken.c -+ $(HOSTCC) $(HOSTCFLAGS) -I$(top_builddir)/include -DHAVE_CONFIG_H \ ++ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I$(top_builddir)/include -DHAVE_CONFIG_H \ + -o $@ $< -@CROSS_COMPILE_TRUE@roken.h: $(top_srcdir)/cf/roken-h-process.pl roken.h.in diff --git a/package/httping/Makefile b/package/httping/Makefile index 2abf4d187..c7b8e8b3f 100644 --- a/package/httping/Makefile +++ b/package/httping/Makefile @@ -19,9 +19,8 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,HTTPING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TCFLAGS+= -D_GNU_SOURCE - CONFIG_STYLE:= manual +TARGET_CFLAGS+= -D_GNU_SOURCE post-install: ${INSTALL_DIR} ${IDIR_HTTPING}/usr/bin diff --git a/package/huawei/Makefile b/package/huawei/Makefile index 3b555a66e..9d780f37e 100644 --- a/package/huawei/Makefile +++ b/package/huawei/Makefile @@ -21,8 +21,10 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual +TARGET_CFLAGS+= -Wall + do-build: - ${TARGET_CC} -Wall ${TCPPFLAGS} ${TCFLAGS} \ + ${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \ -o ${WRKBUILD}/huawei ${WRKBUILD}/huawei.c -lusb do-install: diff --git a/package/icecast/Makefile b/package/icecast/Makefile index f37bc9080..7c8a248ea 100644 --- a/package/icecast/Makefile +++ b/package/icecast/Makefile @@ -18,7 +18,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,ICECAST,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TCPPFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/libxml2 +TARGET_CPPFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/libxml2 CONFIGURE_ARGS+= --disable-yp \ --with-curl="yes" \ --with-curl-config="${STAGING_TARGET_DIR}/usr/bin/curl-config" \ diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile index 3a20f34d6..370b40755 100644 --- a/package/id3lib/Makefile +++ b/package/id3lib/Makefile @@ -20,7 +20,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,ID3LIB,id3lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TCFLAGS+= -fPIC +TARGET_CFLAGS+= -fPIC CONFIGURE_ARGS+= --enable-cxx-warnings=no LIBRARIES:=-nodefaultlibs -luClibc++ -lz -lm -lc @@ -29,11 +29,11 @@ LIBRARIES+=-lssp -fstack-protector endif ifeq ($(ADK_COMPILE_ID3LIB_WITH_UCLIBCXX),y) -TCXXFLAGS+= -fno-builtin -fno-rtti -nostdinc++ \ +TARGET_CXXFLAGS+= -fno-builtin -fno-rtti -nostdinc++ \ -I${STAGING_TARGET_DIR}/usr/include/uClibc++ CONFIGURE_ENV+= LIBS="${LIBRARIES}" else -TLDFLAGS+= -shared +TARGET_LDFLAGS+= -shared endif post-install: diff --git a/package/igmpproxy/Makefile b/package/igmpproxy/Makefile index d255fd1f2..d59cffefa 100644 --- a/package/igmpproxy/Makefile +++ b/package/igmpproxy/Makefile @@ -19,12 +19,11 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,IGMPPROXY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TCFLAGS+= -std=gnu99 +TARGET_CFLAGS+= -std=gnu99 post-install: ${INSTALL_DIR} ${IDIR_IGMPPROXY}/usr/sbin ${IDIR_IGMPPROXY}/etc - ${INSTALL_BIN} ${WRKINST}/usr/sbin/igmpproxy \ - ${IDIR_IGMPPROXY}/usr/sbin/ + ${INSTALL_BIN} ${WRKINST}/usr/sbin/igmpproxy ${IDIR_IGMPPROXY}/usr/sbin ${INSTALL_DATA} ${WRKINST}/etc/igmpproxy.conf ${IDIR_IGMPPROXY}/etc include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/iperf/Makefile b/package/iperf/Makefile index a8db48d59..b2d01f86d 100644 --- a/package/iperf/Makefile +++ b/package/iperf/Makefile @@ -20,12 +20,12 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,IPERF,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) -TLDFLAGS+= -lssp +TARGET_LDFLAGS+= -lssp endif ifeq ($(ADK_COMPILE_IPERF_WITH_UCLIBCXX),y) -TCXXFLAGS+= -fno-builtin -fno-rtti -nostdinc++ -TLDFLAGS+= -nodefaultlibs +TARGET_CXXFLAGS+= -fno-builtin -fno-rtti -nostdinc++ +TARGET_LDFLAGS+= -nodefaultlibs CONFIGURE_ENV+= LIBS="-luClibc++ -lc -lm -lgcc_s -lpthread" else CONFIGURE_ENV+= LIBS="-lc -lm -lgcc_s -lpthread" diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index 8ce92d5e2..f2c4a847a 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -42,8 +42,8 @@ $(eval $(call PKG_template,ROUTEL,routel,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_ $(eval $(call PKG_template,RTMON,rtmon,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_RTMON},${PKG_SECTION})) $(eval $(call PKG_template,SS,ss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_SS},${PKG_SECTION})) -TCFLAGS+= -D_GNU_SOURCE -XAKE_FLAGS+= CCOPTS="${TCFLAGS}" MFLAGS="CC=${TARGET_CC}" \ +TARGET_CFLAGS+= -D_GNU_SOURCE +XAKE_FLAGS+= CCOPTS="${TARGET_CFLAGS}" MFLAGS="CC=${TARGET_CC}" \ HOSTCFLAGS="-I${LINUX_HEADER_DIR}/include" CONFIGURE_ENV+= IPTC="${TARGET_CFLAGS}" IPTL="${TARGET_LDFLAGS}" diff --git a/package/ipset/Makefile b/package/ipset/Makefile index 01ba6a8ee..571020304 100644 --- a/package/ipset/Makefile +++ b/package/ipset/Makefile @@ -29,10 +29,7 @@ ALL_TARGET:= binaries INSTALL_TARGET:= binaries_install pre-build: - V=1 ARCH=${ARCH} KERNEL_DIR=${LINUX_DIR} \ - PREFIX=/usr CROSS_COMPILE="${TARGET_CROSS}" \ - LD=$(TARGET_CROSS)gcc LDFLAGS="" \ - $(MAKE) -C ${WRKBUILD} modules + $(MAKE) -C ${WRKBUILD} $(KERNEL_MODULE_FLAGS) modules post-install: ${INSTALL_DIR} ${IDIR_IPSET}/usr/sbin ${IDIR_IPSET}/usr/lib/ipset diff --git a/package/ipset/patches/patch-Makefile b/package/ipset/patches/patch-Makefile new file mode 100644 index 000000000..e97a5b6a0 --- /dev/null +++ b/package/ipset/patches/patch-Makefile @@ -0,0 +1,36 @@ +--- ipset-4.1.orig/Makefile 2009-11-11 20:22:42.000000000 +0100 ++++ ipset-4.1/Makefile 2011-01-21 13:30:47.148658311 +0100 +@@ -64,9 +64,13 @@ ifndef NO_EXTRA_WARN_FLAGS + endif + + ABI_FLAGS:= +-CFLAGS:=$(ABI_FLAGS) $(COPT_FLAGS) $(WARN_FLAGS) -Ikernel/include -I. # -g -DIPSET_DEBUG ++CPPFLAGS?= ++CPPFLAGS+=-Ikernel/include -I. ++CFLAGS?=$(ABI_FLAGS) $(COPT_FLAGS) $(WARN_FLAGS) + SH_CFLAGS:=$(CFLAGS) -fPIC +-LDFLAGS:=$(ABI_FLAGS) ++LDFLAGS?=$(ABI_FLAGS) ++LIBS?= ++LIBS+=-ldl + SETTYPES:=ipmap portmap macipmap + SETTYPES+=iptree iptreemap + SETTYPES+=iphash nethash ipporthash ipportiphash ipportnethash +@@ -114,14 +118,14 @@ release: clean + + #The ipset(8) self + ipset.o: ipset.c ipset.h +- $(CC) $(CFLAGS) -DIPSET_VERSION=\"$(IPSET_VERSION)\" -DIPSET_LIB_DIR=\"$(IPSET_LIB_DIR)\" -c -o $@ $< ++ $(CC) $(CPPFLAGS) $(CFLAGS) -DIPSET_VERSION=\"$(IPSET_VERSION)\" -DIPSET_LIB_DIR=\"$(IPSET_LIB_DIR)\" -c -o $@ $< + + ipset: ipset.o +- $(CC) $(CFLAGS) $(LDFLAGS) -rdynamic -o $@ $^ -ldl ++ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) + + #Pooltypes + ipset_%.o: ipset_%.c ipset.h +- $(CC) $(SH_CFLAGS) -o $@ -c $< ++ $(CC) $(CPPFLAGS) $(SH_CFLAGS) -o $@ -c $< + + libipset_%.so: ipset_%.o + $(CC) -shared $(LDFLAGS) -o $@ $< diff --git a/package/iptraf/patches/patch-src_Makefile b/package/iptraf/patches/patch-src_Makefile index c65ad0743..c73f68411 100644 --- a/package/iptraf/patches/patch-src_Makefile +++ b/package/iptraf/patches/patch-src_Makefile @@ -1,23 +1,70 @@ $Id$ --- iptraf-3.0.0.orig/src/Makefile 2005-09-13 11:11:17.000000000 +0200 -+++ iptraf-3.0.0/src/Makefile 2010-10-05 10:07:10.000000000 +0200 -@@ -107,13 +107,13 @@ BINS = iptraf rvnamed rawtime ++++ iptraf-3.0.0/src/Makefile 2011-01-21 13:46:03.628658655 +0100 +@@ -18,7 +18,8 @@ VERSION = -DVERSION=\"$(VERNUMBER)\" + BINDIR = ../../iptraf-$(VERNUMBER).bin.$(ARCH) + + CC = gcc +-LIBS = -L../support -ltextbox -lpanel -lncurses # in this order! ++LIBS ?= ++LIBS += -ltextbox -lpanel -lncurses # in this order! + + # comment this one out to omit debug code when done. + +@@ -31,15 +32,17 @@ PROF = #-pg + # options to be passed to the compiler. I don't believe they need to be + # modified (except for -m486 on non-Intel x86 platforms). + +-CFLAGS = -Wall #-O2 #-m486 ++CFLAGS ?= -Wall #-O2 #-m486 + DIRS = -DWORKDIR=\"$(WORKDIR)\" \ + -DLOGDIR=\"$(LOGDIR)\" -DEXECDIR=\"$(TARGET)\" +-LDOPTS = #-static ++LDFLAGS ?= ++LDFLAGS += -L../support + + # you may want to change this to point to your ncurses include directory + # if the ncurses include files are not in the default location. + +-INCLUDEDIR = -I/usr/include/ncurses -I../support ++CPPFLAGS ?= ++CPPFLAGS += -I../support + + # You can uncomment this one to disable the backspace key in input fields. + # This means you must use the Del key or Ctrl+H combination to erase the +@@ -106,33 +109,31 @@ error.o log.o mode.o getpath.o bar.o par + BINS = iptraf rvnamed rawtime all: $(BINS) - @echo +- @echo - @size $(BINS) -+ #@size $(BINS) iptraf: $(OBJS) textlib - $(CC) $(LDOPTS) $(PROF) -o iptraf $(OBJS) $(LIBS) +- $(CC) $(LDOPTS) $(PROF) -o iptraf $(OBJS) $(LIBS) ++ $(CC) $(LDFLAGS) -o iptraf $(OBJS) $(LIBS) textlib: - make -C ../support + $(MAKE) -C ../support %.o: %.c *.h version - $(CC) $(CFLAGS) $(DIRS) $(INCLUDEDIR) $(VERSION) $(PLATFORM) $(PROF) $(DEBUG) $(EXECPERM) $(BSSETTING) -c -o $*.o $< -@@ -132,7 +132,7 @@ rawtime: rawtime.c +- $(CC) $(CFLAGS) $(DIRS) $(INCLUDEDIR) $(VERSION) $(PLATFORM) $(PROF) $(DEBUG) $(EXECPERM) $(BSSETTING) -c -o $*.o $< ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(DIRS) $(VERSION) $(PLATFORM) $(EXECPERM) $(BSSETTING) -c -o $*.o $< + + rvnamed: rvnamed.o getpath.o +- $(CC) $(LDOPTS) $(PROF) -o rvnamed rvnamed.o getpath.o ++ $(CC) $(LDFLAGS) -o $@ $^ + + rvnamed.o: rvnamed.c rvnamed.h +- $(CC) $(CFLAGS) $(PROF) $(DEBUG) -c -o rvnamed.o rvnamed.c ++ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ rvnamed.c + + rawtime: rawtime.c +- $(CC) $(CFLAGS) $(LDOPTS) $(PROF) $(DEBUG) -o rawtime rawtime.c ++ $(CC) $(CFLAGS) $(LDFLAGS) -o rawtime rawtime.c + + + # rule to clear out all object files and the executable