# HG changeset patch # User Pascal Bellard # Date 1462033233 -7200 # Node ID 881c653f2f8c5cbbc25c4998f413ef8d0530e218 # Parent 2b78860f38177429b46d7838a94186c486a9c385 cross/arm: fix build for ell busybox flex ninvaders diff -r 2b78860f3817 -r 881c653f2f8c aspell/receipt --- a/aspell/receipt Sat Apr 30 15:13:06 2016 +0200 +++ b/aspell/receipt Sat Apr 30 18:20:33 2016 +0200 @@ -13,7 +13,7 @@ HOST_ARCH="i486 arm" DEPENDS="ncursesw" -BUILD_DEPENDS="ncursesw-dev" +BUILD_DEPENDS="ncursesw-dev libtinfo" # Rules to configure and make the package. compile_rules() diff -r 2b78860f3817 -r 881c653f2f8c busybox/stuff/arm/busybox.config --- a/busybox/stuff/arm/busybox.config Sat Apr 30 15:13:06 2016 +0200 +++ b/busybox/stuff/arm/busybox.config Sat Apr 30 18:20:33 2016 +0200 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.22.1 -# Sat Mar 8 22:06:50 2014 +# Busybox version: 1.23.2 +# Fri Apr 29 16:48:09 2016 # CONFIG_HAVE_DOT_CONFIG=y @@ -13,7 +13,7 @@ # General Configuration # CONFIG_DESKTOP=y -CONFIG_EXTRA_COMPAT=y +# CONFIG_EXTRA_COMPAT is not set CONFIG_INCLUDE_SUSv2=y # CONFIG_USE_PORTABLE_CODE is not set CONFIG_PLATFORM_LINUX=y @@ -30,12 +30,14 @@ # CONFIG_UNICODE_USING_LOCALE is not set # CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set CONFIG_SUBST_WCHAR=63 -CONFIG_LAST_SUPPORTED_WCHAR=767 +CONFIG_LAST_SUPPORTED_WCHAR=11263 # CONFIG_UNICODE_COMBINING_WCHARS is not set # CONFIG_UNICODE_WIDE_WCHARS is not set # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE is not set # CONFIG_UNICODE_PRESERVE_BROKEN is not set +# CONFIG_PAM is not set +CONFIG_FEATURE_USE_SENDFILE=y CONFIG_LONG_OPTS=y CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_CLEAN_UP is not set @@ -73,6 +75,7 @@ # # CONFIG_DEBUG is not set # CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_UNIT_TEST is not set # CONFIG_WERROR is not set CONFIG_NO_DEBUG_LIB=y # CONFIG_DMALLOC is not set @@ -97,8 +100,8 @@ # CONFIG_FEATURE_RTMINMAX is not set CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 -CONFIG_SHA3_SMALL=0 -CONFIG_FEATURE_FAST_TOP=y +CONFIG_SHA3_SMALL=1 +# CONFIG_FEATURE_FAST_TOP is not set # CONFIG_FEATURE_ETC_NETWORKS is not set CONFIG_FEATURE_USE_TERMIOS=y CONFIG_FEATURE_EDITING=y @@ -139,21 +142,21 @@ CONFIG_GUNZIP=y CONFIG_BUNZIP2=y CONFIG_UNLZMA=y -CONFIG_FEATURE_LZMA_FAST=y +# CONFIG_FEATURE_LZMA_FAST is not set # CONFIG_LZMA is not set CONFIG_UNXZ=y # CONFIG_XZ is not set -CONFIG_BZIP2=y +# CONFIG_BZIP2 is not set CONFIG_CPIO=y CONFIG_FEATURE_CPIO_O=y -CONFIG_FEATURE_CPIO_P=y +# CONFIG_FEATURE_CPIO_P is not set CONFIG_DPKG=y CONFIG_DPKG_DEB=y CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY=y CONFIG_GZIP=y CONFIG_FEATURE_GZIP_LONG_OPTIONS=y CONFIG_GZIP_FAST=0 -CONFIG_LZOP=y +# CONFIG_LZOP is not set # CONFIG_LZOP_COMPR_HIGH is not set CONFIG_RPM=y CONFIG_RPM2CPIO=y @@ -183,6 +186,7 @@ CONFIG_HOSTID=y CONFIG_ID=y CONFIG_GROUPS=y +# CONFIG_SHUF is not set CONFIG_TEST=y # CONFIG_FEATURE_TEST_64 is not set CONFIG_TOUCH=y @@ -191,6 +195,7 @@ CONFIG_TR=y CONFIG_FEATURE_TR_CLASSES=y CONFIG_FEATURE_TR_EQUIV=y +# CONFIG_UNLINK is not set CONFIG_BASE64=y CONFIG_WHO=y CONFIG_USERS=y @@ -208,7 +213,7 @@ CONFIG_CUT=y CONFIG_DD=y CONFIG_FEATURE_DD_SIGNAL_HANDLING=y -# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set +CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y CONFIG_FEATURE_DD_IBS_OBS=y CONFIG_DF=y CONFIG_FEATURE_DF_FANCY=y @@ -269,7 +274,7 @@ CONFIG_SHA3SUM=y CONFIG_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y -# CONFIG_FEATURE_FLOAT_SLEEP is not set +CONFIG_FEATURE_FLOAT_SLEEP=y CONFIG_SORT=y CONFIG_FEATURE_SORT_BIG=y CONFIG_SPLIT=y @@ -299,6 +304,11 @@ CONFIG_YES=y # +# Common options +# +CONFIG_FEATURE_VERBOSE=y + +# # Common options for cp and mv # CONFIG_FEATURE_PRESERVE_HARDLINKS=y @@ -327,26 +337,22 @@ CONFIG_DEALLOCVT=y CONFIG_DUMPKMAP=y CONFIG_KBD_MODE=y -CONFIG_LOADFONT=y +# CONFIG_LOADFONT is not set CONFIG_LOADKMAP=y CONFIG_OPENVT=y CONFIG_RESET=y -CONFIG_RESIZE=y -CONFIG_FEATURE_RESIZE_PRINT=y +# CONFIG_RESIZE is not set +# CONFIG_FEATURE_RESIZE_PRINT is not set CONFIG_SETCONSOLE=y -CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y -CONFIG_SETFONT=y -CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set +# CONFIG_SETFONT is not set +# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set CONFIG_DEFAULT_SETFONT_DIR="" CONFIG_SETKEYCODES=y CONFIG_SETLOGCONS=y -CONFIG_SHOWKEY=y - -# -# Common options for loadfont and setfont -# -CONFIG_FEATURE_LOADFONT_PSF2=y -CONFIG_FEATURE_LOADFONT_RAW=y +# CONFIG_SHOWKEY is not set +# CONFIG_FEATURE_LOADFONT_PSF2 is not set +# CONFIG_FEATURE_LOADFONT_RAW is not set # # Debian Utilities @@ -388,6 +394,9 @@ CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_ASK_TERMINAL=y +CONFIG_FEATURE_VI_UNDO=y +CONFIG_FEATURE_VI_UNDO_QUEUE=y +CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256 CONFIG_FEATURE_ALLOW_EXEC=y # @@ -404,6 +413,7 @@ CONFIG_FEATURE_FIND_NEWER=y CONFIG_FEATURE_FIND_INUM=y CONFIG_FEATURE_FIND_EXEC=y +# CONFIG_FEATURE_FIND_EXEC_PLUS is not set CONFIG_FEATURE_FIND_USER=y CONFIG_FEATURE_FIND_GROUP=y CONFIG_FEATURE_FIND_NOT=y @@ -425,6 +435,7 @@ CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y +CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y # # Init Utilities @@ -461,6 +472,7 @@ CONFIG_ADDUSER=y CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y # CONFIG_FEATURE_CHECK_NAMES is not set +CONFIG_LAST_ID=60000 CONFIG_FIRST_SYSTEM_ID=100 CONFIG_LAST_SYSTEM_ID=999 CONFIG_ADDGROUP=y @@ -472,7 +484,6 @@ CONFIG_GETTY=y CONFIG_LOGIN=y # CONFIG_LOGIN_SESSION_AS_CHILD is not set -# CONFIG_PAM is not set # CONFIG_LOGIN_SCRIPTS is not set CONFIG_FEATURE_NOLOGIN=y CONFIG_FEATURE_SECURETTY=y @@ -490,11 +501,10 @@ # # Linux Ext2 FS Progs # -CONFIG_CHATTR=y +# CONFIG_CHATTR is not set # CONFIG_FSCK is not set -CONFIG_LSATTR=y -CONFIG_FATATTR=y -CONFIG_TUNE2FS=y +# CONFIG_LSATTR is not set +# CONFIG_TUNE2FS is not set # # Linux Module Utilities @@ -531,6 +541,7 @@ # Linux System Utilities # CONFIG_BLOCKDEV=y +CONFIG_FATATTR=y CONFIG_FBVNC=y CONFIG_FSTRIM=y CONFIG_MDEV=y @@ -540,10 +551,10 @@ CONFIG_FEATURE_MDEV_EXEC=y CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y CONFIG_REV=y -CONFIG_ACPID=y -CONFIG_FEATURE_ACPID_COMPAT=y -# CONFIG_BLKID is not set -# CONFIG_FEATURE_BLKID_TYPE is not set +# CONFIG_ACPID is not set +# CONFIG_FEATURE_ACPID_COMPAT is not set +CONFIG_BLKID=y +CONFIG_FEATURE_BLKID_TYPE=y CONFIG_DMESG=y CONFIG_FEATURE_DMESG_PRETTY=y CONFIG_FBSET=y @@ -586,8 +597,8 @@ CONFIG_FEATURE_MKSWAP_UUID=y CONFIG_MORE=y CONFIG_MOUNT=y -CONFIG_FEATURE_MOUNT_FAKE=y -CONFIG_FEATURE_MOUNT_VERBOSE=y +# CONFIG_FEATURE_MOUNT_FAKE is not set +# CONFIG_FEATURE_MOUNT_VERBOSE is not set CONFIG_FEATURE_MOUNT_HELPERS=y CONFIG_FEATURE_MOUNT_LABEL=y CONFIG_FEATURE_MOUNT_NFS=y @@ -603,6 +614,7 @@ CONFIG_SCRIPTREPLAY=y CONFIG_SETARCH=y CONFIG_SWAPONOFF=y +CONFIG_FEATURE_SWAPON_DISCARD=y CONFIG_FEATURE_SWAPON_PRI=y CONFIG_SWITCH_ROOT=y CONFIG_UMOUNT=y @@ -636,7 +648,7 @@ # CONFIG_FEATURE_VOLUMEID_OCFS2 is not set CONFIG_FEATURE_VOLUMEID_REISERFS=y CONFIG_FEATURE_VOLUMEID_ROMFS=y -# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set +CONFIG_FEATURE_VOLUMEID_SQUASHFS=y # CONFIG_FEATURE_VOLUMEID_SYSV is not set CONFIG_FEATURE_VOLUMEID_UDF=y CONFIG_FEATURE_VOLUMEID_XFS=y @@ -645,20 +657,26 @@ # Miscellaneous Utilities # CONFIG_CONSPY=y +CONFIG_CROND=y +# CONFIG_FEATURE_CROND_D is not set +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +CONFIG_FEATURE_CROND_DIR="/var/spool/cron" CONFIG_LESS=y CONFIG_FEATURE_LESS_MAXLINES=9999999 CONFIG_FEATURE_LESS_BRACKETS=y CONFIG_FEATURE_LESS_FLAGS=y CONFIG_FEATURE_LESS_MARKS=y CONFIG_FEATURE_LESS_REGEXP=y -CONFIG_FEATURE_LESS_WINCH=y -CONFIG_FEATURE_LESS_ASK_TERMINAL=y +# CONFIG_FEATURE_LESS_WINCH is not set +# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set # CONFIG_FEATURE_LESS_DASHCMD is not set # CONFIG_FEATURE_LESS_LINENUMS is not set # CONFIG_NANDWRITE is not set # CONFIG_NANDDUMP is not set -CONFIG_RFKILL=y +# CONFIG_RFKILL is not set CONFIG_SETSERIAL=y +CONFIG_TASKSET=y +CONFIG_FEATURE_TASKSET_FANCY=y CONFIG_UBIATTACH=y CONFIG_UBIDETACH=y # CONFIG_UBIMKVOL is not set @@ -672,19 +690,15 @@ CONFIG_BEEP=y CONFIG_FEATURE_BEEP_FREQ=4000 CONFIG_FEATURE_BEEP_LENGTH_MS=30 -CONFIG_CHAT=y -CONFIG_FEATURE_CHAT_NOFAIL=y +# CONFIG_CHAT is not set +# CONFIG_FEATURE_CHAT_NOFAIL is not set # CONFIG_FEATURE_CHAT_TTY_HIFI is not set -CONFIG_FEATURE_CHAT_IMPLICIT_CR=y +# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set # CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set # CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set # CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set # CONFIG_FEATURE_CHAT_CLR_ABORT is not set CONFIG_CHRT=y -CONFIG_CROND=y -# CONFIG_FEATURE_CROND_D is not set -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -CONFIG_FEATURE_CROND_DIR="/var/spool/cron" CONFIG_CRONTAB=y # CONFIG_DC is not set # CONFIG_FEATURE_DC_LIBM is not set @@ -726,12 +740,10 @@ # CONFIG_RX is not set CONFIG_SETSID=y CONFIG_STRINGS=y -CONFIG_TASKSET=y -CONFIG_FEATURE_TASKSET_FANCY=y CONFIG_TIME=y CONFIG_TIMEOUT=y -# CONFIG_TTYSIZE is not set -# CONFIG_VOLNAME is not set +CONFIG_TTYSIZE=y +CONFIG_VOLNAME=y CONFIG_WATCHDOG=y # @@ -763,13 +775,13 @@ CONFIG_FTPD=y CONFIG_FEATURE_FTP_WRITE=y CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y +CONFIG_FEATURE_FTP_AUTHENTICATION=y CONFIG_FTPGET=y CONFIG_FTPPUT=y CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y CONFIG_HOSTNAME=y CONFIG_HTTPD=y CONFIG_FEATURE_HTTPD_RANGES=y -# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set CONFIG_FEATURE_HTTPD_SETUID=y CONFIG_FEATURE_HTTPD_BASIC_AUTH=y CONFIG_FEATURE_HTTPD_AUTH_MD5=y @@ -826,6 +838,7 @@ CONFIG_NSLOOKUP=y CONFIG_NTPD=y CONFIG_FEATURE_NTPD_SERVER=y +CONFIG_FEATURE_NTPD_CONF=y CONFIG_PSCAN=y CONFIG_ROUTE=y # CONFIG_SLATTACH is not set @@ -854,7 +867,7 @@ CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y CONFIG_TUNCTL=y -# CONFIG_FEATURE_TUNCTL_UG is not set +CONFIG_FEATURE_TUNCTL_UG=y CONFIG_UDHCPC6=y CONFIG_UDHCPD=y CONFIG_DHCPRELAY=y @@ -864,6 +877,7 @@ CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases" CONFIG_UDHCPC=y CONFIG_FEATURE_UDHCPC_ARPING=y +CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=0 CONFIG_FEATURE_UDHCP_RFC3397=y @@ -883,9 +897,9 @@ # # Print Utilities # -# CONFIG_LPD is not set +CONFIG_LPD=y CONFIG_LPR=y -# CONFIG_LPQ is not set +CONFIG_LPQ=y # # Mail Utilities @@ -982,9 +996,10 @@ CONFIG_ASH_BUILTIN_ECHO=y CONFIG_ASH_BUILTIN_PRINTF=y CONFIG_ASH_BUILTIN_TEST=y +CONFIG_ASH_HELP=y CONFIG_ASH_CMDCMD=y # CONFIG_ASH_MAIL is not set -# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y CONFIG_ASH_RANDOM_SUPPORT=y # CONFIG_ASH_EXPAND_PRMT is not set # CONFIG_CTTYHACK is not set diff -r 2b78860f3817 -r 881c653f2f8c flex/receipt --- a/flex/receipt Sat Apr 30 15:13:06 2016 +0200 +++ b/flex/receipt Sat Apr 30 18:20:33 2016 +0200 @@ -17,7 +17,11 @@ # Rules to configure and make the package. compile_rules() { - cd $src + case "$ARCH" in + arm*) + export ac_cv_func_malloc_0_nonnull=yes + export ac_cv_func_remalloc_0_nonnull=yes + esac ./configure $CONFIGURE_ARGS && make && make install } diff -r 2b78860f3817 -r 881c653f2f8c harfbuzz-dev/receipt --- a/harfbuzz-dev/receipt Sat Apr 30 15:13:06 2016 +0200 +++ b/harfbuzz-dev/receipt Sat Apr 30 18:20:33 2016 +0200 @@ -8,6 +8,7 @@ LICENSE="GPL2" WEB_SITE="http://www.freedesktop.org/wiki/Software/HarfBuzz" WANTED="harfbuzz" +HOST_ARCH="i486 arm" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() diff -r 2b78860f3817 -r 881c653f2f8c harfbuzz/receipt --- a/harfbuzz/receipt Sat Apr 30 15:13:06 2016 +0200 +++ b/harfbuzz/receipt Sat Apr 30 18:20:33 2016 +0200 @@ -9,6 +9,7 @@ TARBALL="$PACKAGE-$VERSION.tar.bz2" WEB_SITE="http://www.freedesktop.org/wiki/Software/HarfBuzz" WGET_URL="http://www.freedesktop.org/software/harfbuzz/release/$TARBALL" +HOST_ARCH="i486 arm" DEPENDS="glib freetype cairo" BUILD_DEPENDS="glib-dev freetype-dev cairo-dev" diff -r 2b78860f3817 -r 881c653f2f8c ninvaders/receipt --- a/ninvaders/receipt Sat Apr 30 15:13:06 2016 +0200 +++ b/ninvaders/receipt Sat Apr 30 18:20:33 2016 +0200 @@ -13,7 +13,7 @@ HOST_ARCH="i486 arm" DEPENDS="ncurses" -BUILD_DEPENDS="ncurses-dev" +BUILD_DEPENDS="ncurses-dev libtinfo" # Rules to configure and make the package. compile_rules() diff -r 2b78860f3817 -r 881c653f2f8c rrdtool-lite/receipt --- a/rrdtool-lite/receipt Sat Apr 30 15:13:06 2016 +0200 +++ b/rrdtool-lite/receipt Sat Apr 30 18:20:33 2016 +0200 @@ -9,6 +9,7 @@ TARBALL="$SOURCE-$VERSION.tar.gz" WEB_SITE="http://oss.oetiker.ch/$SOURCE" WGET_URL="$WEB_SITE/pub/$TARBALL" +HOST_ARCH="i486 arm" DEPENDS="zlib glib libxml2" BUILD_DEPENDS="pkg-config libxml2-dev glib-dev groff" diff -r 2b78860f3817 -r 881c653f2f8c util-linux-mount-dev/receipt --- a/util-linux-mount-dev/receipt Sat Apr 30 15:13:06 2016 +0200 +++ b/util-linux-mount-dev/receipt Sat Apr 30 18:20:33 2016 +0200 @@ -8,6 +8,7 @@ LICENSE="GPL2" WANTED="util-linux" WEB_SITE="http://kernel.org/~kzak/util-linux/" +HOST_ARCH="i486 arm" DEPENDS="util-linux-blkid-dev util-linux-mount pkg-config" diff -r 2b78860f3817 -r 881c653f2f8c util-linux-mount/receipt --- a/util-linux-mount/receipt Sat Apr 30 15:13:06 2016 +0200 +++ b/util-linux-mount/receipt Sat Apr 30 18:20:33 2016 +0200 @@ -8,6 +8,7 @@ LICENSE="GPL2" WANTED="util-linux" WEB_SITE="http://kernel.org/~kzak/util-linux/" +HOST_ARCH="i486 arm" DEPENDS="glibc-base"