From: <abe...@us...> - 2015-01-24 01:21:54
|
Revision: 6937 http://sourceforge.net/p/astlinux/code/6937 Author: abelbeck Date: 2015-01-24 01:21:51 +0000 (Sat, 24 Jan 2015) Log Message: ----------- build system, use host-bison instead of the native bison Modified Paths: -------------- branches/1.0/package/asterisk/asterisk.mk branches/1.0/package/at/at.mk branches/1.0/package/bash/bash.mk branches/1.0/package/bc/bc.mk branches/1.0/package/e2fsprogs/e2fsprogs.mk branches/1.0/package/fbset/fbset.mk branches/1.0/package/gob2/gob2.mk branches/1.0/package/iproute2/iproute2.mk branches/1.0/package/ipsec-tools/ipsec-tools.mk branches/1.0/package/libical/libical.mk branches/1.0/package/libpcap/libpcap.mk branches/1.0/package/linux-atm/linux-atm.mk branches/1.0/package/lm-sensors/lm-sensors.mk branches/1.0/package/monit/monit.mk branches/1.0/package/mrouted/mrouted.mk branches/1.0/package/multimedia/gstreamer/gstreamer.mk branches/1.0/package/ntp/ntp.mk branches/1.0/package/olsr/olsr.mk branches/1.0/package/radvd/radvd.mk branches/1.0/package/unixodbc/unixodbc.mk branches/1.0/package/vtun/vtun.mk Modified: branches/1.0/package/asterisk/asterisk.mk =================================================================== --- branches/1.0/package/asterisk/asterisk.mk 2015-01-23 22:25:06 UTC (rev 6936) +++ branches/1.0/package/asterisk/asterisk.mk 2015-01-24 01:21:51 UTC (rev 6937) @@ -217,8 +217,8 @@ touch $@ -$(ASTERISK_DIR)/.configured: $(ASTERISK_DIR)/.patched | host-pkg-config host-ncurses host-flex libelf ncurses zlib \ - openssl libtool util-linux $(ASTERISK_EXTRAS) +$(ASTERISK_DIR)/.configured: $(ASTERISK_DIR)/.patched | host-pkg-config host-ncurses host-bison host-flex \ + libelf ncurses zlib openssl libtool util-linux $(ASTERISK_EXTRAS) (cd $(ASTERISK_DIR); rm -rf config.cache configure; \ ./bootstrap.sh; \ $(TARGET_CONFIGURE_OPTS) \ Modified: branches/1.0/package/at/at.mk =================================================================== --- branches/1.0/package/at/at.mk 2015-01-23 22:25:06 UTC (rev 6936) +++ branches/1.0/package/at/at.mk 2015-01-24 01:21:51 UTC (rev 6937) @@ -12,7 +12,7 @@ AT_INSTALL_STAGING = NO AT_INSTALL_TARGET = YES -AT_DEPENDENCIES = $(if $(BR2_PACKAGE_FLEX),flex) +AT_DEPENDENCIES = $(if $(BR2_PACKAGE_FLEX),flex) host-bison host-flex AT_CONF_OPT = \ --with-jobdir=/var/spool/cron/atjobs \ Modified: branches/1.0/package/bash/bash.mk =================================================================== --- branches/1.0/package/bash/bash.mk 2015-01-23 22:25:06 UTC (rev 6936) +++ branches/1.0/package/bash/bash.mk 2015-01-24 01:21:51 UTC (rev 6937) @@ -6,7 +6,7 @@ BASH_VERSION = 4.1 BASH_SITE = $(BR2_GNU_MIRROR)/bash -BASH_DEPENDENCIES = ncurses +BASH_DEPENDENCIES = ncurses host-bison BASH_CONF_ENV += \ bash_cv_job_control_missing=present \ bash_cv_sys_named_pipes=present \ Modified: branches/1.0/package/bc/bc.mk =================================================================== --- branches/1.0/package/bc/bc.mk 2015-01-23 22:25:06 UTC (rev 6936) +++ branches/1.0/package/bc/bc.mk 2015-01-24 01:21:51 UTC (rev 6937) @@ -7,7 +7,7 @@ BC_VERSION = 1.06 BC_SOURCE:=bc-$(BC_VERSION).tar.gz BC_SITE = http://ftp.gnu.org/gnu/bc -BC_DEPENDENCIES = host-flex +BC_DEPENDENCIES = host-bison host-flex define BC_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(@D)/bc/bc $(TARGET_DIR)/usr/bin/bc Modified: branches/1.0/package/e2fsprogs/e2fsprogs.mk =================================================================== --- branches/1.0/package/e2fsprogs/e2fsprogs.mk 2015-01-23 22:25:06 UTC (rev 6936) +++ branches/1.0/package/e2fsprogs/e2fsprogs.mk 2015-01-24 01:21:51 UTC (rev 6937) @@ -23,14 +23,16 @@ --disable-testio-debug \ --disable-rpath -E2FSPROGS_DEPENDENCIES = host-pkg-config util-linux +E2FSPROGS_DEPENDENCIES = host-bison host-pkg-config util-linux E2FSPROGS_MAKE_OPT = \ LDCONFIG=true define HOST_E2FSPROGS_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install install-libs + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install install-libs endef +# we don't have a host-util-linux +HOST_E2FSPROGS_DEPENDENCIES = host-bison host-pkg-config # binaries to keep or remove E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_BADBLOCKS) += usr/sbin/badblocks Modified: branches/1.0/package/fbset/fbset.mk =================================================================== --- branches/1.0/package/fbset/fbset.mk 2015-01-23 22:25:06 UTC (rev 6936) +++ branches/1.0/package/fbset/fbset.mk 2015-01-24 01:21:51 UTC (rev 6937) @@ -7,6 +7,7 @@ FBSET_VERSION = 2.1 FBSET_SOURCE = fbset-$(FBSET_VERSION).tar.gz FBSET_SITE = http://users.telenet.be/geertu/Linux/fbdev +FBSET_DEPENDENCIES = host-bison host-flex # Make sure full fbset wins over busybox fbset ifeq ($(BR2_PACKAGE_BUSYBOX),y) Modified: branches/1.0/package/gob2/gob2.mk =================================================================== --- branches/1.0/package/gob2/gob2.mk 2015-01-23 22:25:06 UTC (rev 6936) +++ branches/1.0/package/gob2/gob2.mk 2015-01-24 01:21:51 UTC (rev 6937) @@ -10,7 +10,7 @@ GOB2_DEPENDENCIES = libglib2 flex bison host-pkg-config host-flex -HOST_GOB2_DEPENDENCIES = host-libglib2 +HOST_GOB2_DEPENDENCIES = host-bison host-flex host-libglib2 $(eval $(call AUTOTARGETS,package,gob2)) $(eval $(call AUTOTARGETS,package,gob2,host)) Modified: branches/1.0/package/iproute2/iproute2.mk =================================================================== --- branches/1.0/package/iproute2/iproute2.mk 2015-01-23 22:25:06 UTC (rev 6936) +++ branches/1.0/package/iproute2/iproute2.mk 2015-01-24 01:21:51 UTC (rev 6937) @@ -9,6 +9,8 @@ IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 IPROUTE2_TARGET_SBINS = ctstat genl ifstat ip lnstat nstat routef routel rtacct rtmon rtpr rtstat ss tc +IPROUTE2_DEPENDENCIES += host-bison + # If both iproute2 and busybox are selected, make certain we win # the fight over who gets to have their utils actually installed. ifeq ($(BR2_PACKAGE_BUSYBOX),y) @@ -37,11 +39,12 @@ define IPROUTE2_BUILD_CMDS $(SED) 's/$$(CCOPTS)//' $(@D)/netem/Makefile - $(MAKE) CC="$(TARGET_CC)" CCOPTS="$(TARGET_CFLAGS) -D_GNU_SOURCE" -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CCOPTS="$(TARGET_CFLAGS) -D_GNU_SOURCE" -C $(@D) endef define IPROUTE2_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" SBINDIR=/sbin \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" \ + SBINDIR=/sbin \ DOCDIR=/usr/share/doc/iproute2-$(IPROUTE2_VERSION) \ MANDIR=/usr/share/man install # Wants bash Modified: branches/1.0/package/ipsec-tools/ipsec-tools.mk =================================================================== --- branches/1.0/package/ipsec-tools/ipsec-tools.mk 2015-01-23 22:25:06 UTC (rev 6936) +++ branches/1.0/package/ipsec-tools/ipsec-tools.mk 2015-01-24 01:21:51 UTC (rev 6937) @@ -9,7 +9,7 @@ IPSEC_TOOLS_SITE = http://ftp.sunet.se/pub/NetBSD/misc/ipsec-tools/0.8/ IPSEC_TOOLS_INSTALL_STAGING = YES IPSEC_TOOLS_MAKE = $(MAKE1) -IPSEC_TOOLS_DEPENDENCIES = openssl flex host-flex +IPSEC_TOOLS_DEPENDENCIES = openssl host-bison flex host-flex # configure hardcodes -Werror, so override CFLAGS on make invocation IPSEC_TOOLS_MAKE_OPT = CFLAGS='$(TARGET_CFLAGS)' Modified: branches/1.0/package/libical/libical.mk =================================================================== --- branches/1.0/package/libical/libical.mk 2015-01-23 22:25:06 UTC (rev 6936) +++ branches/1.0/package/libical/libical.mk 2015-01-24 01:21:51 UTC (rev 6937) @@ -8,6 +8,7 @@ #LIBICAL_SITE = http://downloads.sourceforge.net/project/freeassociation/libical/libical-$(LIBICAL_VERSION) LIBICAL_VERSION = r1139 LIBICAL_SITE = http://files.astlinux.org +LIBICAL_DEPENDENCIES = host-bison host-flex LIBICAL_INSTALL_STAGING = YES LIBICAL_AUTORECONF = YES Modified: branches/1.0/package/libpcap/libpcap.mk =================================================================== --- branches/1.0/package/libpcap/libpcap.mk 2015-01-23 22:25:06 UTC (rev 6936) +++ branches/1.0/package/libpcap/libpcap.mk 2015-01-24 01:21:51 UTC (rev 6937) @@ -8,7 +8,7 @@ LIBPCAP_SITE = http://www.tcpdump.org/release LIBPCAP_SOURCE = libpcap-$(LIBPCAP_VERSION).tar.gz LIBPCAP_INSTALL_STAGING = YES -LIBPCAP_DEPENDENCIES = zlib +LIBPCAP_DEPENDENCIES = zlib host-flex host-bison # We're patching configure.in LIBPCAP_AUTORECONF = YES Modified: branches/1.0/package/linux-atm/linux-atm.mk =================================================================== --- branches/1.0/package/linux-atm/linux-atm.mk 2015-01-23 22:25:06 UTC (rev 6936) +++ branches/1.0/package/linux-atm/linux-atm.mk 2015-01-24 01:21:51 UTC (rev 6937) @@ -6,8 +6,8 @@ LINUX_ATM_VERSION = 2.5.2 LINUX_ATM_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/linux-atm/linux-atm/$(LINUX_ATM_VERSION) LINUX_ATM_SOURCE = linux-atm-$(LINUX_ATM_VERSION).tar.gz +LINUX_ATM_DEPENDENCIES = host-bison host-flex LINUX_ATM_INSTALL_STAGING = YES -LINUX_ATM_INSTALL_TARGET = YES LINUX_ATM_CONF_OPT = \ --program-transform-name='' Modified: branches/1.0/package/lm-sensors/lm-sensors.mk =================================================================== --- branches/1.0/package/lm-sensors/lm-sensors.mk 2015-01-23 22:25:06 UTC (rev 6936) +++ branches/1.0/package/lm-sensors/lm-sensors.mk 2015-01-24 01:21:51 UTC (rev 6937) @@ -7,6 +7,7 @@ LM_SENSORS_SOURCE = lm_sensors-$(LM_SENSORS_VERSION).tar.bz2 LM_SENSORS_SITE = http://dl.lm-sensors.org/lm-sensors/releases LM_SENSORS_INSTALL_STAGING = YES +LM_SENSORS_DEPENDENCIES = host-bison host-flex LM_SENSORS_BINS_ = bin/sensors-conf-convert LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_SENSORS) += bin/sensors Modified: branches/1.0/package/monit/monit.mk =================================================================== --- branches/1.0/package/monit/monit.mk 2015-01-23 22:25:06 UTC (rev 6936) +++ branches/1.0/package/monit/monit.mk 2015-01-24 01:21:51 UTC (rev 6937) @@ -6,6 +6,7 @@ MONIT_VERSION = 5.11 MONIT_SITE = http://mmonit.com/monit/dist +MONIT_DEPENDENCIES = host-bison host-flex # # Touching Makefile.am: MONIT_AUTORECONF = YES Modified: branches/1.0/package/mrouted/mrouted.mk =================================================================== --- branches/1.0/package/mrouted/mrouted.mk 2015-01-23 22:25:06 UTC (rev 6936) +++ branches/1.0/package/mrouted/mrouted.mk 2015-01-24 01:21:51 UTC (rev 6937) @@ -7,6 +7,7 @@ MROUTED_VERSION = 3.9.4 MROUTED_SOURCE = mrouted-$(MROUTED_VERSION).tar.bz2 MROUTED_SITE = http://ftp.vmlinux.org/pub/People/jocke/mrouted +MROUTED_DEPENDENCIES = host-bison define MROUTED_BUILD_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) Modified: branches/1.0/package/multimedia/gstreamer/gstreamer.mk =================================================================== --- branches/1.0/package/multimedia/gstreamer/gstreamer.mk 2015-01-23 22:25:06 UTC (rev 6936) +++ branches/1.0/package/multimedia/gstreamer/gstreamer.mk 2015-01-24 01:21:51 UTC (rev 6937) @@ -21,6 +21,6 @@ --disable-failing-tests \ --disable-loadsave -GSTREAMER_DEPENDENCIES = libglib2 host-pkg-config +GSTREAMER_DEPENDENCIES = libglib2 host-pkg-config host-bison host-flex $(eval $(call AUTOTARGETS,package/multimedia,gstreamer)) Modified: branches/1.0/package/ntp/ntp.mk =================================================================== --- branches/1.0/package/ntp/ntp.mk 2015-01-23 22:25:06 UTC (rev 6936) +++ branches/1.0/package/ntp/ntp.mk 2015-01-24 01:21:51 UTC (rev 6937) @@ -6,6 +6,7 @@ NTP_VERSION = 4.2.8 NTP_SOURCE = ntp-$(NTP_VERSION).tar.gz NTP_SITE = http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2 +NTP_DEPENDENCIES = host-bison host-flex host-pkg-config NTP_CONF_OPT = --with-shared \ --program-transform-name=s,,, \ Modified: branches/1.0/package/olsr/olsr.mk =================================================================== --- branches/1.0/package/olsr/olsr.mk 2015-01-23 22:25:06 UTC (rev 6936) +++ branches/1.0/package/olsr/olsr.mk 2015-01-24 01:21:51 UTC (rev 6937) @@ -14,6 +14,7 @@ #OLSR_PLUGINS=httpinfo tas dot_draw nameservice dyn_gw dyn_gw_plain pgraph bmf quagga secure OLSR_PLUGINS=dot_draw dyn_gw secure OLSR_TARGET_PLUGIN=usr/lib/ +OLSR_DEPENDENCIES = host-flex host-bison define OLSR_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(KERNEL_ARCH) -C $(@D) olsrd $(OLSR_PLUGINS) Modified: branches/1.0/package/radvd/radvd.mk =================================================================== --- branches/1.0/package/radvd/radvd.mk 2015-01-23 22:25:06 UTC (rev 6936) +++ branches/1.0/package/radvd/radvd.mk 2015-01-24 01:21:51 UTC (rev 6937) @@ -6,7 +6,7 @@ RADVD_VERSION = 2.8 RADVD_SOURCE = radvd-$(RADVD_VERSION).tar.gz RADVD_SITE = http://www.litech.org/radvd/dist/ -RADVD_DEPENDENCIES:=flex host-flex host-pkg-config +RADVD_DEPENDENCIES = host-bison flex host-flex host-pkg-config # For radvd-drop-check.patch RADVD_AUTORECONF = YES Modified: branches/1.0/package/unixodbc/unixodbc.mk =================================================================== --- branches/1.0/package/unixodbc/unixodbc.mk 2015-01-23 22:25:06 UTC (rev 6936) +++ branches/1.0/package/unixodbc/unixodbc.mk 2015-01-24 01:21:51 UTC (rev 6937) @@ -6,7 +6,7 @@ UNIXODBC_VERSION = 2.3.2 UNIXODBC_SOURCE = unixODBC-$(UNIXODBC_VERSION).tar.gz UNIXODBC_SITE = ftp://ftp.unixodbc.org/pub/unixODBC -UNIXODBC_DEPENDENCIES = libtool +UNIXODBC_DEPENDENCIES = host-bison host-flex libtool UNIXODBC_INSTALL_STAGING = YES Modified: branches/1.0/package/vtun/vtun.mk =================================================================== --- branches/1.0/package/vtun/vtun.mk 2015-01-23 22:25:06 UTC (rev 6936) +++ branches/1.0/package/vtun/vtun.mk 2015-01-24 01:21:51 UTC (rev 6937) @@ -9,7 +9,7 @@ VTUN_VERSION:=3.0.2 VTUN_SOURCE:=vtun-$(VTUN_VERSION).tar.gz VTUN_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/vtun/ -VTUN_DEPENDENCIES = zlib lzo openssl +VTUN_DEPENDENCIES = host-bison host-flex zlib lzo openssl VTUN_CONF_OPT = \ --with-ssl-headers=$(STAGING_DIR)/usr/include/openssl \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |