diff options
| -rw-r--r-- | mk/vars.mk | 2 | ||||
| -rwxr-xr-x | package/mxml/Makefile | 4 | ||||
| -rw-r--r-- | package/pcsc-lite/Makefile | 2 | ||||
| -rwxr-xr-x | scripts/find | 14 | ||||
| -rw-r--r-- | target/linux/patches/3.12.6/xargs.patch | 12 |
5 files changed, 16 insertions, 18 deletions
diff --git a/mk/vars.mk b/mk/vars.mk index 617316e29..23cc018f0 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -118,7 +118,7 @@ endif # A nifty macro to make testing gcc features easier (from uClibc project) check_gcc=$(shell \ - if $(CC_FOR_BUILD) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \ + if $(CC_FOR_BUILD) $(1) -Werror -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \ then echo "$(1)"; else echo "$(2)"; fi) CF_FOR_BUILD=$(call check_gcc,-fhonour-copts,) diff --git a/package/mxml/Makefile b/package/mxml/Makefile index afba8d1c1..e79299700 100755 --- a/package/mxml/Makefile +++ b/package/mxml/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 68977789ae64985dddbd1a1a1652642e PKG_DESCR:= lightweight XML library PKG_SECTION:= libs -PKG_URL:= http://www.minixml.org/ -PKG_SITES:= http://ftp.easysw.com/pub/mxml/2.6/ +PKG_URL:= http://www.msweet.org/projects.php?Z3 +PKG_SITES:= http://www.msweet.org/files/project3/ PKG_LIBNAME:= libmxml PKG_OPTS:= dev diff --git a/package/pcsc-lite/Makefile b/package/pcsc-lite/Makefile index bc54b608b..1dc2bc527 100644 --- a/package/pcsc-lite/Makefile +++ b/package/pcsc-lite/Makefile @@ -12,7 +12,7 @@ PKG_SECTION:= crypto PKG_DEPENDS:= libusb libusb-compat libpthread PKG_BUILDDEP:= libusb libusb-compat PKG_URL:= http://pcsclite.alioth.debian.org/ -PKG_SITES:= http://alioth.debian.org/frs/download.php/file/3598/ +PKG_SITES:= http://openadk.org/distfiles/ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/scripts/find b/scripts/find deleted file mode 100755 index 439ec0b3f..000000000 --- a/scripts/find +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -find=$(which find) -os=$(uname) -case $os in - Darwin) - /opt/local/libexec/gnubin/find "$@" - ;; - *) - /usr/bin/find "$@" - ;; -esac diff --git a/target/linux/patches/3.12.6/xargs.patch b/target/linux/patches/3.12.6/xargs.patch new file mode 100644 index 000000000..2c7b3df59 --- /dev/null +++ b/target/linux/patches/3.12.6/xargs.patch @@ -0,0 +1,12 @@ +diff -Nur linux-3.12.6.orig/scripts/Makefile.modpost linux-3.12.6/scripts/Makefile.modpost +--- linux-3.12.6.orig/scripts/Makefile.modpost 2013-12-20 16:51:33.000000000 +0100 ++++ linux-3.12.6/scripts/Makefile.modpost 2014-01-25 14:55:33.000000000 +0100 +@@ -60,7 +60,7 @@ + modulesymfile := $(firstword $(KBUILD_EXTMOD))/Module.symvers + + # Step 1), find all modules listed in $(MODVERDIR)/ +-MODLISTCMD := find $(MODVERDIR) -name '*.mod' | xargs -r grep -h '\.ko$$' | sort -u ++MODLISTCMD := find $(MODVERDIR) -name '*.mod' | xargs grep -h '\.ko$$' | sort -u + __modules := $(shell $(MODLISTCMD)) + modules := $(patsubst %.o,%.ko, $(wildcard $(__modules:.ko=.o))) + |