Browse Source

Merge branch 'master' of git+ssh://openadk.org/git/openadk

Waldemar Brodkorb 11 years ago
parent
commit
430b04f915
5 changed files with 16 additions and 18 deletions
  1. 1 1
      mk/vars.mk
  2. 2 2
      package/mxml/Makefile
  3. 1 1
      package/pcsc-lite/Makefile
  4. 0 14
      scripts/find
  5. 12 0
      target/linux/patches/3.12.6/xargs.patch

+ 1 - 1
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,)

+ 2 - 2
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
 

+ 1 - 1
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

+ 0 - 14
scripts/find

@@ -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

+ 12 - 0
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)))
+