diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | mk/kernel-vars.mk | 6 | ||||
| -rw-r--r-- | package/cryptsetup/patches/patch-lib_libdevmapper_c | 10 | ||||
| -rw-r--r-- | package/cryptsetup/patches/patch-ltmain_sh | 6 | ||||
| -rw-r--r-- | package/firefox/patches/patch-js_src_configure | 31 | ||||
| -rw-r--r-- | package/libXt/patches/patch-util_Makefile_am | 10 | ||||
| -rw-r--r-- | package/mc/Makefile | 3 | ||||
| -rw-r--r-- | toolchain/gcc/patches/4.7.3/openbsd-lto.patch | 13 |
8 files changed, 74 insertions, 7 deletions
@@ -2,7 +2,7 @@ # material, please see the LICENCE file in the top-level directory. _UNLIMIT= __limit=$$(ulimit -dH 2>/dev/null); \ - test -n "$$__limit" && ulimit -dS $$__limit; + test -n "$$__limit" && ulimit -Sd $$__limit; all: checkreloc .prereq_done @${_UNLIMIT} ${GMAKE_INV} all diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk index e39e76a2d..cd5ef32ea 100644 --- a/mk/kernel-vars.mk +++ b/mk/kernel-vars.mk @@ -5,7 +5,8 @@ KERNEL_MAKE_OPTS:= -C "${LINUX_DIR}" V=1 ifneq ($(ADK_NATIVE),y) KERNEL_MAKE_OPTS+= CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \ CC="$(TARGET_CC)" HOSTCC="${CC_FOR_BUILD}" \ - HOSTCFLAGS='${CFLAGS_FOR_BUILD}' + HOSTCFLAGS='${CFLAGS_FOR_BUILD}' \ + CONFIG_SHELL='${SHELL}' endif ifeq (${ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54G},y) ADK_KCPPFLAGS+= -DBCM47XX_OVERRIDE_FLASHSIZE=0x400000 \ @@ -23,4 +24,5 @@ ADK_KCPPFLAGS+= -DBCM47XX_OVERRIDE_FLASHSIZE=0x800000 \ -DBCM47XX_OVERRIDE_CFESIZE=0x40000 endif -KERNEL_MAKE_ENV+= KCPPFLAGS='${ADK_KCPPFLAGS}' PATH="$$PATH:${TOOLS_DIR}" +KERNEL_MAKE_ENV+= KCPPFLAGS='${ADK_KCPPFLAGS}' \ + PATH="${TOOLS_DIR}:$$PATH" diff --git a/package/cryptsetup/patches/patch-lib_libdevmapper_c b/package/cryptsetup/patches/patch-lib_libdevmapper_c new file mode 100644 index 000000000..731f8bc4d --- /dev/null +++ b/package/cryptsetup/patches/patch-lib_libdevmapper_c @@ -0,0 +1,10 @@ +--- cryptsetup-1.6.3.orig/lib/libdevmapper.c 2013-11-14 08:31:44.000000000 +0100 ++++ cryptsetup-1.6.3/lib/libdevmapper.c 2014-01-08 10:15:32.000000000 +0100 +@@ -29,6 +29,7 @@ + #include <linux/fs.h> + #include <uuid/uuid.h> + #include <sys/utsname.h> ++#include <sys/stat.h> + + #include "internal.h" + diff --git a/package/cryptsetup/patches/patch-ltmain_sh b/package/cryptsetup/patches/patch-ltmain_sh index 18ec3a2e4..b9250d32f 100644 --- a/package/cryptsetup/patches/patch-ltmain_sh +++ b/package/cryptsetup/patches/patch-ltmain_sh @@ -1,6 +1,6 @@ ---- cryptsetup-1.3.1.orig/ltmain.sh 2011-04-18 13:06:09.000000000 +0200 -+++ cryptsetup-1.3.1/ltmain.sh 2011-07-18 13:28:01.000000000 +0200 -@@ -5840,7 +5840,7 @@ func_mode_link () +--- cryptsetup-1.6.3.orig/ltmain.sh 2013-12-08 18:15:38.000000000 +0100 ++++ cryptsetup-1.6.3/ltmain.sh 2014-01-08 01:18:38.000000000 +0100 +@@ -5853,7 +5853,7 @@ func_mode_link () # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ diff --git a/package/firefox/patches/patch-js_src_configure b/package/firefox/patches/patch-js_src_configure new file mode 100644 index 000000000..c37f501e4 --- /dev/null +++ b/package/firefox/patches/patch-js_src_configure @@ -0,0 +1,31 @@ +--- mozilla-release.orig/js/src/configure 2013-12-05 17:08:46.000000000 +0100 ++++ mozilla-release/js/src/configure 2014-01-07 19:30:38.660353287 +0100 +@@ -8652,28 +8652,6 @@ if test -z "$GNU_CC"; then + esac + fi + +-if test "$GNU_CC" -a -n "$DEVELOPER_OPTIONS"; then +- if $CC -Wl,--version 2>&1 | grep -q "GNU ld"; then +- GOLD=$($CC -print-prog-name=ld.gold) +- case "$GOLD" in +- /*) +- ;; +- *) +- GOLD=$(which $GOLD) +- ;; +- esac +- if test -n "$GOLD"; then +- mkdir -p $_objdir/build/unix/gold +- ln -s "$GOLD" $_objdir/build/unix/gold/ld +- if $CC -B $_objdir/build/unix/gold -Wl,--version 2>&1 | grep -q "GNU gold"; then +- LDFLAGS="$LDFLAGS -B $_objdir/build/unix/gold" +- else +- rm -rf $_objdir/build/unix/gold +- fi +- fi +- fi +-fi +- + if test "$GNU_CC"; then + if test -z "$DEVELOPER_OPTIONS"; then + CFLAGS="$CFLAGS -ffunction-sections -fdata-sections" diff --git a/package/libXt/patches/patch-util_Makefile_am b/package/libXt/patches/patch-util_Makefile_am new file mode 100644 index 000000000..a97bc50dd --- /dev/null +++ b/package/libXt/patches/patch-util_Makefile_am @@ -0,0 +1,10 @@ +--- libXt-1.1.3.orig/util/Makefile.am 2012-03-16 06:52:08.000000000 +0100 ++++ libXt-1.1.3/util/Makefile.am 2014-01-07 13:22:11.833722316 +0100 +@@ -10,7 +10,6 @@ EXTRA_DIST = \ + StrDefs.ht \ + string.list + +-AM_CFLAGS = $(XT_CFLAGS) + makestrs_SOURCES = makestrs.c + + diff --git a/package/mc/Makefile b/package/mc/Makefile index 8bfa21955..267553653 100644 --- a/package/mc/Makefile +++ b/package/mc/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mc PKG_VERSION:= 4.7.0.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= f48b2c8dd140aeb36f59d16a662f0779 PKG_DESCR:= norton commander clone PKG_SECTION:= misc @@ -19,6 +19,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MC,mc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TARGET_LDFLAGS+= -ltinfo CONFIGURE_ARGS+= --enable-charset \ --disable-extcharset \ --disable-background \ diff --git a/toolchain/gcc/patches/4.7.3/openbsd-lto.patch b/toolchain/gcc/patches/4.7.3/openbsd-lto.patch new file mode 100644 index 000000000..8a94971b7 --- /dev/null +++ b/toolchain/gcc/patches/4.7.3/openbsd-lto.patch @@ -0,0 +1,13 @@ +diff -Nur gcc-4.7.3.orig/gcc/config.host gcc-4.7.3/gcc/config.host +--- gcc-4.7.3.orig/gcc/config.host Tue Oct 18 08:14:14 2011 ++++ gcc-4.7.3/gcc/config.host Tue Jan 7 04:33:29 2014 +@@ -292,6 +292,9 @@ + out_host_hook_obj=host-solaris.o + host_xmake_file="${host_xmake_file} x-solaris" + ;; ++ *-*-openbsd*) ++ host_lto_plugin_soname=liblto_plugin.so.0.0 ++ ;; + *-*-linux*) + out_host_hook_obj=host-linux.o + host_xmake_file="${host_xmake_file} x-linux" |