Commit 4f05a61b authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch 'misc-fixes5' of git://git.busybox.net/~tpetazzoni/git/buildroot

parents 52fcd86f f08e9eea

package/Config.in

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ source "package/pkg-config/Config.in" 
source "package/readline/Config.in"

source "package/valgrind/Config.in"

source "package/pcre/Config.in"

source "package/intltool/Config.in"



comment "Other stuff"

source "package/at/Config.in"
@@ -412,6 +413,7 @@ source "package/ezxml/Config.in" 
source "package/libxml2/Config.in"

source "package/libxslt/Config.in"

source "package/xerces/Config.in"

source "package/libxml-parser-perl/Config.in"

endmenu



# java support

package/Makefile.in

+10 −3
Original line number Diff line number Diff line
@@ -228,6 +228,8 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \ 
		PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \

		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \

		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \

		PERLLIB="$(HOST_DIR)/usr/lib/perl" \

		LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib" \

		STAGING_DIR="$(STAGING_DIR)"



TARGET_CONFIGURE_ENV=\
@@ -236,7 +238,9 @@ TARGET_CONFIGURE_ENV=\ 
	LDFLAGS="$(TARGET_LDFLAGS)" \

	FCFLAGS="$(TARGET_FCFLAGS)" \



TARGET_MAKE_ENV=PATH=$(TARGET_PATH)

TARGET_MAKE_ENV=PATH=$(TARGET_PATH) \

		LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)" \

		PERLLIB="$(HOST_DIR)/usr/lib/perl"



HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \

		AR="$(HOSTAR)" \
@@ -274,11 +278,14 @@ HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \ 
		ORIGINAL_NM_FOR_TARGET="$(TARGET_NM)" \

		ORIGINAL_OBJDUMP_FOR_TARGET="$(TARGET_OBJDUMP)" \

		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \

		PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig"

		PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig" \

		PERLLIB="$(HOST_DIR)/usr/lib/perl"



HOST_MAKE_ENV=PATH=$(HOST_PATH) \

		LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)" \

		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \

		PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig"

		PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig" \

		PERLLIB="$(HOST_DIR)/usr/lib/perl"





#######################################################################

package/automake/automake.mk

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ ifeq ($(BR2_ENABLE_DEBUG),y) # install-exec doesn't install aclocal stuff 
AUTOMAKE_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install

endif



AUTOMAKE_DEPENDENCIES = autoconf microperl

AUTOMAKE_DEPENDENCIES = host-autoconf autoconf microperl



HOST_AUTOMAKE_DEPENDENCIES = host-autoconf

package/dosfstools/dosfstools.mk

+19 −13
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ $(DOSFSTOOLS_DIR)/.built : $(DOSFSTOOLS_DIR)/.unpacked 
	$(STRIPCMD) $(DOSFSTOOLS_DIR)/$(DOSFSLABEL_BINARY)

	touch $@



$(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY): $(DOSFSTOOLS_DIR)/.built

$(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY): # $(DOSFSTOOLS_DIR)/.built

	echo foo

	cp -a $(DOSFSTOOLS_DIR)/$(MKDOSFS_BINARY) $@

	touch -c $@
@@ -44,7 +45,20 @@ $(TARGET_DIR)/$(DOSFSLABEL_TARGET_BINARY): $(DOSFSTOOLS_DIR)/.built 
	cp -a $(DOSFSTOOLS_DIR)/$(DOSFSLABEL_BINARY) $@

	touch -c $@



dosfstools: $(TARGET_DIR)/$(DOSFSTOOLS_TARGET_BINARY) $(TARGET_DIR)/$(DOSFSCK_TARGET_BINARY)

DOSFSTOOLS=

ifeq ($(BR2_PACKAGE_DOSFSTOOLS_MKDOSFS),y)

DOSFSTOOLS+=$(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY)

endif



ifeq ($(BR2_PACKAGE_DOSFSTOOLS_DOSFSCK),y)

DOSFSTOOLS+=$(TARGET_DIR)/$(DOSFSCK_TARGET_BINARY)

endif



ifeq ($(BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL),y)

DOSFSTOOLS+=$(TARGET_DIR)/$(DOSFSLABEL_TARGET_BINARY)

endif



dosfstools: $(DOSFSTOOLS)



dosfstools-clean:

	rm -f $(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY)
@@ -60,14 +74,6 @@ dosfstools-dirclean: 
# Toplevel Makefile options

#

#############################################################

ifeq ($(BR2_PACKAGE_DOSFSTOOLS_MKDOSFS),y)

TARGETS+=$(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY)

endif



ifeq ($(BR2_PACKAGE_DOSFSTOOLS_DOSFSCK),y)

TARGETS+=$(TARGET_DIR)/$(DOSFSCK_TARGET_BINARY)

endif



ifeq ($(BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL),y)

TARGETS+=$(TARGET_DIR)/$(DOSFSLABEL_TARGET_BINARY)

ifeq ($(BR2_PACKAGE_DOSFSTOOLS),y)

TARGETS+=dosfstools

endif
 
 No newline at end of file

package/flex/flex.mk

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ FLEX_SOURCE:=flex_$(FLEX_VERSION).orig.tar.gz 
FLEX_PATCH:=flex_$(FLEX_VERSION)-$(FLEX_PATCH_VERSION).diff.gz

FLEX_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/f/flex

FLEX_DIR:=$(BUILD_DIR)/flex-$(FLEX_VERSION)

FLEX_INSTALL_STAGING=YES



# lex -> flex

define FLEX_INSTALL_LEX