diff options
| -rw-r--r-- | mk/buildhlp.mk | 10 | ||||
| -rw-r--r-- | mk/modules.mk | 8 | ||||
| -rw-r--r-- | mk/pkg-bottom.mk | 30 | ||||
| -rw-r--r-- | mk/vars.mk | 13 | ||||
| -rw-r--r-- | package/exmap/Makefile | 1 | ||||
| -rw-r--r-- | package/libsoup/patches/patch-build-aux_config_guess | 447 | ||||
| -rw-r--r-- | package/libsoup/patches/patch-build-aux_config_sub | 183 | ||||
| -rw-r--r-- | package/libsoup/patches/patch-build-aux_depcomp | 682 | ||||
| -rw-r--r-- | package/libsoup/patches/patch-build-aux_missing | 440 | ||||
| -rw-r--r-- | target/config/Config.in.toolchain | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.block | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.lib | 2 |
12 files changed, 22 insertions, 1798 deletions
diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk index f165d86a4..1322e7a85 100644 --- a/mk/buildhlp.mk +++ b/mk/buildhlp.mk @@ -98,16 +98,6 @@ endif env ${AUTOTOOL_ENV} autoreconf -if > /dev/null 2>&1; \ rm -rf ${WRKDIR}.orig$${dir}/autom4te.cache ) $(MAKE_TRACE) @# restore config.sub/config.guess - @for i in $$(find ${WRKDIR} -name config.sub);do \ - if [ -f $$i.bak ];then \ - mv $$i.bak $$i; \ - fi;\ - done - @for i in $$(find ${WRKDIR} -name config.guess);do \ - if [ -f $$i.bak ];then \ - mv $$i.bak $$i; \ - fi;\ - done @WRKDIST=$(call shellescape,${WRKDIST}) \ WRKDIR1=$(call shellescape,${WRKDIR}) \ PATH=$(call shellescape,${HOST_PATH}) \ diff --git a/mk/modules.mk b/mk/modules.mk index 893c5600b..406a3b004 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -757,9 +757,9 @@ $(eval $(call KMOD_template,BLK_DEV_NBD,blk-dev-nbd,\ $(MODULES_DIR)/kernel/drivers/block/nbd \ ,20)) -$(eval $(call KMOD_template,SCSI,scsi,\ - $(MODULES_DIR)/kernel/drivers/scsi/scsi_mod \ -,20)) +#$(eval $(call KMOD_template,SCSI,scsi,\ +# $(MODULES_DIR)/kernel/drivers/scsi/scsi_mod \ +#,20)) $(eval $(call KMOD_template,BLK_DEV_SD,blk-dev-sd,\ $(MODULES_DIR)/kernel/drivers/scsi/sd_mod \ @@ -1765,7 +1765,7 @@ $(eval $(call KMOD_template,PLIP,plip,\ # $(eval $(call KMOD_template,OPROFILE,oprofile,\ - $(MODULES_DIR)/kernel/arch/$(ARCH)/oprofile/oprofile \ + $(MODULES_DIR)/kernel/arch/$(ADK_TARGET_ARCH)/oprofile/oprofile \ ,10)) # diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 26545a70a..f651e7315 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -33,43 +33,28 @@ ifneq (,$(filter autoreconf,${AUTOTOOL_STYLE})) endif mkdir -p ${WRKBUILD} @${MAKE} pre-configure $(MAKE_TRACE) - -ifneq ($(filter manual,${CONFIG_STYLE}),) - env ${CONFIGURE_ENV} ${MAKE} do-configure $(MAKE_TRACE) -else ifneq ($(filter minimal,${CONFIG_STYLE}),) - @$(CMD_TRACE) "configuring... " @cd ${WRKSRC}; \ for i in $$(find . -name config.sub);do \ if [ -f $$i ]; then \ - ${CP} $$i $$i.bak; \ ${CP} ${SCRIPT_DIR}/config.sub $$i; \ fi; \ done; \ for i in $$(find . -name config.guess);do \ if [ -f $$i ]; then \ - ${CP} $$i $$i.bak; \ ${CP} ${SCRIPT_DIR}/config.guess $$i; \ fi; \ done; + +ifneq ($(filter manual,${CONFIG_STYLE}),) + env ${CONFIGURE_ENV} ${MAKE} do-configure $(MAKE_TRACE) +else ifneq ($(filter minimal,${CONFIG_STYLE}),) + @$(CMD_TRACE) "configuring... " cd ${WRKBUILD}; rm -f config.{cache,status}; \ env ${CONFIGURE_ENV} \ ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \ ${CONFIGURE_ARGS} $(MAKE_TRACE) else ifeq ($(strip ${CONFIG_STYLE}),) @$(CMD_TRACE) "configuring... " - @cd ${WRKSRC}; \ - for i in $$(find . -name config.sub);do \ - if [ -f $$i ]; then \ - ${CP} $$i $$i.bak; \ - ${CP} ${SCRIPT_DIR}/config.sub $$i; \ - fi; \ - done; \ - for i in $$(find . -name config.guess);do \ - if [ -f $$i ]; then \ - ${CP} $$i $$i.bak; \ - ${CP} ${SCRIPT_DIR}/config.guess $$i; \ - fi; \ - done; cd ${WRKBUILD}; rm -f config.{cache,status}; \ env ${CONFIGURE_ENV} \ ${BASH} ${WRKSRC}/${CONFIGURE_PROG} ${CONFIGURE_TRIPLE} \ @@ -266,5 +251,8 @@ endif ifneq (,$(filter autoreconf,${AUTOTOOL_STYLE})) DIFF_IGNOREFILES?= configure missing depcomp install-sh INSTALL \ - aclocal.m4 config.h.in Makefile.in */Makefile.in + aclocal.m4 config.h.in Makefile.in */Makefile.in \ + config.sub config.guess */config.sub */config.guess +else +DIFF_IGNOREFILES?= config.sub config.guess */config.sub */config.guess endif diff --git a/mk/vars.mk b/mk/vars.mk index 2074d6c52..46a95c533 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -115,11 +115,6 @@ TARGET_CXXFLAGS+= -fstack-protector-all --param=ssp-buffer-size=4 TARGET_LDFLAGS+= -fstack-protector-all endif -ifneq ($(ADK_TARGET_USE_PIE),) -TARGET_CFLAGS+= -fPIE -TARGET_CXXFLAGS+= -fPIE -endif - ifneq ($(ADK_TARGET_USE_LD_GC),) TARGET_CFLAGS+= -fdata-sections -ffunction-sections TARGET_CXXFLAGS+= -fdata-sections -ffunction-sections @@ -177,12 +172,14 @@ PATCH= PATH=${HOST_PATH} ${BASH} $(SCRIPT_DIR)/patch.sh PATCHP0= PATH=${HOST_PATH} patch -p0 SED:= PATH=${HOST_PATH} sed -i -e LINUX_DIR:= $(BUILD_DIR)/linux -KERNEL_MODULE_FLAGS:= ARCH=${ARCH} \ +KERNEL_MODULE_FLAGS:= ARCH=${ADK_TARGET_ARCH} \ + PREFIX=/usr \ KERNEL_PATH=${LINUX_DIR} \ KERNELDIR=${LINUX_DIR} \ KERNEL_DIR=${LINUX_DIR} \ - PREFIX=/usr CROSS_COMPILE="${TARGET_CROSS}" \ - CFLAGS_MODULE="-fhonour-copts" V=1 + CROSS_COMPILE="${TARGET_CROSS}" \ + CFLAGS_MODULE="-fhonour-copts" \ + V=1 TARGET_CONFIGURE_OPTS= PATH='${TARGET_PATH}' \ AR='$(TARGET_CROSS)ar' \ diff --git a/package/exmap/Makefile b/package/exmap/Makefile index 1ea6177a7..a09b708df 100644 --- a/package/exmap/Makefile +++ b/package/exmap/Makefile @@ -20,6 +20,7 @@ DISTFILES:= ${PKG_NAME}-console-${PKG_VERSION}.tgz WRKDIST= ${WRKDIR}/${PKG_NAME}-console-${PKG_VERSION} include ${TOPDIR}/mk/package.mk +include ${TOPDIR}/mk/kernel-ver.mk $(eval $(call PKG_template,EXMAP,exmap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/libsoup/patches/patch-build-aux_config_guess b/package/libsoup/patches/patch-build-aux_config_guess deleted file mode 100644 index a3a438b4f..000000000 --- a/package/libsoup/patches/patch-build-aux_config_guess +++ /dev/null @@ -1,447 +0,0 @@ ---- libsoup-2.44.2.orig/build-aux/config.guess 2013-10-18 00:01:48.000000000 +0200 -+++ libsoup-2.44.2/build-aux/config.guess 2014-04-14 17:21:42.176934834 +0200 -@@ -1,10 +1,8 @@ - #! /bin/sh - # Attempt to guess a canonical system name. --# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, --# 2011, 2012, 2013 Free Software Foundation, Inc. -+# Copyright 1992-2014 Free Software Foundation, Inc. - --timestamp='2012-12-29' -+timestamp='2014-01-25' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -26,7 +24,7 @@ timestamp='2012-12-29' - # program. This Exception is an additional permission under section 7 - # of the GNU General Public License, version 3 ("GPLv3"). - # --# Originally written by Per Bothner. -+# Originally written by Per Bothner. - # - # You can get the latest version of this script from: - # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD -@@ -52,9 +50,7 @@ version="\ - GNU config.guess ($timestamp) - - Originally written by Per Bothner. --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, --2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, --2012, 2013 Free Software Foundation, Inc. -+Copyright 1992-2014 Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -136,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` | - UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown - UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -+case "${UNAME_SYSTEM}" in -+Linux|GNU|GNU/*) -+ # If the system lacks a compiler, then just pick glibc. -+ # We could probably try harder. -+ LIBC=gnu -+ -+ eval $set_cc_for_build -+ cat <<-EOF > $dummy.c -+ #include <features.h> -+ #if defined(__UCLIBC__) -+ LIBC=uclibc -+ #elif defined(__dietlibc__) -+ LIBC=dietlibc -+ #else -+ LIBC=gnu -+ #endif -+ EOF -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` -+ ;; -+esac -+ - # Note: order is significant - the case branches are not exclusive. - - case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in -@@ -857,21 +874,21 @@ EOF - exit ;; - *:GNU:*:*) - # the GNU system -- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` -+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland -- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu -+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} - exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; - aarch64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - aarch64_be:Linux:*:*) - UNAME_MACHINE=aarch64_be -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -@@ -884,59 +901,54 @@ EOF - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep -q ld.so.1 -- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -+ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit ;; -+ arc:Linux:*:* | arceb:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - arm*:Linux:*:*) - eval $set_cc_for_build - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_EABI__ - then -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - else - if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_PCS_VFP - then -- echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi - else -- echo ${UNAME_MACHINE}-unknown-linux-gnueabihf -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf - fi - fi - exit ;; - avr32*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - cris:Linux:*:*) -- echo ${UNAME_MACHINE}-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-${LIBC} - exit ;; - crisv32:Linux:*:*) -- echo ${UNAME_MACHINE}-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-${LIBC} - exit ;; - frv:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - hexagon:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - i*86:Linux:*:*) -- LIBC=gnu -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #ifdef __dietlibc__ -- LIBC=dietlibc -- #endif --EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` -- echo "${UNAME_MACHINE}-pc-linux-${LIBC}" -+ echo ${UNAME_MACHINE}-pc-linux-${LIBC} - exit ;; - ia64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - m32r*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - m68*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build -@@ -955,54 +967,63 @@ EOF - #endif - EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` -- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } -+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } - ;; -+ or1k:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit ;; - or32:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - padre:Linux:*:*) -- echo sparc-unknown-linux-gnu -+ echo sparc-unknown-linux-${LIBC} - exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) -- echo hppa64-unknown-linux-gnu -+ echo hppa64-unknown-linux-${LIBC} - exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in -- PA7*) echo hppa1.1-unknown-linux-gnu ;; -- PA8*) echo hppa2.0-unknown-linux-gnu ;; -- *) echo hppa-unknown-linux-gnu ;; -+ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; -+ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; -+ *) echo hppa-unknown-linux-${LIBC} ;; - esac - exit ;; - ppc64:Linux:*:*) -- echo powerpc64-unknown-linux-gnu -+ echo powerpc64-unknown-linux-${LIBC} - exit ;; - ppc:Linux:*:*) -- echo powerpc-unknown-linux-gnu -+ echo powerpc-unknown-linux-${LIBC} -+ exit ;; -+ ppc64le:Linux:*:*) -+ echo powerpc64le-unknown-linux-${LIBC} -+ exit ;; -+ ppcle:Linux:*:*) -+ echo powerpcle-unknown-linux-${LIBC} - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) -- echo ${UNAME_MACHINE}-ibm-linux -+ echo ${UNAME_MACHINE}-ibm-linux-${LIBC} - exit ;; - sh64*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - sh*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - tile*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - vax:Linux:*:*) -- echo ${UNAME_MACHINE}-dec-linux-gnu -+ echo ${UNAME_MACHINE}-dec-linux-${LIBC} - exit ;; - x86_64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - xtensa*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. -@@ -1235,19 +1256,31 @@ EOF - exit ;; - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown -- case $UNAME_PROCESSOR in -- i386) -- eval $set_cc_for_build -- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ -- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -- grep IS_64BIT_ARCH >/dev/null -- then -- UNAME_PROCESSOR="x86_64" -- fi -- fi ;; -- unknown) UNAME_PROCESSOR=powerpc ;; -- esac -+ eval $set_cc_for_build -+ if test "$UNAME_PROCESSOR" = unknown ; then -+ UNAME_PROCESSOR=powerpc -+ fi -+ if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ grep IS_64BIT_ARCH >/dev/null -+ then -+ case $UNAME_PROCESSOR in -+ i386) UNAME_PROCESSOR=x86_64 ;; -+ powerpc) UNAME_PROCESSOR=powerpc64 ;; -+ esac -+ fi -+ fi -+ elif test "$UNAME_PROCESSOR" = i386 ; then -+ # Avoid executing cc on OS X 10.9, as it ships with a stub -+ # that puts up a graphical alert prompting to install -+ # developer tools. Any system running Mac OS X 10.7 or -+ # later (Darwin 11 and later) is required to have a 64-bit -+ # processor. This is not true of the ARM version of Darwin -+ # that Apple uses in portable devices. -+ UNAME_PROCESSOR=x86_64 -+ fi - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) -@@ -1338,154 +1371,6 @@ EOF - exit ;; - esac - --eval $set_cc_for_build --cat >$dummy.c <<EOF --#ifdef _SEQUENT_ --# include <sys/types.h> --# include <sys/utsname.h> --#endif --main () --{ --#if defined (sony) --#if defined (MIPSEB) -- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, -- I don't know.... */ -- printf ("mips-sony-bsd\n"); exit (0); --#else --#include <sys/param.h> -- printf ("m68k-sony-newsos%s\n", --#ifdef NEWSOS4 -- "4" --#else -- "" --#endif -- ); exit (0); --#endif --#endif -- --#if defined (__arm) && defined (__acorn) && defined (__unix) -- printf ("arm-acorn-riscix\n"); exit (0); --#endif -- --#if defined (hp300) && !defined (hpux) -- printf ("m68k-hp-bsd\n"); exit (0); --#endif -- --#if defined (NeXT) --#if !defined (__ARCHITECTURE__) --#define __ARCHITECTURE__ "m68k" --#endif -- int version; -- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; -- if (version < 4) -- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); -- else -- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); -- exit (0); --#endif -- --#if defined (MULTIMAX) || defined (n16) --#if defined (UMAXV) -- printf ("ns32k-encore-sysv\n"); exit (0); --#else --#if defined (CMU) -- printf ("ns32k-encore-mach\n"); exit (0); --#else -- printf ("ns32k-encore-bsd\n"); exit (0); --#endif --#endif --#endif -- --#if defined (__386BSD__) -- printf ("i386-pc-bsd\n"); exit (0); --#endif -- --#if defined (sequent) --#if defined (i386) -- printf ("i386-sequent-dynix\n"); exit (0); --#endif --#if defined (ns32000) -- printf ("ns32k-sequent-dynix\n"); exit (0); --#endif --#endif -- --#if defined (_SEQUENT_) -- struct utsname un; -- -- uname(&un); -- -- if (strncmp(un.version, "V2", 2) == 0) { -- printf ("i386-sequent-ptx2\n"); exit (0); -- } -- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ -- printf ("i386-sequent-ptx1\n"); exit (0); -- } -- printf ("i386-sequent-ptx\n"); exit (0); -- --#endif -- --#if defined (vax) --# if !defined (ultrix) --# include <sys/param.h> --# if defined (BSD) --# if BSD == 43 -- printf ("vax-dec-bsd4.3\n"); exit (0); --# else --# if BSD == 199006 -- printf ("vax-dec-bsd4.3reno\n"); exit (0); --# else -- printf ("vax-dec-bsd\n"); exit (0); --# endif --# endif --# else -- printf ("vax-dec-bsd\n"); exit (0); --# endif --# else -- printf ("vax-dec-ultrix\n"); exit (0); --# endif --#endif -- --#if defined (alliant) && defined (i860) -- printf ("i860-alliant-bsd\n"); exit (0); --#endif -- -- exit (1); --} --EOF -- --$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && -- { echo "$SYSTEM_NAME"; exit; } -- --# Apollos put the system type in the environment. -- --test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } -- --# Convex versions that predate uname can use getsysinfo(1) -- --if [ -x /usr/convex/getsysinfo ] --then -- case `getsysinfo -f cpu_type` in -- c1*) -- echo c1-convex-bsd -- exit ;; -- c2*) -- if getsysinfo -f scalar_acc -- then echo c32-convex-bsd -- else echo c2-convex-bsd -- fi -- exit ;; -- c34*) -- echo c34-convex-bsd -- exit ;; -- c38*) -- echo c38-convex-bsd -- exit ;; -- c4*) -- echo c4-convex-bsd -- exit ;; -- esac --fi -- - cat >&2 <<EOF - $0: unable to guess system type - diff --git a/package/libsoup/patches/patch-build-aux_config_sub b/package/libsoup/patches/patch-build-aux_config_sub deleted file mode 100644 index 623cd9420..000000000 --- a/package/libsoup/patches/patch-build-aux_config_sub +++ /dev/null @@ -1,183 +0,0 @@ ---- libsoup-2.44.2.orig/build-aux/config.sub 2013-10-18 00:01:48.000000000 +0200 -+++ libsoup-2.44.2/build-aux/config.sub 2014-04-14 17:21:42.176934834 +0200 -@@ -1,10 +1,8 @@ - #! /bin/sh - # Configuration validation subroutine script. --# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, --# 2011, 2012, 2013 Free Software Foundation, Inc. -+# Copyright 1992-2014 Free Software Foundation, Inc. - --timestamp='2012-12-29' -+timestamp='2014-01-01' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -70,9 +68,7 @@ Report bugs and patches to <config-patch - version="\ - GNU config.sub ($timestamp) - --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, --2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, --2012, 2013 Free Software Foundation, Inc. -+Copyright 1992-2014 Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -256,12 +252,12 @@ case $basic_machine in - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ -- | arc \ -+ | arc | arceb \ - | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ - | avr | avr32 \ - | be32 | be64 \ - | bfin \ -- | c4x | clipper \ -+ | c4x | c8051 | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | epiphany \ - | fido | fr30 | frv \ -@@ -269,6 +265,7 @@ case $basic_machine in - | hexagon \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ -+ | k1om \ - | le32 | le64 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ -@@ -290,16 +287,17 @@ case $basic_machine in - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ -+ | mipsr5900 | mipsr5900el \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | moxie \ - | mt \ - | msp430 \ - | nds32 | nds32le | nds32be \ -- | nios | nios2 \ -+ | nios | nios2 | nios2eb | nios2el \ - | ns16k | ns32k \ - | open8 \ -- | or32 \ -+ | or1k | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pyramid \ -@@ -327,7 +325,7 @@ case $basic_machine in - c6x) - basic_machine=tic6x-unknown - ;; -- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) -+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) - basic_machine=$basic_machine-unknown - os=-none - ;; -@@ -369,13 +367,13 @@ case $basic_machine in - | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ -- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ -+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | be32-* | be64-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* \ -- | clipper-* | craynv-* | cydra-* \ -+ | c8051-* | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ -@@ -384,6 +382,7 @@ case $basic_machine in - | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ -+ | k1om-* \ - | le32-* | le64-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ -@@ -407,12 +406,13 @@ case $basic_machine in - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ -+ | mipsr5900-* | mipsr5900el-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nds32-* | nds32le-* | nds32be-* \ -- | nios-* | nios2-* \ -+ | nios-* | nios2-* | nios2eb-* | nios2el-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | open8-* \ - | orion-* \ -@@ -796,7 +796,7 @@ case $basic_machine in - os=-mingw64 - ;; - mingw32) -- basic_machine=i386-pc -+ basic_machine=i686-pc - os=-mingw32 - ;; - mingw32ce) -@@ -832,7 +832,7 @@ case $basic_machine in - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; - msys) -- basic_machine=i386-pc -+ basic_machine=i686-pc - os=-msys - ;; - mvs) -@@ -1008,7 +1008,7 @@ case $basic_machine in - ;; - ppc64) basic_machine=powerpc64-unknown - ;; -- ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown -@@ -1354,7 +1354,7 @@ case $os in - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ -- | -sym* | -kopensolaris* \ -+ | -sym* | -kopensolaris* | -plan9* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ -@@ -1500,9 +1500,6 @@ case $os in - -aros*) - os=-aros - ;; -- -kaos*) -- os=-kaos -- ;; - -zvmoe) - os=-zvmoe - ;; -@@ -1551,6 +1548,9 @@ case $basic_machine in - c4x-* | tic4x-*) - os=-coff - ;; -+ c8051-*) -+ os=-elf -+ ;; - hexagon-*) - os=-elf - ;; -@@ -1594,6 +1594,9 @@ case $basic_machine in - mips*-*) - os=-elf - ;; -+ or1k-*) -+ os=-elf -+ ;; - or32-*) - os=-coff - ;; diff --git a/package/libsoup/patches/patch-build-aux_depcomp b/package/libsoup/patches/patch-build-aux_depcomp deleted file mode 100644 index 730162b43..000000000 --- a/package/libsoup/patches/patch-build-aux_depcomp +++ /dev/null @@ -1,682 +0,0 @@ ---- libsoup-2.44.2.orig/build-aux/depcomp 2013-10-18 00:01:49.000000000 +0200 -+++ libsoup-2.44.2/build-aux/depcomp 2014-04-14 17:21:42.708937363 +0200 -@@ -1,9 +1,9 @@ - #! /bin/sh - # depcomp - compile a program generating dependencies as side-effects - --scriptversion=2013-05-30.07; # UTC -+scriptversion=2012-03-27.16; # UTC - --# Copyright (C) 1999-2013 Free Software Foundation, Inc. -+# Copyright (C) 1999-2012 Free Software Foundation, Inc. - - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -27,9 +27,9 @@ scriptversion=2013-05-30.07; # UTC - - case $1 in - '') -- echo "$0: No command. Try '$0 --help' for more information." 1>&2 -- exit 1; -- ;; -+ echo "$0: No command. Try '$0 --help' for more information." 1>&2 -+ exit 1; -+ ;; - -h | --h*) - cat <<\EOF - Usage: depcomp [--help] [--version] PROGRAM [ARGS] -@@ -56,65 +56,11 @@ EOF - ;; - esac - --# Get the directory component of the given path, and save it in the --# global variables '$dir'. Note that this directory component will --# be either empty or ending with a '/' character. This is deliberate. --set_dir_from () --{ -- case $1 in -- */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; -- *) dir=;; -- esac --} -- --# Get the suffix-stripped basename of the given path, and save it the --# global variable '$base'. --set_base_from () --{ -- base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` --} -- --# If no dependency file was actually created by the compiler invocation, --# we still have to create a dummy depfile, to avoid errors with the --# Makefile "include basename.Plo" scheme. --make_dummy_depfile () --{ -- echo "#dummy" > "$depfile" --} -- --# Factor out some common post-processing of the generated depfile. --# Requires the auxiliary global variable '$tmpdepfile' to be set. --aix_post_process_depfile () --{ -- # If the compiler actually managed to produce a dependency file, -- # post-process it. -- if test -f "$tmpdepfile"; then -- # Each line is of the form 'foo.o: dependency.h'. -- # Do two passes, one to just change these to -- # $object: dependency.h -- # and one to simply output -- # dependency.h: -- # which is needed to avoid the deleted-header problem. -- { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" -- sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" -- } > "$depfile" -- rm -f "$tmpdepfile" -- else -- make_dummy_depfile -- fi --} -- - # A tabulation character. - tab=' ' - # A newline character. - nl=' - ' --# Character ranges might be problematic outside the C locale. --# These definitions help. --upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ --lower=abcdefghijklmnopqrstuvwxyz --digits=0123456789 --alpha=${upper}${lower} - - if test -z "$depmode" || test -z "$source" || test -z "$object"; then - echo "depcomp: Variables source, object and depmode must be set" 1>&2 -@@ -128,9 +74,6 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" - - rm -f "$tmpdepfile" - --# Avoid interferences from the environment. --gccflag= dashmflag= -- - # Some modes work just like other modes, but use different flags. We - # parameterize here, but still list the modes in the big case below, - # to make depend.m4 easier to write. Note that we *cannot* use a case -@@ -142,32 +85,32 @@ if test "$depmode" = hp; then - fi - - if test "$depmode" = dashXmstdout; then -- # This is just like dashmstdout with a different argument. -- dashmflag=-xM -- depmode=dashmstdout -+ # This is just like dashmstdout with a different argument. -+ dashmflag=-xM -+ depmode=dashmstdout - fi - - cygpath_u="cygpath -u -f -" - if test "$depmode" = msvcmsys; then -- # This is just like msvisualcpp but w/o cygpath translation. -- # Just convert the backslash-escaped backslashes to single forward -- # slashes to satisfy depend.m4 -- cygpath_u='sed s,\\\\,/,g' -- depmode=msvisualcpp -+ # This is just like msvisualcpp but w/o cygpath translation. -+ # Just convert the backslash-escaped backslashes to single forward -+ # slashes to satisfy depend.m4 -+ cygpath_u='sed s,\\\\,/,g' -+ depmode=msvisualcpp - fi - - if test "$depmode" = msvc7msys; then -- # This is just like msvc7 but w/o cygpath translation. -- # Just convert the backslash-escaped backslashes to single forward -- # slashes to satisfy depend.m4 -- cygpath_u='sed s,\\\\,/,g' -- depmode=msvc7 -+ # This is just like msvc7 but w/o cygpath translation. -+ # Just convert the backslash-escaped backslashes to single forward -+ # slashes to satisfy depend.m4 -+ cygpath_u='sed s,\\\\,/,g' -+ depmode=msvc7 - fi - - if test "$depmode" = xlc; then -- # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. -- gccflag=-qmakedep=gcc,-MF -- depmode=gcc -+ # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. -+ gccflag=-qmakedep=gcc,-MF -+ depmode=gcc - fi - - case "$depmode" in -@@ -190,7 +133,8 @@ gcc3) - done - "$@" - stat=$? -- if test $stat -ne 0; then -+ if test $stat -eq 0; then : -+ else - rm -f "$tmpdepfile" - exit $stat - fi -@@ -198,17 +142,13 @@ gcc3) - ;; - - gcc) --## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. --## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. --## (see the conditional assignment to $gccflag above). - ## There are various ways to get dependency output from gcc. Here's - ## why we pick this rather obscure method: - ## - Don't want to use -MD because we'd like the dependencies to end - ## up in a subdir. Having to rename by hand is ugly. - ## (We might end up doing this anyway to support other compilers.) - ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like --## -MM, not -M (despite what the docs say). Also, it might not be --## supported by the other compilers which use the 'gcc' depmode. -+## -MM, not -M (despite what the docs say). - ## - Using -M directly means running the compiler twice (even worse - ## than renaming). - if test -z "$gccflag"; then -@@ -216,14 +156,15 @@ gcc) - fi - "$@" -Wp,"$gccflag$tmpdepfile" - stat=$? -- if test $stat -ne 0; then -+ if test $stat -eq 0; then : -+ else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" -- # The second -e expression handles DOS-style file names with drive -- # letters. -+ alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -+## The second -e expression handles DOS-style file names with drive letters. - sed -e 's/^[^:]*: / /' \ - -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" - ## This next piece of magic avoids the "deleted header file" problem. < |