diff options
Diffstat (limited to 'package')
27 files changed, 194 insertions, 49 deletions
diff --git a/package/Makefile.package.in b/package/Makefile.package.in index 8985d5a9f..2349b05af 100644 --- a/package/Makefile.package.in +++ b/package/Makefile.package.in @@ -667,6 +667,7 @@ endif rm -f $$($(2)_TARGET_BUILD) rm -f $$($(2)_TARGET_INSTALL_STAGING) rm -f $$($(2)_TARGET_INSTALL_TARGET) + rm -f $$($(2)_TARGET_INSTALL_IMAGES) rm -f $$($(2)_TARGET_INSTALL_HOST) $(1)-rebuild: $(1)-clean-for-rebuild all diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 9e9113605..d18b6d0b1 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -141,8 +141,6 @@ endef BUSYBOX_POST_EXTRACT_HOOKS += BUSYBOX_COPY_CONFIG define BUSYBOX_CONFIGURE_CMDS - $(BUSYBOX_SET_SYSKLOGD) - $(BUSYBOX_SET_BB_PWD) $(BUSYBOX_SET_LARGEFILE) $(BUSYBOX_SET_IPV6) $(BUSYBOX_SET_RPC) diff --git a/package/crosstool-ng/crosstool-ng-000-makefile-recursion.patch b/package/crosstool-ng/crosstool-ng-000-makefile-recursion.patch index 4f6674472..b875e3f1a 100644 --- a/package/crosstool-ng/crosstool-ng-000-makefile-recursion.patch +++ b/package/crosstool-ng/crosstool-ng-000-makefile-recursion.patch @@ -18,7 +18,7 @@ Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> diff -du crosstool-ng-1.12.0/Makefile.in host-crosstool-ng-1.12.0/Makefile.in --- crosstool-ng-1.12.0/Makefile.in 2011-08-01 01:21:34.000000000 +0200 +++ host-crosstool-ng-1.12.0/Makefile.in 2011-08-07 21:39:16.055958219 +0200 -@@ -95,9 +95,14 @@ +@@ -101,9 +101,14 @@ # level. # This has the side effect of only showing the real targets, and hiding our # internal ones. :-) diff --git a/package/crosstool-ng/crosstool-ng-001-wget-instead-of-curl.patch b/package/crosstool-ng/crosstool-ng-001-wget-instead-of-curl.patch new file mode 100644 index 000000000..d40f178b8 --- /dev/null +++ b/package/crosstool-ng/crosstool-ng-001-wget-instead-of-curl.patch @@ -0,0 +1,52 @@ +Use wget instead of curl + +While crosstool-NG did support either curl or wget in the past, it now +only supports curl. Unfortunately, Buildroot uses wget for all its +downloads, so wget is a hard dependency of Buildroot, while curl +isn't. + +Instead of adding curl as a new Buildroot dependency, or building curl +for the host, we simply tweak crosstool-NG to use wget instead of +curl. + +The script/functions change has been provided by Yann E. Morin. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + +Index: crosstool-ng-1.13.0/configure +=================================================================== +--- crosstool-ng-1.13.0.orig/configure ++++ crosstool-ng-1.13.0/configure +@@ -496,7 +496,7 @@ + ver='\(GNU libtool.*\) (2[[:digit:]]*\.|1\.6[[:digit:]]*\.|1\.5\.[2-9][[:digit:]]+)' \ + err="'libtoolize' 1.5.26 or above was not found" + has_or_abort prog=stat +-has_or_abort prog="curl" ++has_or_abort prog="wget" + has_or_abort prog=patch + has_or_abort prog=tar + has_or_abort prog=gzip +Index: crosstool-ng-1.13.0/scripts/functions +=================================================================== +--- crosstool-ng-1.13.0.orig/scripts/functions ++++ crosstool-ng-1.13.0/scripts/functions +@@ -456,13 +456,12 @@ + # Some company networks have firewalls to connect to the internet, but it's + # not easy to detect them, so force a global ${CT_CONNECT_TIMEOUT}-second + # timeout. +- # For curl, no good progress indicator is available. So, be silent. +- if CT_DoExecLog ALL curl --ftp-pasv \ +- --retry 3 \ +- --connect-timeout ${CT_CONNECT_TIMEOUT} \ +- --location --fail --silent \ +- --output "${tmp}" \ +- "${url}" ++ if CT_DoExecLog ALL wget --passive-ftp --tries=3 -nc \ ++ -T ${CT_CONNECT_TIMEOUT} \ ++ -O "${tmp}" \ ++ "${url}" ++ ++ + then + # Success, we got it, good! + mv "${tmp}" "${dest}" diff --git a/package/crosstool-ng/crosstool-ng.mk b/package/crosstool-ng/crosstool-ng.mk index f6766972c..0337bf1fe 100644 --- a/package/crosstool-ng/crosstool-ng.mk +++ b/package/crosstool-ng/crosstool-ng.mk @@ -1,4 +1,4 @@ -CROSSTOOL_NG_VERSION = 1.13.0 +CROSSTOOL_NG_VERSION = 1.13.2 CROSSTOOL_NG_SOURCE = crosstool-ng-$(CROSSTOOL_NG_VERSION).tar.bz2 CROSSTOOL_NG_SITE = http://crosstool-ng.org/download/crosstool-ng/ CROSSTOOL_NG_INSTALL_STAGING = NO diff --git a/package/distcc/distcc.mk b/package/distcc/distcc.mk index 40961972e..dc3b36b2e 100644 --- a/package/distcc/distcc.mk +++ b/package/distcc/distcc.mk @@ -3,9 +3,9 @@ # distcc # ############################################################# -DISTCC_VERSION:=2.18.3 -DISTCC_SOURCE:=distcc-$(DISTCC_VERSION).tar.bz2 -DISTCC_SITE:=http://distcc.samba.org/ftp/distcc/ +DISTCC_VERSION = 2.18.3 +DISTCC_SOURCE = distcc-$(DISTCC_VERSION).tar.bz2 +DISTCC_SITE = http://distcc.googlecode.com/files/ DISTCC_CONF_OPT = --with-included-popt --without-gtk --without-gnome diff --git a/package/file/file.mk b/package/file/file.mk index d9a533f4d..753605698 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -8,6 +8,7 @@ FILE_VERSION = 5.09 FILE_SITE = ftp://ftp.astron.com/pub/file/ FILE_DEPENDENCIES = host-file zlib HOST_FILE_DEPENDENCIES = host-zlib +FILE_INSTALL_STAGING = YES define FILE_UNINSTALL_TARGET_CMDS $(MAKE) DESTDIR=$(TARGET_DIR) uninstall -C $(FILE_DIR) diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 142a1ec69..6eb6b29e7 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -4,7 +4,7 @@ # ############################################################# -FREETYPE_VERSION = 2.4.7 +FREETYPE_VERSION = 2.4.8 FREETYPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2 FREETYPE_INSTALL_STAGING = YES diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk index ff76f92c6..c07fb2da3 100644 --- a/package/lsof/lsof.mk +++ b/package/lsof/lsof.mk @@ -33,13 +33,12 @@ endef endif # The .tar.bz2 contains another .tar, which contains the source code. -define LSOF_EXTRACT_TAR - $(TAR) $(TAR_STRIP_COMPONENTS)=1 -xf $(@D)/lsof_$(LSOF_VERSION)_src.tar -C $(@D) - rm -f $(@D)/lsof_$(LSOF_VERSION)_src.tar +define LSOF_EXTRACT_CMDS + $(INFLATE.bz2) $(DL_DIR)/$(LSOF_SOURCE) | \ + $(TAR) -O $(TAR_OPTIONS) - lsof_$(LSOF_VERSION)/lsof_$(LSOF_VERSION)_src.tar | \ + $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(LSOF_DIR) $(TAR_OPTIONS) - endef -LSOF_POST_EXTRACT_HOOKS += LSOF_EXTRACT_TAR - define LSOF_CONFIGURE_CMDS (cd $(@D) ; \ echo n | $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS) $(BR2_LSOF_CFLAGS)" \ diff --git a/package/lzma/lzmacheck.sh b/package/lzma/lzmacheck.sh deleted file mode 100755 index bcb0423d1..000000000 --- a/package/lzma/lzmacheck.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -bin=$(toolchain/dependencies/check-host-lzma.sh) -if [ "x$bin" = "x" ] ; then - echo build-lzma-host-binary -else - echo use-lzma-host-binary -fi - diff --git a/package/multimedia/gst-plugins-bad/Config.in b/package/multimedia/gst-plugins-bad/Config.in index a8d01bcad..e772930b2 100644 --- a/package/multimedia/gst-plugins-bad/Config.in +++ b/package/multimedia/gst-plugins-bad/Config.in @@ -55,8 +55,12 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DEBUGUTILS bool "debugutils" config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DECKLINK + depends on BR2_INSTALL_LIBSTDCPP bool "decklink" +comment "decklink requires a toolchain with C++ support enabled" + depends on !BR2_INSTALL_LIBSTDCPP + config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DTMF bool "dtmf" diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk index 776cc68ee..96b4e736e 100644 --- a/package/multimedia/mplayer/mplayer.mk +++ b/package/multimedia/mplayer/mplayer.mk @@ -67,8 +67,8 @@ else MPLAYER_CONF_OPTS += --disable-mencoder endif -ifeq ($(BR2_PACKAGE_TREMOR),y) -MPLAYER_DEPENDENCIES += tremor +ifeq ($(BR2_PACKAGE_TREMOR)$(BR2_PACKAGE_LIBOGG),yy) +MPLAYER_DEPENDENCIES += tremor libogg MPLAYER_CONF_OPTS += --disable-tremor-internal --enable-tremor endif @@ -108,6 +108,12 @@ ifeq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),armv7-a) MPLAYER_CONF_OPTS += --enable-neon endif +ifeq ($(BR2_i386),y) +# inline asm breaks with "can't find a register in class 'GENERAL_REGS'" +# inless we free up ebp +MPLAYER_CFLAGS += -fomit-frame-pointer +endif + define MPLAYER_CONFIGURE_CMDS (cd $(@D); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ @@ -122,6 +128,7 @@ define MPLAYER_CONFIGURE_CMDS --charset=UTF-8 \ --extra-cflags="$(MPLAYER_CFLAGS)" \ --extra-ldflags="$(MPLAYER_LDFLAGS)" \ + --yasm='' \ --enable-mad \ --enable-fbdev \ $(MPLAYER_CONF_OPTS) \ diff --git a/package/newt/newt.mk b/package/newt/newt.mk index 28b5321e7..eb944a92f 100644 --- a/package/newt/newt.mk +++ b/package/newt/newt.mk @@ -42,7 +42,7 @@ $(NEWT_DIR)/.configured: $(NEWT_DIR)/.source touch $(NEWT_DIR)/.configured $(NEWT_DIR)/libnewt.so.$(NEWT_VERSION): $(NEWT_DIR)/.configured - $(MAKE) CFLAGS="$(TARGET_CFLAGS) $(NEWT_CFLAGS)" CC="$(TARGET_CC)" -C $(NEWT_DIR) + $(MAKE1) CFLAGS="$(TARGET_CFLAGS) $(NEWT_CFLAGS)" CC="$(TARGET_CC)" -C $(NEWT_DIR) touch -c $@ $(STAGING_DIR)/usr/lib/libnewt.a: $(NEWT_DIR)/libnewt.so.$(NEWT_VERSION) diff --git a/package/opencv/Config.in b/package/opencv/Config.in index 1f454b677..961282f5e 100644 --- a/package/opencv/Config.in +++ b/package/opencv/Config.in @@ -31,11 +31,16 @@ config BR2_PACKAGE_OPENCV_WITH_PYTHON config BR2_PACKAGE_OPENCV_WITH_FFMPEG bool "ffmpeg support" + depends on BR2_LARGEFILE + depends on BR2_INET_IPV6 select BR2_PACKAGE_FFMPEG select BR2_PACKAGE_FFMPEG_SWSCALE help Use ffmpeg from the target system. +comment "ffmpeg support requires a toolchain with LARGEFILE and IPV6 support" + depends on !(BR2_LARGEFILE && BR2_INET_IPV6) + config BR2_PACKAGE_OPENCV_WITH_GSTREAMER bool "gstreamer support" select BR2_PACKAGE_GSTREAMER diff --git a/package/php/Config.ext b/package/php/Config.ext index 4f1614e1d..bd630eeb6 100644 --- a/package/php/Config.ext +++ b/package/php/Config.ext @@ -125,6 +125,7 @@ config BR2_PACKAGE_PHP_EXT_SYSVSHM config BR2_PACKAGE_PHP_EXT_ZIP bool "zip" + select BR2_PACKAGE_ZLIB help Zip read/write support diff --git a/package/php/php.mk b/package/php/php.mk index a1dde5172..7f848b178 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -70,7 +70,7 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_SIMPLEXML),y) PHP_CONF_OPT += --enable-simplexml endif -ifeq ($(BR2_PACKAGE_PHP_EXT_ZLIB),y) +ifneq ($(BR2_PACKAGE_PHP_EXT_ZLIB)$(BR2_PACKAGE_PHP_EXT_ZIP),) PHP_CONF_OPT += --with-zlib=$(STAGING_DIR)/usr PHP_DEPENDENCIES += zlib endif diff --git a/package/qt/qt.mk b/package/qt/qt.mk index cc035bfe3..28a477ae1 100644 --- a/package/qt/qt.mk +++ b/package/qt/qt.mk @@ -434,11 +434,11 @@ endif QT_QMAKE:=$(HOST_DIR)/usr/bin/qmake -spec qws/linux-$(QT_EMB_PLATFORM)-g++ ################################################################################ -# QT_QMAKE_SET -- helper macro to set QMAKE_<variable> = <value> in +# QT_QMAKE_SET -- helper macro to set <variable> = <value> in # the qmake.conf file. Will remove existing variable declaration if # available. # -# Argument 1 is the variable name (without QMAKE_) +# Argument 1 is the variable name # Argument 2 is the value to set variable to # Argument 3 is the base source directory of Qt # @@ -446,8 +446,8 @@ QT_QMAKE:=$(HOST_DIR)/usr/bin/qmake -spec qws/linux-$(QT_EMB_PLATFORM)-g++ # $(call QT_QMAKE_SET,variable,value,directory) ################################################################################ define QT_QMAKE_SET - $(SED) '/QMAKE_$(1)/d' $(3)/mkspecs/qws/linux-$(QT_EMB_PLATFORM)-g++/qmake.conf - $(SED) '/include.*qws.conf/aQMAKE_$(1) = $(2)' $(3)/mkspecs/qws/linux-$(QT_EMB_PLATFORM)-g++/qmake.conf + $(SED) '/$(1)/d' $(3)/mkspecs/qws/linux-$(QT_EMB_PLATFORM)-g++/qmake.conf + $(SED) '/include.*qws.conf/a$(1) = $(2)' $(3)/mkspecs/qws/linux-$(QT_EMB_PLATFORM)-g++/qmake.conf endef ifneq ($(BR2_INET_IPV6),y) @@ -468,17 +468,18 @@ define QT_CONFIGURE_CMDS $(QT_CONFIGURE_IPV6) $(QT_CONFIGURE_CONFIG_FILE) # Fix compiler path - $(call QT_QMAKE_SET,CC,$(TARGET_CC),$(@D)) - $(call QT_QMAKE_SET,CXX,$(TARGET_CXX),$(@D)) - $(call QT_QMAKE_SET,LINK,$(TARGET_CXX),$(@D)) - $(call QT_QMAKE_SET,LINK_SHLIB,$(TARGET_CXX),$(@D)) - $(call QT_QMAKE_SET,AR,$(TARGET_AR) cqs,$(@D)) - $(call QT_QMAKE_SET,OBJCOPY,$(TARGET_OBJCOPY),$(@D)) - $(call QT_QMAKE_SET,RANLIB,$(TARGET_RANLIB),$(@D)) - $(call QT_QMAKE_SET,STRIP,$(TARGET_STRIP),$(@D)) - $(call QT_QMAKE_SET,CFLAGS,$(QT_CFLAGS),$(@D)) - $(call QT_QMAKE_SET,CXXFLAGS,$(QT_CXXFLAGS),$(@D)) - $(call QT_QMAKE_SET,LFLAGS,$(TARGET_LDFLAGS),$(@D)) + $(call QT_QMAKE_SET,QMAKE_CC,$(TARGET_CC),$(@D)) + $(call QT_QMAKE_SET,QMAKE_CXX,$(TARGET_CXX),$(@D)) + $(call QT_QMAKE_SET,QMAKE_LINK,$(TARGET_CXX),$(@D)) + $(call QT_QMAKE_SET,QMAKE_LINK_SHLIB,$(TARGET_CXX),$(@D)) + $(call QT_QMAKE_SET,QMAKE_AR,$(TARGET_AR) cqs,$(@D)) + $(call QT_QMAKE_SET,QMAKE_OBJCOPY,$(TARGET_OBJCOPY),$(@D)) + $(call QT_QMAKE_SET,QMAKE_RANLIB,$(TARGET_RANLIB),$(@D)) + $(call QT_QMAKE_SET,QMAKE_STRIP,$(TARGET_STRIP),$(@D)) + $(call QT_QMAKE_SET,QMAKE_CFLAGS,$(QT_CFLAGS),$(@D)) + $(call QT_QMAKE_SET,QMAKE_CXXFLAGS,$(QT_CXXFLAGS),$(@D)) + $(call QT_QMAKE_SET,QMAKE_LFLAGS,$(TARGET_LDFLAGS),$(@D)) + $(call QT_QMAKE_SET,PKG_CONFIG,$(HOST_DIR)/usr/bin/pkg-config,$(@D)) # Don't use TARGET_CONFIGURE_OPTS here, qmake would be compiled for the target # instead of the host then. So set PKG_CONFIG* manually. (cd $(@D); \ diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index 3407f49d3..4d8fe21fa 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -10,14 +10,28 @@ RPM_AUTORECONF = NO RPM_DEPENDENCIES = zlib beecrypt neon popt RPM_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/beecrypt -I$(STAGING_DIR)/usr/include/neon -DHAVE_MUTEX_THREAD_ONLY" \ - ac_cv_va_copy=yes + ac_cv_va_copy=yes RPM_CONF_OPT = --disable-build-versionscript --disable-rpath \ --without-selinux \ --without-python --without-perl \ --with-zlib=$(STAGING_DIR) \ --with-libbeecrypt=$(STAGING_DIR) \ - --with-popt=$(STAGING_DIR) + --with-popt=$(STAGING_DIR) + +ifeq ($(BR2_PACKAGE_PCRE),y) +RPM_DEPENDENCIES += pcre +RPM_CONF_OPT += --with-pcre=external +else +RPM_CONF_OPT += --with-pcre=no +endif + +ifeq ($(BR2_PACKAGE_FILE),y) +RPM_DEPENDENCIES += file +RPM_CONF_OPT += --with-file=external +else +RPM_CONF_OPT += --with-file=no +endif ifeq ($(BR2_PACKAGE_RPM_XZ_PAYLOADS),y) RPM_CONF_OPT+=--with-xz diff --git a/package/rrdtool/rrdtool-1.2.30-configure-dont-hardcode-include-dirs.patch b/package/rrdtool/rrdtool-1.2.30-configure-dont-hardcode-include-dirs.patch new file mode 100644 index 000000000..43b57a1b2 --- /dev/null +++ b/package/rrdtool/rrdtool-1.2.30-configure-dont-hardcode-include-dirs.patch @@ -0,0 +1,26 @@ +[PATCH] configure.ac: don't hardcode include files search paths + +Breaks cross compilation if host has libart/freetype. + +Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: rrdtool-1.2.30/configure.ac +=================================================================== +--- rrdtool-1.2.30.orig/configure.ac ++++ rrdtool-1.2.30/configure.ac +@@ -524,10 +524,10 @@ + + CORE_LIBS="$LIBS" + +-EX_CHECK_ALL(art_lgpl_2, art_vpath_add_point, libart_lgpl/libart.h, libart-2.0, 2.3.17, ftp://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/, /usr/include/libart-2.0) ++EX_CHECK_ALL(art_lgpl_2, art_vpath_add_point, libart_lgpl/libart.h, libart-2.0, 2.3.17, ftp://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/, "") + EX_CHECK_ALL(z, zlibVersion, zlib.h, zlib, 1.2.3, http://www.gzip.org/zlib/, "") + EX_CHECK_ALL(png, png_access_version_number, png.h, libpng, 1.2.10, http://prdownloads.sourceforge.net/libpng/, "") +-EX_CHECK_ALL(freetype, FT_Init_FreeType, ft2build.h, freetype2, 2.1.10, http://prdownloads.sourceforge.net/freetype/, /usr/include/freetype2) ++EX_CHECK_ALL(freetype, FT_Init_FreeType, ft2build.h, freetype2, 2.1.10, http://prdownloads.sourceforge.net/freetype/, "") + + if test "$EX_CHECK_ALL_ERR" = "YES"; then + AC_MSG_ERROR([Please fix the library issues listed above and try again.]) diff --git a/package/rrdtool/rrdtool.mk b/package/rrdtool/rrdtool.mk index 55aed9eff..55bdd5104 100644 --- a/package/rrdtool/rrdtool.mk +++ b/package/rrdtool/rrdtool.mk @@ -7,6 +7,7 @@ RRDTOOL_VERSION = 1.2.30 RRDTOOL_SITE = http://oss.oetiker.ch/rrdtool/pub RRDTOOL_DEPENDENCIES = host-pkg-config freetype libart libpng zlib +RRDTOOL_AUTORECONF = YES RRDTOOL_INSTALL_STAGING = YES RRDTOOL_CONF_ENV = rd_cv_ieee_works=yes rd_cv_null_realloc=nope \ ac_cv_func_mmap_fixed_mapped=yes diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index 6582812b7..b7576cd5c 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -13,8 +13,9 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y) endif define RSYSLOG_INSTALL_CONF_SCRIPT - $(INSTALL) -m 0755 -D package/rsyslog/S01rsyslog \ - $(TARGET_DIR)/etc/init.d/S01rsyslog + [ -f $(TARGET_DIR)/etc/init.d/S01rsyslog ] || \ + $(INSTALL) -m 0755 -D package/rsyslog/S01rsyslog \ + $(TARGET_DIR)/etc/init.d/S01rsyslog [ -f $(TARGET_DIR)/etc/rsyslog.conf ] || \ $(INSTALL) -m 0644 -D $(@D)/rsyslog.conf \ $(TARGET_DIR)/etc/rsyslog.conf diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index 34953336f..d99fd1ee5 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -10,9 +10,8 @@ RUBY_AUTORECONF = YES HOST_RUBY_AUTORECONF = YES RUBY_DEPENDENCIES = host-ruby RUBY_MAKE_ENV = $(TARGET_MAKE_ENV) -RUBY_CONF_OPT = --disable-install-doc - -HOST_RUBY_CONF_OPT = --disable-install-doc +RUBY_CONF_OPT = --disable-install-doc --disable-rpath +HOST_RUBY_CONF_OPT = --disable-install-doc --with-out-ext=curses,readline # Force optionals to build before we do ifeq ($(BR2_PACKAGE_BERKELEYDB),y) diff --git a/package/tar/tar.mk b/package/tar/tar.mk index c797de9be..edbd9bdc7 100644 --- a/package/tar/tar.mk +++ b/package/tar/tar.mk @@ -7,4 +7,9 @@ TAR_VERSION = 1.26 TAR_SITE = $(BR2_GNU_MIRROR)/tar +# Prefer full-blown tar over buybox's version +ifeq ($(BR2_PACKAGE_BUSYBOX),y) +TAR_DEPENDENCIES += busybox +endif + $(eval $(call AUTOTARGETS)) diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk index 98c3c2a06..728319b27 100644 --- a/package/tftpd/tftpd.mk +++ b/package/tftpd/tftpd.mk @@ -8,6 +8,10 @@ TFTPD_SOURCE = tftp-hpa-$(TFTPD_VERSION).tar.bz2 TFTPD_SITE = $(BR2_KERNEL_MIRROR)/software/network/tftp/ TFTPD_CONF_OPT = --without-tcpwrappers +ifneq ($(BR2_INET_IPV6),y) +TFTPD_CONF_OPT += --without-ipv6 +endif + define TFTPD_INSTALL_TARGET_CMDS $(INSTALL) -D $(@D)/tftpd/tftpd $(TARGET_DIR)/usr/sbin/tftpd $(INSTALL) -D package/tftpd/S80tftpd-hpa $(TARGET_DIR)/etc/init.d/ diff --git a/package/thttpd/thttpd-2.25b-getline.patch b/package/thttpd/thttpd-2.25b-getline.patch new file mode 100644 index 000000000..35c366aef --- /dev/null +++ b/package/thttpd/thttpd-2.25b-getline.patch @@ -0,0 +1,26 @@ +Fix glibc/eglibc getline() conflicting functions. + +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> +--- + +diff -Nura thttpd-2.25b.orig/extras/htpasswd.c thttpd-2.25b/extras/htpasswd.c +--- thttpd-2.25b.orig/extras/htpasswd.c 2001-12-18 21:08:08.000000000 -0300 ++++ thttpd-2.25b/extras/htpasswd.c 2011-11-25 11:42:47.198582812 -0300 +@@ -49,7 +49,7 @@ + while((line[y++] = line[x++])); + } + +-static int getline(char *s, int n, FILE *f) { ++static int get_line(char *s, int n, FILE *f) { + register int i=0; + + while(1) { +@@ -189,7 +189,7 @@ + strcpy(user,argv[2]); + + found = 0; +- while(!(getline(line,MAX_STRING_LEN,f))) { ++ while(!(get_line(line,MAX_STRING_LEN,f))) { + if(found || (line[0] == '#') || (!line[0])) { + putline(tfp,line); + continue; diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk index 8fb3dd3e8..a68779dda 100644 --- a/package/x11r7/libxcb/libxcb.mk +++ b/package/x11r7/libxcb/libxcb.mk @@ -15,11 +15,14 @@ LIBXCB_DEPENDENCIES = \ LIBXCB_CONF_ENV = STAGING_DIR="$(STAGING_DIR)" LIBXCB_MAKE_OPT = XCBPROTO_XCBINCLUDEDIR=$(STAGING_DIR)/usr/share/xcb \ XCBPROTO_XCBPYTHONDIR=$(HOST_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages +LIBXCB_CONF_OPT = --disable-build-docs HOST_LIBXCB_DEPENDENCIES = \ host-libxslt host-pthread-stubs host-xcb-proto host-xlib_libXdmcp \ host-xlib_libXau host-python +HOST_LIBXCB_CONF_OPT = --disable-build-docs + $(eval $(call AUTOTARGETS)) $(eval $(call AUTOTARGETS,host)) diff --git a/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk b/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk index 9975916e8..726d5edbd 100644 --- a/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk +++ b/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk @@ -7,6 +7,12 @@ XAPP_XF86DGA_VERSION = 1.0.2 XAPP_XF86DGA_SOURCE = xf86dga-$(XAPP_XF86DGA_VERSION).tar.bz2 XAPP_XF86DGA_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XF86DGA_DEPENDENCIES = xlib_libX11 xlib_libXxf86dga +XAPP_XF86DGA_DEPENDENCIES = \ + host-pkg-config \ + xlib_libX11 \ + xlib_libXxf86dga \ + xlib_libXt \ + xlib_libXaw \ + xlib_libXmu $(eval $(call AUTOTARGETS)) |