Преглед на файлове

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

Waldemar Brodkorb преди 11 години
родител
ревизия
84af1b9633

+ 12 - 12
mk/build.mk

@@ -532,7 +532,7 @@ endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
 bulktoolchain:
 	for libc in uclibc eglibc glibc musl;do \
 		while read arch; do \
-		    mkdir -p $(TOPDIR)/bin/toolchain_$${arch}_$$libc; \
+		    mkdir -p $(TOPDIR)/firmware/toolchain_$${arch}_$$libc; \
 		    ( \
 			echo === building $$arch $$libc toolchain-$$arch on $$(date); \
 			tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##"); \
@@ -540,7 +540,7 @@ bulktoolchain:
 				$(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \
 				$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \
 			rm .config; \
-		    ) 2>&1 | tee $(TOPDIR)/bin/toolchain_$${arch}_$${libc}/build.log; \
+		    ) 2>&1 | tee $(TOPDIR)/firmware/toolchain_$${arch}_$${libc}/build.log; \
 		    if [ -f .exit ];then break;fi \
 		done <${TOPDIR}/target/tarch.lst ;\
 		if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \
@@ -548,14 +548,14 @@ bulktoolchain:
 
 release:
 	for libc in uclibc eglibc glibc musl;do \
-		mkdir -p $(TOPDIR)/bin/$(SYSTEM)_$(ARCH)_$$libc; \
+		mkdir -p $(TOPDIR)/firmware/$(SYSTEM)_$(ARCH)_$$libc; \
 		( \
 			echo === building $$libc on $$(date); \
 			$(GMAKE) prereq && \
 			$(GMAKE) ARCH=$(ARCH) SYSTEM=$(SYSTEM) LIBC=$$libc FS=archive allmodconfig; \
 			$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \
 			rm .config; \
-		) 2>&1 | tee $(TOPDIR)/bin/$(SYSTEM)_$(ARCH)_$$libc/build.log; \
+		) 2>&1 | tee $(TOPDIR)/firmware/$(SYSTEM)_$(ARCH)_$$libc/build.log; \
 		if [ -f .exit ];then echo "Bulk build failed!"; break;fi \
 	done
 	if [ -f .exit ];then rm .exit;exit 1;fi
@@ -566,14 +566,14 @@ bulk:
 	  while read arch; do \
 	      systems=$$(./scripts/getsystems $$arch|grep -v toolchain); \
 	      for system in $$systems;do \
-		mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \
+		mkdir -p $(TOPDIR)/firmware/$${system}_$${arch}_$$libc; \
 	    ( \
 		echo === building $$arch $$system $$libc on $$(date); \
 		$(GMAKE) prereq && \
 		$(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive defconfig; \
 		$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \
 		rm .config; \
-            ) 2>&1 | tee $(TOPDIR)/bin/$${system}_$${arch}_$$libc/build.log; \
+            ) 2>&1 | tee $(TOPDIR)/firmware/$${system}_$${arch}_$$libc/build.log; \
 		if [ -f .exit ]; then break;fi \
 	      done; \
 	    if [ -f .exit ]; then break;fi \
@@ -586,14 +586,14 @@ bulkall:
 	  while read arch; do \
 	      systems=$$(./scripts/getsystems $$arch| grep -v toolchain); \
 	      for system in $$systems;do \
-		mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \
+		mkdir -p $(TOPDIR)/firmware/$${system}_$${arch}_$$libc; \
 	    ( \
 		echo === building $$arch $$system $$libc on $$(date); \
 		$(GMAKE) prereq && \
 		$(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive allconfig; \
 		$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \
 		rm .config; \
-            ) 2>&1 | tee $(TOPDIR)/bin/$${system}_$${arch}_$$libc/build.log; \
+            ) 2>&1 | tee $(TOPDIR)/firmware/$${system}_$${arch}_$$libc/build.log; \
 		if [ -f .exit ]; then break;fi \
 	      done; \
 	      if [ -f .exit ]; then break;fi \
@@ -606,7 +606,7 @@ bulkallmod:
 	  while read arch; do \
 	      systems=$$(./scripts/getsystems $$arch| grep -v toolchain); \
 	      for system in $$systems;do \
-		mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \
+		mkdir -p $(TOPDIR)/firmware/$${system}_$${arch}_$$libc; \
 	    ( \
 		echo === building $$arch $$system $$libc on $$(date); \
 		$(GMAKE) prereq && \
@@ -614,7 +614,7 @@ bulkallmod:
 		$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then echo $$system-$$libc >.exit; exit 1;fi; \
 		$(GMAKE) cleantarget; \
 		rm .config; \
-            ) 2>&1 | tee $(TOPDIR)/bin/$${system}_$${arch}_$$libc/build.log; \
+            ) 2>&1 | tee $(TOPDIR)/firmware/$${system}_$${arch}_$$libc/build.log; \
 	        if [ -f .exit ]; then break;fi \
 	      done; \
 	     if [ -f .exit ]; then break;fi \
@@ -623,7 +623,7 @@ bulkallmod:
 	done
 
 ${TOPDIR}/bin/pkgmaker: $(TOPDIR)/tools/adk/pkgmaker.c $(TOPDIR)/tools/adk/sortfile.c $(TOPDIR)/tools/adk/strmap.c
-	mkdir -p ${TOPDIR}/bin
+	@mkdir -p ${TOPDIR}/bin
 	@$(CC_FOR_BUILD) -g -o $@ tools/adk/pkgmaker.c tools/adk/sortfile.c tools/adk/strmap.c
 
 ${TOPDIR}/bin/pkgrebuild: $(TOPDIR)/tools/adk/pkgrebuild.c $(TOPDIR)/tools/adk/strmap.c
@@ -637,7 +637,7 @@ package/Config.in.auto menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) ${TO
 ${TOPDIR}/bin/depmaker: $(TOPDIR)/tools/adk/depmaker.c
 	$(CC_FOR_BUILD) -g -o $(TOPDIR)/bin/depmaker $(TOPDIR)/tools/adk/depmaker.c
 
-dep: $(BIN_DIR)/depmaker
+dep: $(TOPDIR)/bin/depmaker
 	@echo "Generating dependencies ..."
 	@$(TOPDIR)/bin/depmaker > ${TOPDIR}/package/Depends.mk
 

+ 7 - 1
mk/vars.mk

@@ -93,9 +93,15 @@ TARGET_CXXFLAGS:=	$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident $(MODE_FLAGS)
 TARGET_LDFLAGS:=	-L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib \
 			-Wl,-O1 -Wl,-rpath -Wl,/usr/lib \
 			-Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib \
-			$(ADK_TARGET_ABI_LDFLAGS) $(TARGET_CFLAGS_ARCH)
+			$(ADK_TARGET_ABI_LDFLAGS)
 # security optimization, see http://www.akkadia.org/drepper/dsohowto.pdf
 TARGET_LDFLAGS+=	-Wl,-z,relro,-z,now
+# needed for musl ppc 
+ifeq ($(ADK_LINUX_PPC),y)
+ifeq ($(ADK_TARGET_LIB_MUSL),y)
+TARGET_LDFLAGS+=	-Wl,--secure-plt
+endif
+endif
 
 ifneq ($(ADK_NATIVE),)
 TARGET_CPPFLAGS:=

+ 4 - 7
package/nfs-utils/Makefile

@@ -4,19 +4,16 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		nfs-utils
-PKG_VERSION:=		1.2.8
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		fb48630b7c145fb9d6602a79c6eaab11
+PKG_VERSION:=		1.2.9
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		18869d16db3f49c053f8c68eba3fe2e0
 PKG_DESCR:=		Utilities for NFS kernel server implementation
 PKG_SECTION:=		net/fs
 PKG_DEPENDS:=		keyutils libtirpc rpcbind libdevmapper libpthread
 PKG_FDEPENDS:=		$(PKG_DEPENDS)
 PKG_BUILDDEP:=		keyutils libtirpc lvm
 PKG_URL:=		http://sourceforge.net/projects/nfs
-# as long as there are tar archives of nfs-utils with object files
-# on some sourceforge mirrors
-PKG_SITES:=		http://openadk.org/distfiles/
-#PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=nfs/}
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=nfs/}
 
 PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
 

+ 5 - 5
package/nfs-utils/patches/patch-tools_Makefile_in

@@ -1,7 +1,7 @@
---- nfs-utils-1.2.8.orig/tools/Makefile.in	2013-04-22 18:48:22.000000000 +0200
-+++ nfs-utils-1.2.8/tools/Makefile.in	2013-08-13 10:46:17.000000000 +0200
-@@ -95,7 +95,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE
- 	distdir
+--- nfs-utils-1.2.9.orig/tools/Makefile.in	2013-11-05 21:58:15.000000000 +0100
++++ nfs-utils-1.2.9/tools/Makefile.in	2014-02-19 13:46:55.000000000 +0100
+@@ -156,7 +156,7 @@ am__define_uniq_tagged_files = \
+   done | $(am__uniquify_input)`
  ETAGS = etags
  CTAGS = ctags
 -DIST_SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat rpcgen
@@ -9,7 +9,7 @@
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  am__relativize = \
    dir0=`pwd`; \
-@@ -299,7 +299,7 @@ top_build_prefix = @top_build_prefix@
+@@ -361,7 +361,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  OPTDIRS = $(am__append_1)

+ 0 - 47
package/nfs-utils/patches/patch-tools_locktest_Makefile_in

@@ -1,47 +0,0 @@
---- nfs-utils-1.2.8.orig/tools/locktest/Makefile.in	2013-04-22 18:48:22.000000000 +0200
-+++ nfs-utils-1.2.8/tools/locktest/Makefile.in	2013-08-13 10:46:17.000000000 +0200
-@@ -81,20 +81,20 @@ am_testlk_OBJECTS = testlk-testlk.$(OBJE
- testlk_OBJECTS = $(am_testlk_OBJECTS)
- testlk_LDADD = $(LDADD)
- testlk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(testlk_CFLAGS) $(CFLAGS) \
--	$(testlk_LDFLAGS) $(LDFLAGS) -o $@
-+	--mode=link $(CCLD) $(testlk_CFLAGS) \
-+	$(testlk_LDFLAGS) -o $@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(CPPFLAGS) $(AM_CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+	--mode=link $(CCLD) $(AM_CFLAGS) $(AM_LDFLAGS) \
- 	$(LDFLAGS) -o $@
- SOURCES = $(testlk_SOURCES)
- DIST_SOURCES = $(testlk_SOURCES)
-@@ -120,15 +120,15 @@ AWK = @AWK@
- CC = $(CC_FOR_BUILD)
- CCDEPMODE = @CCDEPMODE@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = 
- CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
- CPP = @CPP@
--CPPFLAGS = @CPPFLAGS@
-+CPPFLAGS = 
- CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
- CXXDEPMODE = @CXXDEPMODE@
--CXXFLAGS = @CXXFLAGS@
-+CXXFLAGS = 
- CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@

+ 20 - 64
package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in

@@ -1,70 +1,26 @@
---- nfs-utils-1.2.8.orig/tools/rpcgen/Makefile.in	2013-04-22 18:48:22.000000000 +0200
-+++ nfs-utils-1.2.8/tools/rpcgen/Makefile.in	2013-08-13 11:04:51.000000000 +0200
-@@ -87,21 +87,21 @@ rpcgen_OBJECTS = $(am_rpcgen_OBJECTS)
- am__DEPENDENCIES_1 =
- rpcgen_DEPENDENCIES = $(am__DEPENDENCIES_1)
- rpcgen_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(rpcgen_CFLAGS) $(CFLAGS) \
+--- nfs-utils-1.2.9.orig/tools/rpcgen/Makefile.in	2013-11-05 21:58:16.000000000 +0100
++++ nfs-utils-1.2.9/tools/rpcgen/Makefile.in	2014-02-19 20:12:32.000000000 +0100
+@@ -119,8 +119,8 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 = 
+ rpcgen_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(rpcgen_CFLAGS) $(CFLAGS) \
 -	$(rpcgen_LDFLAGS) $(LDFLAGS) -o $@
-+	--mode=link $(CCLD) $(rpcgen_CFLAGS) \
-+	$(rpcgen_LDFLAGS) -o $@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
--COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CFLAGS) $(CFLAGS_FOR_BUILD)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) \
-+	-o $@
- SOURCES = $(rpcgen_SOURCES)
- DIST_SOURCES = $(rpcgen_SOURCES)
- am__can_run_installinfo = \
-@@ -117,7 +117,7 @@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
- ALLOCA = @ALLOCA@
- AMTAR = @AMTAR@
- AM_CFLAGS = @AM_CFLAGS@
--AM_CPPFLAGS = @AM_CPPFLAGS@
-+AM_CPPFLAGS = 
- AR = @AR@
- AUTOCONF = @AUTOCONF@
- AUTOHEADER = @AUTOHEADER@
-@@ -126,10 +126,10 @@ AWK = @AWK@
++	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(rpcgen_CFLAGS) $(CFLAGS_FOR_BUILD) \
++	$(rpcgen_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@
+ AM_V_P = $(am__v_P_@AM_V@)
+ am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+ am__v_P_0 = false
+@@ -197,7 +197,7 @@ AWK = @AWK@
  CC = $(CC_FOR_BUILD)
  CCDEPMODE = @CCDEPMODE@
  CC_FOR_BUILD = @CC_FOR_BUILD@
 -CFLAGS = @CFLAGS@
-+CFLAGS =
++CFLAGS = 
  CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
  CPP = @CPP@
--CPPFLAGS = @CPPFLAGS@
-+CPPFLAGS = 
- CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
-@@ -167,10 +167,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P
- K5VERS = @K5VERS@
- KRBCFLAGS = @KRBCFLAGS@
- KRBDIR = @KRBDIR@
--KRBLDFLAGS = @KRBLDFLAGS@
-+KRBLDFLAGS = 
- KRBLIBS = @KRBLIBS@
- LD = @LD@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS =
- LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
- LIBBLKID = @LIBBLKID@
- LIBBSD = @LIBBSD@
-@@ -296,7 +296,6 @@ rpcgen_SOURCES = rpc_clntout.c rpc_cout.
+ CPPFLAGS = @CPPFLAGS@
+@@ -367,7 +367,6 @@ rpcgen_SOURCES = rpc_clntout.c rpc_cout.
  rpcgen_CFLAGS = $(CFLAGS_FOR_BUILD)
  rpcgen_CPPLAGS = $(CPPFLAGS_FOR_BUILD)
  rpcgen_LDFLAGS = $(LDFLAGS_FOR_BUILD)
@@ -72,12 +28,12 @@
  MAINTAINERCLEANFILES = Makefile.in
  EXTRA_DIST = rpcgen.new.1
  all: all-am
-@@ -344,7 +343,7 @@ clean-noinstPROGRAMS:
- 	rm -f $$list
+@@ -416,7 +415,7 @@ clean-noinstPROGRAMS:
+ 
  rpcgen$(EXEEXT): $(rpcgen_OBJECTS) $(rpcgen_DEPENDENCIES) $(EXTRA_rpcgen_DEPENDENCIES) 
  	@rm -f rpcgen$(EXEEXT)
--	$(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD) $(LIBS)
-+	$(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD)
+-	$(AM_V_CCLD)$(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD) $(LIBS)
++	$(AM_V_CCLD)$(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD)
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)

+ 0 - 25
package/nfs-utils/patches/patch-utils_gssd_Makefile_in

@@ -1,25 +0,0 @@
---- nfs-utils-1.2.8.orig/utils/gssd/Makefile.in	2013-04-22 18:48:23.000000000 +0200
-+++ nfs-utils-1.2.8/utils/gssd/Makefile.in	2013-08-13 10:59:43.000000000 +0200
-@@ -390,7 +390,7 @@ gssd_LDADD = ../../support/nfs/libnfs.a
- 		$(RPCSECGSS_LIBS) $(KRBLIBS) $(GSSAPI_LIBS)
- 
- gssd_LDFLAGS = $(KRBLDFLAGS) $(LIBTIRPC)
--gssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
-+gssd_CFLAGS = $(AM_CFLAGS) \
- 	      $(RPCSECGSS_CFLAGS) $(KRBCFLAGS) $(GSSAPI_CFLAGS)
- 
- svcgssd_SOURCES = \
-@@ -410,11 +410,11 @@ svcgssd_LDADD = \
- 	$(KRBLIBS) $(GSSAPI_LIBS) $(LIBTIRPC)
- 
- svcgssd_LDFLAGS = $(KRBLDFLAGS)
--svcgssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
-+svcgssd_CFLAGS = $(AM_CFLAGS) \
- 		 $(RPCSECGSS_CFLAGS) $(KRBCFLAGS) $(GSSAPI_CFLAGS)
- 
- gss_clnt_send_err_SOURCES = gss_clnt_send_err.c
--gss_clnt_send_err_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
-+gss_clnt_send_err_CFLAGS = $(AM_CFLAGS) \
- 		 $(RPCSECGSS_CFLAGS) $(KRBCFLAGS) $(GSSAPI_CFLAGS)
- 
- MAINTAINERCLEANFILES = Makefile.in

+ 10 - 0
package/nfs-utils/patches/patch-utils_statd_simu_c

@@ -0,0 +1,10 @@
+--- nfs-utils-1.2.9.orig/utils/statd/simu.c	2013-11-05 21:41:27.000000000 +0100
++++ nfs-utils-1.2.9/utils/statd/simu.c	2014-02-20 07:25:35.000000000 +0100
+@@ -10,6 +10,7 @@
+ 
+ #include <netdb.h>
+ #include <arpa/inet.h>
++#include <stdlib.h>
+ 
+ #include "sockaddr.h"
+ #include "rpcmisc.h"

+ 2 - 2
toolchain/eglibc/Makefile.inc

@@ -2,9 +2,9 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=		eglibc
-PKG_VERSION:=		2.18
+PKG_VERSION:=		2.19
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		2e4aad1b953daa997debe48fe10862cc
+PKG_MD5SUM:=		b54dfce017ee3132f7b2a8d8f46067cf
 PKG_SITES:=		http://openadk.org/distfiles/
 EGLIBC_CONFOPTS:=	--build=$(GNU_HOST_NAME) \
 			--without-cvs \

+ 0 - 84
toolchain/eglibc/patches/sparc-libm.patch

@@ -1,84 +0,0 @@
-diff -Nur eglibc-2.18.orig/libc/sysdeps/sparc/sparc32/fpu/s_fdimf.S eglibc-2.18/libc/sysdeps/sparc/sparc32/fpu/s_fdimf.S
---- eglibc-2.18.orig/libc/sysdeps/sparc/sparc32/fpu/s_fdimf.S	2013-09-13 10:20:20.000000000 +0200
-+++ eglibc-2.18/libc/sysdeps/sparc/sparc32/fpu/s_fdimf.S	1970-01-01 01:00:00.000000000 +0100
-@@ -1,35 +0,0 @@
--/* Compute positive difference, sparc 32-bit.
--   Copyright (C) 2013 Free Software Foundation, Inc.
--   This file is part of the GNU C Library.
--   Contributed by David S. Miller <davem@davemloft.net>.
--
--   The GNU C Library is free software; you can redistribute it and/or
--   modify it under the terms of the GNU Lesser General Public
--   License as published by the Free Software Foundation; either
--   version 2.1 of the License, or (at your option) any later version.
--
--   The GNU C Library is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--   Lesser General Public License for more details.
--
--   You should have received a copy of the GNU Lesser General Public
--   License along with the GNU C Library; if not, see
--   <http://www.gnu.org/licenses/>.  */
--
--#include <sysdep.h>
--
--ENTRY(__fdimf)
--	st	%o0, [%sp + 72]
--	st	%o1, [%sp + 76]
--	ld	[%sp + 72], %f0
--	ld	[%sp + 76], %f1
--	fcmps	%f0, %f1
--	fbug	1f
--	 st	%g0, [%sp + 72]
--	ld	[%sp + 72], %f0
--	fnegs	%f0, %f1
--1:	retl
--	 fsubs	%f0, %f1, %f0
--END(__fdimf)
--weak_alias (__fdimf, fdimf)
-diff -Nur eglibc-2.18.orig/libc/sysdeps/sparc/sparc32/fpu/s_fdim.S eglibc-2.18/libc/sysdeps/sparc/sparc32/fpu/s_fdim.S
---- eglibc-2.18.orig/libc/sysdeps/sparc/sparc32/fpu/s_fdim.S	2013-09-13 10:20:20.000000000 +0200
-+++ eglibc-2.18/libc/sysdeps/sparc/sparc32/fpu/s_fdim.S	1970-01-01 01:00:00.000000000 +0100
-@@ -1,41 +0,0 @@
--/* Compute positive difference, sparc 32-bit.
--   Copyright (C) 2013 Free Software Foundation, Inc.
--   This file is part of the GNU C Library.
--   Contributed by David S. Miller <davem@davemloft.net>.
--
--   The GNU C Library is free software; you can redistribute it and/or
--   modify it under the terms of the GNU Lesser General Public
--   License as published by the Free Software Foundation; either
--   version 2.1 of the License, or (at your option) any later version.
--
--   The GNU C Library is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--   Lesser General Public License for more details.
--
--   You should have received a copy of the GNU Lesser General Public
--   License along with the GNU C Library; if not, see
--   <http://www.gnu.org/licenses/>.  */
--
--#include <sysdep.h>
--#include <math_ldbl_opt.h>
--
--ENTRY(__fdim)
--	std	%o0, [%sp + 72]
--	std	%o2, [%sp + 80]
--	ldd	[%sp + 72], %f0
--	ldd	[%sp + 80], %f2
--	fcmpd	%f0, %f2
--	st	%g0, [%sp + 72]
--	fbug	1f
--	 st	%g0, [%sp + 76]
--	ldd	[%sp + 72], %f0
--	fnegd	%f0, %f2
--1:	retl
--	 fsubd	%f0, %f2, %f0
--END(__fdim)
--weak_alias (__fdim, fdim)
--
--#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
--compat_symbol (libm, __fdim, fdiml, GLIBC_2_1);
--#endif