From 51fb4e32a0a1b74b8a708d4831f5459737cbf19e Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 19 Oct 2006 15:26:14 +0000 Subject: [PATCH] cleanup SVN-Revision: 5233 --- admin/osiris/Makefile | 14 ++++++-------- libs/avahi/Makefile | 3 --- libs/glib/Makefile | 7 ------- libs/libelf/Makefile | 1 - libs/libgphoto2/Makefile | 7 ------- libs/libnet-1.0.x/Makefile | 6 ++---- libs/libnet-1.1.x/Makefile | 6 ++---- libs/libusb/Makefile | 1 - libs/mysql/Makefile | 4 ---- libs/ncurses/Makefile | 2 +- libs/openldap/Makefile | 1 - libs/radiusclient-ng/Makefile | 1 - libs/serdisplib/Makefile | 1 - multimedia/gphoto2/Makefile | 7 ------- net/chillispot/Makefile | 3 --- net/click/Makefile | 5 ----- net/dhcp-forwarder/Makefile | 2 +- net/iperf/Makefile | 18 ++++++++++-------- net/miau/Makefile | 13 +++++++------ net/nfs-kernel-server/Makefile | 10 ++++++---- net/ptunnel/Makefile | 6 +++--- net/raddump/Makefile | 4 +--- net/rp-pppoe/Makefile | 6 ------ net/samba/Makefile | 3 --- net/slurm/Makefile | 1 - net/squid/Makefile | 21 +-------------------- net/tmsnc/Makefile | 16 +++++++++------- net/vncrepeater/Makefile | 3 ++- net/wccpd/Makefile | 10 ++++++---- net/wifidog/Makefile | 4 +--- sound/madplay/Makefile | 26 +++++++++++++------------- sound/mt-daapd/Makefile | 22 ++++++++++++---------- utils/fetchmail/Makefile | 11 +++++------ utils/gnupg/Makefile | 2 -- utils/mutt/Makefile | 9 ++++----- utils/rrdcollect/Makefile | 22 ++++++++++++---------- utils/screen/Makefile | 1 - utils/usbutils/Makefile | 1 - utils/vim/Makefile | 12 ++++++------ 39 files changed, 110 insertions(+), 182 deletions(-) diff --git a/admin/osiris/Makefile b/admin/osiris/Makefile index 917134a7a3..81a180758c 100644 --- a/admin/osiris/Makefile +++ b/admin/osiris/Makefile @@ -33,14 +33,12 @@ define Package/osirisd endef define Build/Configure - $(call Build/Configure/Default, \ - --with-osiris-user=root \ - --with-root-dir=/var/lib/osiris \ - --with-readline=no, \ - ac_cv_openssldir="$(STAGING_DIR)/usr" \ - ac_cv_have_accrights_in_msghdr=no \ - ac_cv_have_control_in_msghdr=yes \ - ) + $(call Build/Configure/Default, \ + --with-osiris-user=root \ + --with-root-dir=/var/lib/osiris \ + --with-readline=no, \ + ac_cv_openssldir="$(STAGING_DIR)/usr" \ + ) endef define Build/Compile diff --git a/libs/avahi/Makefile b/libs/avahi/Makefile index d6ebefd83e..78be0e9047 100644 --- a/libs/avahi/Makefile +++ b/libs/avahi/Makefile @@ -89,9 +89,6 @@ define Build/Configure CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ - ac_cv_func_malloc_0_nonnull=yes \ - ac_cv_func_realloc_0_nonnull=yes \ - ac_cv_func_memcmp_working=yes \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/libs/glib/Makefile b/libs/glib/Makefile index b60f5f05a6..d96f2903db 100644 --- a/libs/glib/Makefile +++ b/libs/glib/Makefile @@ -39,12 +39,6 @@ endef define Build/Configure (cd $(PKG_BUILD_DIR); rm -f config.cache; \ glib_cv_sizeof_gmutex=24 \ - ac_cv_sizeof_char=1 \ - ac_cv_sizeof_short=2 \ - ac_cv_sizeof_int=4 \ - ac_cv_sizeof_long=4 \ - ac_cv_sizeof_long_long=8 \ - ac_cv_sizeof_void_p=4 \ glib_cv_prog_cc_ansi_proto="no" \ glib_cv_has__inline="yes" \ glib_cv_has__inline__="yes" \ @@ -55,7 +49,6 @@ define Build/Configure glib_cv_va_val_copy="yes" \ glib_cv_rtldglobal_broken="no" \ glib_cv_uscore="no" \ - ac_cv_func_getpwuid_r="yes" \ glib_cv_func_pthread_mutex_trylock_posix="yes" \ glib_cv_func_pthread_cond_timedwait_posix="yes" \ glib_cv_sizeof_gmutex="24" \ diff --git a/libs/libelf/Makefile b/libs/libelf/Makefile index d861b9584e..faa9331101 100644 --- a/libs/libelf/Makefile +++ b/libs/libelf/Makefile @@ -41,7 +41,6 @@ define Build/Configure libelf_cv_struct_elf64_ehdr=yes \ libelf_cv_type_elf64_addr=no \ libelf_cv_struct_elf64_rel=yes \ - ac_cv_sizeof_long_long=8 \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/libs/libgphoto2/Makefile b/libs/libgphoto2/Makefile index f0afc4314d..d7738d7a3c 100644 --- a/libs/libgphoto2/Makefile +++ b/libs/libgphoto2/Makefile @@ -42,11 +42,6 @@ define Package/libgphoto2-drivers TITLE:=Gphoto2 drivers for various cameras endef -BIG_ENDIAN:=no -ifeq ($(CONFIG_BIG_ENDIAN),y) - BIG_ENDIAN:=yes -endif - define Build/Configure $(call Build/Configure/Default, \ --enable-shared \ @@ -63,8 +58,6 @@ define Build/Configure LIBUSB_CFLAGS="$$$$CPPFLAGS" \ LIBUSB_LIBS="$$$$LDFLAGS -lusb" \ LIBS="-lltdl" \ - ac_cv_c_gettext_without_libintl=yes \ - ac_cv_c_bigendian=$(BIG_ENDIAN) \ ) endef diff --git a/libs/libnet-1.0.x/Makefile b/libs/libnet-1.0.x/Makefile index 9a125200cd..66814b16bd 100644 --- a/libs/libnet-1.0.x/Makefile +++ b/libs/libnet-1.0.x/Makefile @@ -46,11 +46,9 @@ define Build/Configure $(call Build/Configure/Default, \ --enable-shared \ --enable-static \ - --with-pf_packet=yes \ - , \ - ac_libnet_have_pf_packet=yes \ - ac_cv_lbl_unaligned_fail=no \ + --with-pf_packet=yes, \ ac_cv_libnet_endianess=$(ENDIANESS) \ + ac_libnet_have_pf_packet=yes \ ) endef diff --git a/libs/libnet-1.1.x/Makefile b/libs/libnet-1.1.x/Makefile index 5eb9904ac3..e67a4d60d1 100644 --- a/libs/libnet-1.1.x/Makefile +++ b/libs/libnet-1.1.x/Makefile @@ -46,11 +46,9 @@ define Build/Configure $(call Build/Configure/Default, \ --enable-shared \ --enable-static \ - --with-pf_packet=yes \ - , \ - ac_libnet_have_pf_packet=yes \ - ac_cv_lbl_unaligned_fail=no \ + --with-pf_packet=yes, \ ac_cv_libnet_endianess=$(ENDIANESS) \ + ac_libnet_have_pf_packet=yes \ ac_libnet_have_packet_socket=yes \ ) endef diff --git a/libs/libusb/Makefile b/libs/libusb/Makefile index 934658c1b6..4966c1ff4f 100644 --- a/libs/libusb/Makefile +++ b/libs/libusb/Makefile @@ -36,7 +36,6 @@ define Build/Configure CFLAGS="$(TARGET_CFLAGS)" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ - ac_cv_c_bigendian=no \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/libs/mysql/Makefile b/libs/mysql/Makefile index 723492ea6a..201a555da6 100644 --- a/libs/mysql/Makefile +++ b/libs/mysql/Makefile @@ -48,10 +48,6 @@ define Build/Configure CXXFLAGS="$(TARGET_CFLAGS)" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ - ac_atomic_add=yes \ - ac_atomic_sub=yes \ - ac_cv_sys_restartable_syscalls=yes \ - ac_cv_conv_longlong_to_float=yes \ mysql_cv_compress=yes \ mysql_cv_gethostname_style=glibc2 \ ./configure \ diff --git a/libs/ncurses/Makefile b/libs/ncurses/Makefile index a06e29a05b..2eee9cd63a 100644 --- a/libs/ncurses/Makefile +++ b/libs/ncurses/Makefile @@ -37,6 +37,7 @@ define Build/Compile rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) (cd $(PKG_BUILD_DIR); rm -f config.cache; \ + CONFIG_SITE="" \ ./configure \ --target=$(GNU_HOST_NAME) \ --host=$(GNU_HOST_NAME) \ @@ -80,7 +81,6 @@ define Build/Compile CFLAGS="$(TARGET_CFLAGS)" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ - ac_cv_linux_vers="2" \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/libs/openldap/Makefile b/libs/openldap/Makefile index 8702315f64..35006b2846 100644 --- a/libs/openldap/Makefile +++ b/libs/openldap/Makefile @@ -119,7 +119,6 @@ define Build/Compile CFLAGS="$(TARGET_CFLAGS)" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib " \ - ac_cv_func_memcmp_clean="yes" \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/libs/radiusclient-ng/Makefile b/libs/radiusclient-ng/Makefile index 57d4b8becf..9af8543cff 100644 --- a/libs/radiusclient-ng/Makefile +++ b/libs/radiusclient-ng/Makefile @@ -62,7 +62,6 @@ define Build/Configure CFLAGS="$(TARGET_CFLAGS)" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ - ac_cv_func_getdomainname=yes \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/libs/serdisplib/Makefile b/libs/serdisplib/Makefile index 5a4ac3e03d..41df8d29f3 100644 --- a/libs/serdisplib/Makefile +++ b/libs/serdisplib/Makefile @@ -36,7 +36,6 @@ define Build/Configure CFLAGS="$(TARGET_CFLAGS)" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ - ac_cv_func_malloc_0_nonnull=yes \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/multimedia/gphoto2/Makefile b/multimedia/gphoto2/Makefile index aa3fb49ca7..38b4487933 100644 --- a/multimedia/gphoto2/Makefile +++ b/multimedia/gphoto2/Makefile @@ -31,11 +31,6 @@ define Package/gphoto2 URL:=http://www.gphoto.org/ endef -BIG_ENDIAN:=no -ifeq ($(CONFIG_BIG_ENDIAN),y) - BIG_ENDIAN:=yes -endif - define Build/Configure $(call Build/Configure/Default, \ --without-libiconv-prefix \ @@ -47,8 +42,6 @@ define Build/Configure LIBEXIF_LIBS="$$$$LDFLAGS -lexif" \ POPT_CFLAGS="$$$$CFLAGS $$$$CPPFLAGS" \ POPT_LIBS="$$$$LDFLAGS -lpopt" \ - ac_cv_c_bigendian="$(BIG_ENDIAN)" \ - ac_cv_func_malloc_0_nonnull=yes \ ) endef diff --git a/net/chillispot/Makefile b/net/chillispot/Makefile index e3627674b0..3f6238e313 100644 --- a/net/chillispot/Makefile +++ b/net/chillispot/Makefile @@ -48,9 +48,6 @@ define Build/Configure CFLAGS="$(TARGET_CFLAGS)" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ - ac_cv_func_malloc_0_nonnull=yes \ - ac_cv_func_memcmp_working=yes \ - ac_cv_func_setvbuf_reversed=no \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/net/click/Makefile b/net/click/Makefile index cfa49e8354..61a5a738bc 100644 --- a/net/click/Makefile +++ b/net/click/Makefile @@ -41,13 +41,8 @@ define Package/roofnet URL:=http://pdos.csail.mit.edu/roofnet/ endef -CONF_OPTS= \ - ac_cv_int64_t=no \ - ac_cv_sizeof_off_t=4 - define Build/Configure (cd $(PKG_BUILD_DIR); \ - $(CONF_OPTS) \ ./configure; \ cp include/click/config.h include/click/config-host.h; \ rm -rf config.{cache,status} ; \ diff --git a/net/dhcp-forwarder/Makefile b/net/dhcp-forwarder/Makefile index ef6104d7b7..c4002507c8 100644 --- a/net/dhcp-forwarder/Makefile +++ b/net/dhcp-forwarder/Makefile @@ -35,7 +35,7 @@ define Package/dhcp-forwarder/conffiles endef define Build/Configure -$(call Build/Configure/Default,,ac_cv_func_malloc_0_nonnull="yes") + $(call Build/Configure/Default) endef define Build/Compile diff --git a/net/iperf/Makefile b/net/iperf/Makefile index 2a610d2865..67a7d8401f 100644 --- a/net/iperf/Makefile +++ b/net/iperf/Makefile @@ -32,14 +32,16 @@ characteristics.\\\ endef define Build/Configure -$(call Build/Configure/Default,--enable-shared \ ---disable-static \ ---disable-rpath \ ---disable-multicast \ ---disable-threads,CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti -nostdinc++" \ -LDFLAGS="-nodefaultlibs -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ -LIBS="-luClibc++ -lc -lm -lgcc_s" \ -ac_cv_func_malloc_0_nonnull=yes) + $(call Build/Configure/Default, \ + --enable-shared \ + --disable-static \ + --disable-rpath \ + --disable-multicast \ + --disable-threads, \ + CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti -nostdinc++" \ + LDFLAGS="-nodefaultlibs -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ + LIBS="-luClibc++ -lc -lm -lgcc_s" \ + ) endef define Build/Compile diff --git a/net/miau/Makefile b/net/miau/Makefile index 5b59cb0d0e..4ecd2efcaa 100644 --- a/net/miau/Makefile +++ b/net/miau/Makefile @@ -34,12 +34,13 @@ for IRC-networks.\\\ endef define Build/Configure -$(call Build/Configure/Default,--enable-automode \ ---enable-releasenick \ ---enable-uptime \ ---enable-privlog \ ---enable-onconnect,ac_cv_func_malloc_0_nonnull=yes \ -ac_cv_func_realloc_0_nonnull=yes) + $(call Build/Configure/Default, \ + --enable-automode \ + --enable-releasenick \ + --enable-uptime \ + --enable-privlog \ + --enable-onconnect \ + ) endef diff --git a/net/nfs-kernel-server/Makefile b/net/nfs-kernel-server/Makefile index b16107a99a..29f4899869 100644 --- a/net/nfs-kernel-server/Makefile +++ b/net/nfs-kernel-server/Makefile @@ -40,10 +40,12 @@ define Package/nfs-kernel-server/conffiles endef define Build/Configure -$(call Build/Configure/Default,--enable-static --enable-shared --disable-nfsv4 \ ---disable-gss,ac_cv_func_malloc_0_nonnull=yes \ -ac_cv_func_memcmp_working=yes \ -ac_cv_func_setvbuf_reversed=no) + $(call Build/Configure/Default, \ + --enable-static \ + --enable-shared \ + --disable-nfsv4 \ + --disable-gss \ + ) endef define Build/Compile diff --git a/net/ptunnel/Makefile b/net/ptunnel/Makefile index a6dbdf9fc1..2ce40709c9 100644 --- a/net/ptunnel/Makefile +++ b/net/ptunnel/Makefile @@ -35,7 +35,7 @@ define Package/ptunnel endef define Build/Configure -$(call Build/Configure/Default,--enable-shared \ + $(call Build/Configure/Default,--enable-shared \ --disable-static \ --with-gnu-ld, \ $(TARGET_CONFIGURE_OPTS) \ @@ -44,8 +44,8 @@ $(call Build/Configure/Default,--enable-shared \ CFLAGS="$(TARGET_CFLAGS)" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ - ac_cv_linux_vers=2 \ - td_cv_buggygetaddrinfo="no") + td_cv_buggygetaddrinfo="no" \ + ) endef define Build/Compile diff --git a/net/raddump/Makefile b/net/raddump/Makefile index 11e1bb38f3..7ccb43c125 100644 --- a/net/raddump/Makefile +++ b/net/raddump/Makefile @@ -34,9 +34,7 @@ define Package/raddump endef define Build/Configure -$(call Build/Configure/Default,,ac_cv_c_bigendian=no \ - ac_cv_func_malloc_0_nonnull=yes \ - ac_cv_func_realloc_0_nonnull=yes) + $(call Build/Configure/Default) endef define Build/Compile diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile index 30333ffad5..1a45af82f2 100644 --- a/net/rp-pppoe/Makefile +++ b/net/rp-pppoe/Makefile @@ -54,12 +54,6 @@ define Build/Configure (cd $(PKG_BUILD_DIR)/src ; rm -rf config.{cache,status}; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ - ac_cv_func_setvbuf_reversed=no \ - ac_cv_sizeof_unsigned_short=2 \ - ac_cv_sizeof_unsigned_int=4 \ - ac_cv_sizeof_unsigned_long=4 \ - ac_cv_linux_kernel_pppoe=yes \ - ac_cv_pack_bitfields_reversed=yes \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/net/samba/Makefile b/net/samba/Makefile index 613d546151..0f22184609 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -82,9 +82,6 @@ define Build/Compile CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ LDFLAGS="-lgcc_s -L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \ ac_cv_lib_cups_httpConnect=no \ - ac_cv_sizeof_int=4 \ - ac_cv_sizeof_long=4 \ - ac_cv_sizeof_short=2 \ samba_cv_FTRUNCATE_NEEDS_ROOT=no \ samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=no \ samba_cv_HAVE_BROKEN_GETGROUPS=no \ diff --git a/net/slurm/Makefile b/net/slurm/Makefile index 8a3b40bc94..5cdf4acac3 100644 --- a/net/slurm/Makefile +++ b/net/slurm/Makefile @@ -47,7 +47,6 @@ define Build/Configure CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ LIBS="-lncurses" \ - ac_cv_func_malloc_0_nonnull=yes \ ac_cv_lib_ncurses_use_default_colors=yes \ ./configure \ --target=$(GNU_TARGET_NAME) \ diff --git a/net/squid/Makefile b/net/squid/Makefile index 7384d12661..f762b71c6c 100644 --- a/net/squid/Makefile +++ b/net/squid/Makefile @@ -138,26 +138,7 @@ define Build/Configure --enable-ntlm-auth-helpers="fakeauth SMB winbind" \ --enable-digest-auth-helpers="password" \ --enable-external-acl-helpers="ip_user unix_group winbind_group" \ - , \ - ac_cv_sizeof_void_p=4 \ - ac_cv_sizeof_short=2 \ - ac_cv_sizeof_int=4 \ - ac_cv_sizeof_long=4 \ - ac_cv_sizeof_long_long=8 \ - ac_cv_sizeof___int64=0 \ - ac_cv_sizeof_int16_t=2 \ - ac_cv_sizeof_uint16_t=2 \ - ac_cv_sizeof_u_int16_t=2 \ - ac_cv_sizeof_int32_t=4 \ - ac_cv_sizeof_uint32_t=4 \ - ac_cv_sizeof_u_int32_t=4 \ - ac_cv_sizeof_int64_t=8 \ - ac_cv_sizeof_uint64_t=8 \ - ac_cv_sizeof_u_int64_t=8 \ - ac_cv_func_setresuid=no \ - ac_cv_func_va_copy=no \ - ac_cv_func___va_copy=no \ - ) + ) endef define Build/Compile diff --git a/net/tmsnc/Makefile b/net/tmsnc/Makefile index 3fced852bb..73bafe79b7 100644 --- a/net/tmsnc/Makefile +++ b/net/tmsnc/Makefile @@ -31,17 +31,19 @@ define Package/tmsnc endef define Build/Configure -$(call Build/Configure/Default,--with-libiconv-prefix=$(STAGING_DIR)/usr \ - --with-openssl="$(STAGING_DIR)/usr" \ - --with-ncurses="$(STAGING_DIR)/usr" \ - --with-gnu-ld, ac_cv_func_malloc_0_nonnull=yes \ - ac_cv_func_realloc_0_nonnull=yes) + $(call Build/Configure/Default, \ + --with-libiconv-prefix=$(STAGING_DIR)/usr \ + --with-openssl="$(STAGING_DIR)/usr" \ + --with-ncurses="$(STAGING_DIR)/usr" \ + --with-gnu-ld \ + ) endef define Build/Compile -$(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" \ + $(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" \ CFLAGS="$(TARGET_CFLAGS)" \ - install) + install \ + ) rm -rf $(PKG_INSTALL_DIR)/usr/man endef diff --git a/net/vncrepeater/Makefile b/net/vncrepeater/Makefile index ead836f381..e221c1ad07 100644 --- a/net/vncrepeater/Makefile +++ b/net/vncrepeater/Makefile @@ -42,7 +42,8 @@ endef define Build/Compile $(call Build/Compile/Default, \ - CFLAGS="$(TARGET_CFLAGS)" \ + CFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti -nostdinc++" \ + STAGING_DIR="$(STAGING_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ repeater) endef diff --git a/net/wccpd/Makefile b/net/wccpd/Makefile index 62ae7c0806..c1c8f45448 100644 --- a/net/wccpd/Makefile +++ b/net/wccpd/Makefile @@ -34,10 +34,12 @@ define Package/wccpd endef define Build/Configure -$(call Build/Configure/Default,--enable-shared \ - --enable-static \ - --disable-rpath \ - --with-gnu-ld,ac_cv_func_setpgrp_void=yes) + $(call Build/Configure/Default, + --enable-shared \ + --enable-static \ + --disable-rpath \ + --with-gnu-ld \ + ) endef define Build/Compile diff --git a/net/wifidog/Makefile b/net/wifidog/Makefile index 45e042141d..a538e8fa38 100644 --- a/net/wifidog/Makefile +++ b/net/wifidog/Makefile @@ -39,9 +39,7 @@ define Package/wifidog/conffiles endef define Build/Configure -$(call Build/Configure/Default,,ac_cv_func_malloc_0_nonnull=yes \ - ac_cv_func_memcmp_working=yes \ - ac_cv_func_setvbuf_reversed=no) + $(call Build/Configure/Default) endef define Build/Compile diff --git a/sound/madplay/Makefile b/sound/madplay/Makefile index c446727246..401aad0383 100644 --- a/sound/madplay/Makefile +++ b/sound/madplay/Makefile @@ -35,19 +35,19 @@ full support for ID3 tags.\\\ endef define Build/Configure -$(call Build/Configure/Default,--enable-shared \ ---disable-static \ ---with-gnu-ld \ ---disable-rpath \ ---disable-debugging \ ---disable-profiling \ ---disable-experimental \ ---without-libiconv-prefix \ ---without-libintl-prefix \ ---without-alsa \ ---without-esd,LIBS="-lz" \ -ac_cv_linux_vers=2 \ -td_cv_buggygetaddrinfo="no") + $(call Build/Configure/Default, \ + --enable-shared \ + --disable-static \ + --with-gnu-ld \ + --disable-rpath \ + --disable-debugging \ + --disable-profiling \ + --disable-experimental \ + --without-libiconv-prefix \ + --without-libintl-prefix \ + --without-alsa \ + --without-esd,LIBS="-lz" \ + ) endef define Build/Compile diff --git a/sound/mt-daapd/Makefile b/sound/mt-daapd/Makefile index c6be213846..23ad6f313b 100644 --- a/sound/mt-daapd/Makefile +++ b/sound/mt-daapd/Makefile @@ -37,16 +37,18 @@ define Package/mt-daapd/conffiles endef define Build/Configure -$(call Build/Configure/Default,--enable-shared \ - --disable-static \ - --enable-mdns \ - --enable-howl \ - --with-id3tag="$(STAGING_DIR)/usr" \ - --with-gdbm-includes="$(STAGING_DIR)/usr/include" \ - --with-gdbm-libs="$(STAGING_DIR)/usr/lib" \ - --with-howl-includes="$(STAGING_DIR)/usr/include/howl" \ - --with-howl-libs="$(STAGING_DIR)/usr/lib" \ - --without-static-libs,ac_cv_func_setpgrp_void=yes) + $(call Build/Configure/Default, \ + --enable-shared \ + --disable-static \ + --enable-mdns \ + --enable-howl \ + --with-id3tag="$(STAGING_DIR)/usr" \ + --with-gdbm-includes="$(STAGING_DIR)/usr/include" \ + --with-gdbm-libs="$(STAGING_DIR)/usr/lib" \ + --with-howl-includes="$(STAGING_DIR)/usr/include/howl" \ + --with-howl-libs="$(STAGING_DIR)/usr/lib" \ + --without-static-libs \ + ) endef define Build/Compile diff --git a/utils/fetchmail/Makefile b/utils/fetchmail/Makefile index e541e81979..048fc3e5c3 100644 --- a/utils/fetchmail/Makefile +++ b/utils/fetchmail/Makefile @@ -32,12 +32,11 @@ define Package/fetchmail endef define Build/Configure -$(call Build/Configure/Default,--enable-fallback=procmail --without-hesiod,ac_cv_c_bigendian=no \ -ac_cv_sizeof_off_t=8 \ -ac_cv_sizeof_int=4 \ -ac_cv_sizeof_long=4 \ -ac_cv_path_procmail=/usr/sbin/procmail \ -) + $(call Build/Configure/Default, \ + --enable-fallback=procmail \ + --without-hesiod, \ + ac_cv_path_procmail=/usr/sbin/procmail \ + ) endef define Build/Compile diff --git a/utils/gnupg/Makefile b/utils/gnupg/Makefile index 43b6035c5a..970be4ef61 100644 --- a/utils/gnupg/Makefile +++ b/utils/gnupg/Makefile @@ -36,8 +36,6 @@ define Build/Configure CFLAGS="$(TARGET_CFLAGS)" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ - ac_cv_c_bigendian=no \ - ac_cv_sizeof_off_t=8 \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/utils/mutt/Makefile b/utils/mutt/Makefile index f54b7393f1..87c0b87de8 100644 --- a/utils/mutt/Makefile +++ b/utils/mutt/Makefile @@ -31,14 +31,13 @@ define Package/mutt endef define Build/Configure -$(call Build/Configure/Default,--includedir=$(PKG_BUILD_DIR)/. \ + $(call Build/Configure/Default, \ + --includedir=$(PKG_BUILD_DIR)/. \ --oldincludedir=$(PKG_BUILD_DIR)/. \ --enable-pop \ --enable-imap \ - --with-ssl,ac_cv_c_bigendian=no \ - ac_cv_sizeof_off_t=8 \ - ac_cv_sizeof_int=4 \ - ac_cv_sizeof_long=4) + --with-ssl \ + ) endef define Package/mutt/install diff --git a/utils/rrdcollect/Makefile b/utils/rrdcollect/Makefile index a38d07d740..519d84d2c5 100644 --- a/utils/rrdcollect/Makefile +++ b/utils/rrdcollect/Makefile @@ -59,20 +59,22 @@ define Package/rrdcollect-example/conffiles endef define Build/Configure -$(call Build/Configure/Default,--enable-shared \ - --disable-static \ - --disable-rpath \ - --with-gnu-ld \ - --enable-exec \ - --without-rrdtool \ - --with-librrd \ - --without-libpcre \ - --without-libpcap, CFLAGS="$(TARGET_CFLAGS) -DSOCKET_COMM" \ + $(call Build/Configure/Default, \ + --enable-shared \ + --disable-static \ + --disable-rpath \ + --with-gnu-ld \ + --enable-exec \ + --without-rrdtool \ + --with-librrd \ + --without-libpcre \ + --without-libpcap, \ + CFLAGS="$(TARGET_CFLAGS) -DSOCKET_COMM" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ LIBS="$(RRDTOOL_LIBS) -lz" \ PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ - ac_cv_func_malloc_0_nonnull=yes) + ) endef define Build/Compile diff --git a/utils/screen/Makefile b/utils/screen/Makefile index 3dd0bfbcf7..6b1b5ac969 100644 --- a/utils/screen/Makefile +++ b/utils/screen/Makefile @@ -35,7 +35,6 @@ endef define Build/Configure (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ $(TARGET_CONFIGURE_OPTS) \ - $(foreach flag,rename fchmod fchown strerror lstat _exit utimes vsnprintf getcwd setlocale strftime,ac_cv_func_$(flag)=yes ) \ CFLAGS="$(TARGET_CFLAGS)" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ diff --git a/utils/usbutils/Makefile b/utils/usbutils/Makefile index 28f44fd467..408788754c 100644 --- a/utils/usbutils/Makefile +++ b/utils/usbutils/Makefile @@ -37,7 +37,6 @@ define Build/Configure CFLAGS="$(TARGET_CFLAGS)" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ - ac_cv_func_malloc_0_nonnull=yes \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/utils/vim/Makefile b/utils/vim/Makefile index aa6f526f61..df3a8778f1 100644 --- a/utils/vim/Makefile +++ b/utils/vim/Makefile @@ -31,21 +31,21 @@ define Package/vim endef define Build/Configure -$(call Build/Configure/Default,--enable-min-features \ + $(call Build/Configure/Default, \ + --enable-min-features \ --disable-gui \ --without-x \ --disable-multibyte \ --disable-cscope \ --disable-gpm \ - --with-tlib=ncurses,ac_cv_c_bigendian=no \ - ac_cv_sizeof_off_t=8 \ - ac_cv_sizeof_int=4) + --with-tlib=ncurses \ + ) endef define Package/vim/install mkdir -p $(1)/usr/bin - mkdir -p $(1)//usr/share/vim - $(CP) ./files/vimrc $(1)//usr/share/vim + mkdir -p $(1)/usr/share/vim + $(CP) ./files/vimrc $(1)/usr/share/vim $(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(1)/usr/bin/ endef -- 2.30.2