From 1abce8781525931b856754751e2595e68be74e0f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 19 Feb 2014 15:51:41 +0100
Subject: update eglibc
---
toolchain/eglibc/Makefile.inc | 4 +-
toolchain/eglibc/patches/sparc-libm.patch | 84 -------------------------------
2 files changed, 2 insertions(+), 86 deletions(-)
delete mode 100644 toolchain/eglibc/patches/sparc-libm.patch
diff --git a/toolchain/eglibc/Makefile.inc b/toolchain/eglibc/Makefile.inc
index 5c59d9d2e..abb6879c3 100644
--- a/toolchain/eglibc/Makefile.inc
+++ b/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 \
diff --git a/toolchain/eglibc/patches/sparc-libm.patch b/toolchain/eglibc/patches/sparc-libm.patch
deleted file mode 100644
index fc8b4cc36..000000000
--- a/toolchain/eglibc/patches/sparc-libm.patch
+++ /dev/null
@@ -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
--
cgit v1.2.3
From 4301c4661ede91d6007dca80e14b1e74fb50db15 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 20 Feb 2014 07:30:19 +0100
Subject: use special case, do not put CFLAGS always into LDFLAGS
---
mk/vars.mk | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/mk/vars.mk b/mk/vars.mk
index 540d0e03b..ae290e9a4 100644
--- a/mk/vars.mk
+++ b/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:=
--
cgit v1.2.3
From d1d649ba84b67ae44bb181572965afc9212d2c7a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 20 Feb 2014 07:30:42 +0100
Subject: update to latest uptream, fix uclibc compile
---
package/nfs-utils/Makefile | 11 ++-
package/nfs-utils/patches/patch-tools_Makefile_in | 10 +--
.../patches/patch-tools_locktest_Makefile_in | 47 ------------
.../patches/patch-tools_rpcgen_Makefile_in | 84 ++++++----------------
.../nfs-utils/patches/patch-utils_gssd_Makefile_in | 25 -------
package/nfs-utils/patches/patch-utils_statd_simu_c | 10 +++
6 files changed, 39 insertions(+), 148 deletions(-)
delete mode 100644 package/nfs-utils/patches/patch-tools_locktest_Makefile_in
delete mode 100644 package/nfs-utils/patches/patch-utils_gssd_Makefile_in
create mode 100644 package/nfs-utils/patches/patch-utils_statd_simu_c
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index 31cf3fc29..ac12a8662 100644
--- a/package/nfs-utils/Makefile
+++ b/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
diff --git a/package/nfs-utils/patches/patch-tools_Makefile_in b/package/nfs-utils/patches/patch-tools_Makefile_in
index cea868b4e..e0c95feb8 100644
--- a/package/nfs-utils/patches/patch-tools_Makefile_in
+++ b/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)
diff --git a/package/nfs-utils/patches/patch-tools_locktest_Makefile_in b/package/nfs-utils/patches/patch-tools_locktest_Makefile_in
deleted file mode 100644
index 56d14b860..000000000
--- a/package/nfs-utils/patches/patch-tools_locktest_Makefile_in
+++ /dev/null
@@ -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@
diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in
index 5aa76ea22..d6b448e59 100644
--- a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in
+++ b/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)
diff --git a/package/nfs-utils/patches/patch-utils_gssd_Makefile_in b/package/nfs-utils/patches/patch-utils_gssd_Makefile_in
deleted file mode 100644
index 5499e21a9..000000000
--- a/package/nfs-utils/patches/patch-utils_gssd_Makefile_in
+++ /dev/null
@@ -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
diff --git a/package/nfs-utils/patches/patch-utils_statd_simu_c b/package/nfs-utils/patches/patch-utils_statd_simu_c
new file mode 100644
index 000000000..2ca71cf74
--- /dev/null
+++ b/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"
--
cgit v1.2.3
From d85027a122a5cfee28bc5b718bf354f2934fec91 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 20 Feb 2014 07:51:04 +0100
Subject: use firmware dir for logs
---
mk/build.mk | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/mk/build.mk b/mk/build.mk
index 101a5aa05..08d3d01e1 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -529,7 +529,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##"); \
@@ -537,7 +537,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 \
@@ -545,14 +545,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
@@ -563,14 +563,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 \
@@ -583,14 +583,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 \
@@ -603,7 +603,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 && \
@@ -611,7 +611,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 \
@@ -620,7 +620,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
@@ -634,7 +634,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
--
cgit v1.2.3
From 6c79680171b28dc40d24e0d2fe17117164e97495 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 20 Feb 2014 07:53:01 +0100
Subject: need to use gcc mode thumb, to compile glibc, CFLAGS is not enough
---
mk/build.mk | 3 +++
mk/vars.mk | 2 +-
toolchain/gcc/Makefile | 6 +++++-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/mk/build.mk b/mk/build.mk
index 101a5aa05..68e63783b 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -122,6 +122,9 @@ POSTCONFIG= -@\
if [ "$$(grep ^ADK_KERNEL_VERSION_ .config|md5sum)" != "$$(grep ^ADK_KERNEL_VERSION_ .config.old|md5sum)" ];then \
make kernelclean;\
fi; \
+ if [ "$$(grep ^ADK_LINUX_ARM_WITH_THUMB .config|md5sum)" != "$$(grep ^ADK_LINUX_ARM_WITH_THUMB .config.old|md5sum)" ];then \
+ echo "You should make cleantarget, after changing thumb mode";\
+ fi; \
if [ $$rebuild -eq 1 ];then \
cp .config .config.old;\
fi; \
diff --git a/mk/vars.mk b/mk/vars.mk
index 540d0e03b..8ee67809f 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -87,7 +87,7 @@ TARGET_CFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident $(ADK_TARGET_ABI_CFLAG
TARGET_CFLAGS_LIBC:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident $(TARGET_OPTIMIZATION)
else
TARGET_CFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts $(ADK_TARGET_ABI_CFLAGS) $(MODE_FLAGS)
-TARGET_CFLAGS_LIBC:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts $(TARGET_OPTIMIZATION)
+TARGET_CFLAGS_LIBC:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts $(TARGET_OPTIMIZATION) $(MODE_FLAGS)
endif
TARGET_CXXFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident $(MODE_FLAGS)
TARGET_LDFLAGS:= -L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib \
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 7566d3f20..32710c9bd 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -94,7 +94,11 @@ GCC_CONFOPTS+= --with-arch=armv6 --with-tune=arm1176jzf-s --with-fpu=vf
endif
ifeq ($(ADK_TARGET_SYSTEM_CUBOX_I),y)
-GCC_CONFOPTS+= --with-arch=armv7-a --with-tune=cortex-a9 --with-fpu=neon --with-float=hard
+ifeq ($(ADK_LINUX_ARM_WITH_THUMB),y)
+GCC_CONFOPTS+= --with-arch=armv7-a --with-tune=cortex-a9 --with-fpu=neon --with-float=hard --with-mode=thumb
+else
+GCC_CONFOPTS+= --with-arch=armv7-a --with-tune=cortex-a9 --with-fpu=neon --with-float=hard --with-mode=arm
+endif
endif
ifneq ($(ADK_TARGET_ABI),)
--
cgit v1.2.3
From 079673bd4c63480523590cc2542dd0642f6e5acb Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 20 Feb 2014 15:01:20 +0100
Subject: try to fix autobuild
---
package/libx264/Makefile | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/package/libx264/Makefile b/package/libx264/Makefile
index 0fce6390e..082ce4bcd 100644
--- a/package/libx264/Makefile
+++ b/package/libx264/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libx264
# actually is git checkout from 22.01.2014
PKG_VERSION:= 1.0.1
-PKG_RELEASE:= 3
+PKG_RELEASE:= 4
PKG_MD5SUM:= 6be3e8adeaf6b007bbc04026b6ebd304
PKG_DESCR:= H264 encoding library
PKG_SECTION:= libs
@@ -20,11 +20,16 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBX264,libx264,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+CONFIG_STYLE:= minimal
+
ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y)
CONFIGURE_ARGS+= --disable-asm
endif
CONFIGURE_ARGS+= --disable-cli \
- --enable-asm \
+ --enable-shared \
+ --prefix=/usr \
+ --host=${REAL_GNU_TARGET_NAME} \
+ --sysroot=${STAGING_TARGET_DIR} \
--cross-prefix=$(TARGET_CROSS)
libx264-install:
--
cgit v1.2.3
From 4d16413c4f837eadb8c2940a86a0ceb536089a60 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 21 Feb 2014 08:08:03 +0100
Subject: another try to fix autobuilder, use make depend explicitely
---
package/libx264/Makefile | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/package/libx264/Makefile b/package/libx264/Makefile
index 082ce4bcd..a38bff5f2 100644
--- a/package/libx264/Makefile
+++ b/package/libx264/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libx264
# actually is git checkout from 22.01.2014
PKG_VERSION:= 1.0.1
-PKG_RELEASE:= 4
+PKG_RELEASE:= 5
PKG_MD5SUM:= 6be3e8adeaf6b007bbc04026b6ebd304
PKG_DESCR:= H264 encoding library
PKG_SECTION:= libs
@@ -26,12 +26,16 @@ ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y)
CONFIGURE_ARGS+= --disable-asm
endif
CONFIGURE_ARGS+= --disable-cli \
+ --disable-opencl \
--enable-shared \
--prefix=/usr \
--host=${REAL_GNU_TARGET_NAME} \
--sysroot=${STAGING_TARGET_DIR} \
--cross-prefix=$(TARGET_CROSS)
+post-configure:
+ cd $(WRKBUILD); $(MAKE) depend
+
libx264-install:
$(INSTALL_DIR) $(IDIR_LIBX264)/usr/lib
$(CP) $(WRKINST)/usr/lib/libx264*.so* \
--
cgit v1.2.3
From 18c8ad3b7ef826d6b38dd90869eba1f802ace7e0 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 21 Feb 2014 08:09:26 +0100
Subject: update todo
---
TODO | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/TODO b/TODO
index 7987b70a0..0ac889fbb 100644
--- a/TODO
+++ b/TODO
@@ -1,12 +1,11 @@
-- update glibc/eglibc to 2.19
- update gcc to 4.8.2
-- qemu-system-mips64el memory alloc probs
+- add toolchain archive creation target (optimize for size)
- hash-style=gnu for non-mips and non-musl
-- add toolchain archive creation target
- add arm hard and softfloat toolchains
- add misp64 n32/n64 toolchains
- add support for static toolchains
- add fb full screen logo
+- qemu-system-mips64el memory alloc probs
- port opkg with gpg signing
- restart network (kill wpa_supplicant)
- essid with spaces
--
cgit v1.2.3
From 960adf4c69ff0d9274e20be8581aea6843999a38 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 21 Feb 2014 12:04:24 +0100
Subject: disable snmpnetstat for now, uses old bsd signal handling, which is
disabled in uclibc
---
package/net-snmp/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile
index 04fed494f..3cc7ea0b0 100644
--- a/package/net-snmp/Makefile
+++ b/package/net-snmp/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= net-snmp
PKG_VERSION:= 5.7.2
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 5bddd02e2f82b62daa79f82717737a14
PKG_DESCR:= SNMP Agent
PKG_SECTION:= net/misc
--
cgit v1.2.3
From 7decd50174586b9cdb6955496908b17833a6d559 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 21 Feb 2014 12:23:43 +0100
Subject: oops, forgot the patch
---
package/net-snmp/patches/patch-apps_Makefile_in | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 package/net-snmp/patches/patch-apps_Makefile_in
diff --git a/package/net-snmp/patches/patch-apps_Makefile_in b/package/net-snmp/patches/patch-apps_Makefile_in
new file mode 100644
index 000000000..2c785f445
--- /dev/null
+++ b/package/net-snmp/patches/patch-apps_Makefile_in
@@ -0,0 +1,11 @@
+--- net-snmp-5.7.2.orig/apps/Makefile.in 2012-10-10 00:28:58.000000000 +0200
++++ net-snmp-5.7.2/apps/Makefile.in 2014-02-21 11:50:25.000000000 +0100
+@@ -68,7 +68,7 @@ INSTALLSBINPROGS = snmptrapd$(EXEEXT)
+
+ INSTALLLIBS = libnetsnmptrapd.$(LIB_EXTENSION)$(LIB_VERSION)
+
+-SUBDIRS = snmpnetstat
++#SUBDIRS = snmpnetstat
+
+ FEATUREFILE=../include/net-snmp/features-apps.h
+
--
cgit v1.2.3
From ea1cf86a9968ea920b46cc6ccb926ba7c114163b Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 21 Feb 2014 12:23:45 +0100
Subject: oops, forgot the patch
---
package/net-snmp/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile
index 3cc7ea0b0..cd60a54ae 100644
--- a/package/net-snmp/Makefile
+++ b/package/net-snmp/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= net-snmp
PKG_VERSION:= 5.7.2
-PKG_RELEASE:= 3
+PKG_RELEASE:= 4
PKG_MD5SUM:= 5bddd02e2f82b62daa79f82717737a14
PKG_DESCR:= SNMP Agent
PKG_SECTION:= net/misc
--
cgit v1.2.3
From 237313074fd744fcda6a06665b10f7ae9461ed11 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 21 Feb 2014 14:36:43 +0100
Subject: fix compile for 3.13.3
---
package/cryptodev-linux/Makefile | 2 +-
package/cryptodev-linux/patches/patch-cryptlib_c | 38 ++++++++++++++++++++++++
2 files changed, 39 insertions(+), 1 deletion(-)
create mode 100644 package/cryptodev-linux/patches/patch-cryptlib_c
diff --git a/package/cryptodev-linux/Makefile b/package/cryptodev-linux/Makefile
index d694ac3a2..ecb827b09 100644
--- a/package/cryptodev-linux/Makefile
+++ b/package/cryptodev-linux/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= cryptodev-linux
PKG_VERSION:= 1.6
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= eade38998313c25fd7934719cdf8a2ea
PKG_DESCR:= cryptodev-linux kernel module
PKG_SECTION:= crypto
diff --git a/package/cryptodev-linux/patches/patch-cryptlib_c b/package/cryptodev-linux/patches/patch-cryptlib_c
new file mode 100644
index 000000000..54f1684f5
--- /dev/null
+++ b/package/cryptodev-linux/patches/patch-cryptlib_c
@@ -0,0 +1,38 @@
+--- cryptodev-linux-1.6.orig/cryptlib.c 2013-01-30 17:13:50.000000000 +0100
++++ cryptodev-linux-1.6/cryptlib.c 2014-02-21 14:33:04.000000000 +0100
+@@ -220,7 +220,7 @@ ssize_t cryptodev_cipher_encrypt(struct
+ {
+ int ret;
+
+- INIT_COMPLETION(cdata->async.result->completion);
++ reinit_completion(&cdata->async.result->completion);
+
+ if (cdata->aead == 0) {
+ ablkcipher_request_set_crypt(cdata->async.request,
+@@ -243,7 +243,7 @@ ssize_t cryptodev_cipher_decrypt(struct
+ {
+ int ret;
+
+- INIT_COMPLETION(cdata->async.result->completion);
++ reinit_completion(&cdata->async.result->completion);
+ if (cdata->aead == 0) {
+ ablkcipher_request_set_crypt(cdata->async.request,
+ (struct scatterlist *)src, dst,
+@@ -355,7 +355,7 @@ ssize_t cryptodev_hash_update(struct has
+ {
+ int ret;
+
+- INIT_COMPLETION(hdata->async.result->completion);
++ reinit_completion(&hdata->async.result->completion);
+ ahash_request_set_crypt(hdata->async.request, sg, NULL, len);
+
+ ret = crypto_ahash_update(hdata->async.request);
+@@ -367,7 +367,7 @@ int cryptodev_hash_final(struct hash_dat
+ {
+ int ret;
+
+- INIT_COMPLETION(hdata->async.result->completion);
++ reinit_completion(&hdata->async.result->completion);
+ ahash_request_set_crypt(hdata->async.request, NULL, output, 0);
+
+ ret = crypto_ahash_final(hdata->async.request);
--
cgit v1.2.3
From 664f0acd54623594267a7f73370c0acb145134b9 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 21 Feb 2014 16:22:29 +0100
Subject: update to latest stable version, fix uclibc compile, patch from
http://git.buildroot.net/buildroot/tree/package/coreutils/coreutils-01-spawn-uclibc.patch
---
package/coreutils/patches/patch-Makefile_am | 8 ++++++++
package/coreutils/patches/patch-m4_spawn_h_m4 | 18 ++++++++++++++++++
package/coreutils/patches/patch-man_local_mk | 7 ++++---
3 files changed, 30 insertions(+), 3 deletions(-)
create mode 100644 package/coreutils/patches/patch-Makefile_am
create mode 100644 package/coreutils/patches/patch-m4_spawn_h_m4
diff --git a/package/coreutils/patches/patch-Makefile_am b/package/coreutils/patches/patch-Makefile_am
new file mode 100644
index 000000000..7a8549921
--- /dev/null
+++ b/package/coreutils/patches/patch-Makefile_am
@@ -0,0 +1,8 @@
+--- coreutils-8.22.orig/Makefile.am 2013-12-04 15:48:30.000000000 +0100
++++ coreutils-8.22/Makefile.am 2014-02-21 16:15:49.000000000 +0100
+@@ -187,5 +187,4 @@ AM_CPPFLAGS = -Ilib -I$(top_srcdir)/lib
+ include $(top_srcdir)/lib/local.mk
+ include $(top_srcdir)/src/local.mk
+ include $(top_srcdir)/doc/local.mk
+-include $(top_srcdir)/man/local.mk
+ include $(top_srcdir)/tests/local.mk
diff --git a/package/coreutils/patches/patch-m4_spawn_h_m4 b/package/coreutils/patches/patch-m4_spawn_h_m4
new file mode 100644
index 000000000..5273ee3d3
--- /dev/null
+++ b/package/coreutils/patches/patch-m4_spawn_h_m4
@@ -0,0 +1,18 @@
+--- coreutils-8.22.orig/m4/spawn_h.m4 2013-12-04 15:53:33.000000000 +0100
++++ coreutils-8.22/m4/spawn_h.m4 2014-02-21 15:19:26.000000000 +0100
+@@ -64,7 +64,14 @@ AC_DEFUN([gl_HAVE_POSIX_SPAWN],
+ dnl once only, before all statements that occur in other macros.
+ AC_REQUIRE([gl_SPAWN_H_DEFAULTS])
+
+- AC_CHECK_FUNCS_ONCE([posix_spawn])
++ LIB_POSIX_SPAWN=
++ AC_SUBST([LIB_POSIX_SPAWN])
++ gl_saved_libs=$LIBS
++ AC_SEARCH_LIBS([posix_spawn], [rt],
++ [test "$ac_cv_search_posix_spawn" = "none required" ||
++ LIB_POSIX_SPAWN=$ac_cv_search_posix_spawn])
++ AC_CHECK_FUNCS([posix_spawn])
++ LIBS=$gl_saved_libs
+ if test $ac_cv_func_posix_spawn != yes; then
+ HAVE_POSIX_SPAWN=0
+ fi
diff --git a/package/coreutils/patches/patch-man_local_mk b/package/coreutils/patches/patch-man_local_mk
index b8e739505..5bf9e5cc1 100644
--- a/package/coreutils/patches/patch-man_local_mk
+++ b/package/coreutils/patches/patch-man_local_mk
@@ -1,5 +1,5 @@
---- coreutils-8.21.orig/man/local.mk 2013-02-05 15:01:21.000000000 +0100
-+++ coreutils-8.21/man/local.mk 2013-11-04 20:32:38.000000000 +0100
+--- coreutils-8.22.orig/man/local.mk 2013-12-04 15:48:30.000000000 +0100
++++ coreutils-8.22/man/local.mk 2014-02-21 16:08:08.000000000 +0100
@@ -18,12 +18,7 @@
EXTRA_DIST += man/help2man man/dummy-man
@@ -8,8 +8,9 @@
-if HAVE_PERL
-run_help2man = $(PERL) -- $(srcdir)/man/help2man
-else
- run_help2man = $(SHELL) $(srcdir)/man/dummy-man
+-run_help2man = $(SHELL) $(srcdir)/man/dummy-man
-endif
++run_help2man = echo
man1_MANS = @man1_MANS@
EXTRA_DIST += $(man1_MANS:.1=.x)
--
cgit v1.2.3
From f4c748be56e6b6731537624bb333d001469f4f50 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 21 Feb 2014 16:27:20 +0100
Subject: fix uclibc compile
---
package/coreutils/Makefile | 6 +++---
package/coreutils/patches/patch-lib_fseeko_c | 15 --------------
package/coreutils/patches/patch-m4_fflush_m4 | 31 ----------------------------
package/coreutils/patches/patch-m4_fseeko_m4 | 11 ----------
4 files changed, 3 insertions(+), 60 deletions(-)
delete mode 100644 package/coreutils/patches/patch-lib_fseeko_c
delete mode 100644 package/coreutils/patches/patch-m4_fflush_m4
delete mode 100644 package/coreutils/patches/patch-m4_fseeko_m4
diff --git a/package/coreutils/Makefile b/package/coreutils/Makefile
index 26a501fd8..1d0a9830d 100644
--- a/package/coreutils/Makefile
+++ b/package/coreutils/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= coreutils
-PKG_VERSION:= 8.21
-PKG_RELEASE:= 2
-PKG_MD5SUM:= 065ba41828644eca5dd8163446de5d64
+PKG_VERSION:= 8.22
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 8fb0ae2267aa6e728958adc38f8163a2
PKG_DESCR:= basic file, shell and text manipulation utilities
PKG_SECTION:= base
PKG_BUILDDEP:= gmp autotool
diff --git a/package/coreutils/patches/patch-lib_fseeko_c b/package/coreutils/patches/patch-lib_fseeko_c
deleted file mode 100644
index 9687be6b8..000000000
--- a/package/coreutils/patches/patch-lib_fseeko_c
+++ /dev/null
@@ -1,15 +0,0 @@
---- coreutils-8.21.orig/lib/fseeko.c 2013-01-04 15:07:03.000000000 +0100
-+++ coreutils-8.21/lib/fseeko.c 2013-11-04 20:32:38.000000000 +0100
-@@ -99,6 +99,12 @@ fseeko (FILE *fp, off_t offset, int when
- #elif defined EPLAN9 /* Plan9 */
- if (fp->rp == fp->buf
- && fp->wp == fp->buf)
-+#elif FUNC_FFLUSH_STDIN < 0 && 200809 <= _POSIX_VERSION
-+ /* Cross-compiling to some other system advertising conformance to
-+ POSIX.1-2008 or later. Assume fseeko and fflush work as advertised.
-+ If this assumption is incorrect, please report the bug to
-+ bug-gnulib. */
-+ if (0)
- #else
- #error "Please port gnulib fseeko.c to your platform! Look at the code in fpurge.c, then report this to bug-gnulib."
- #endif
diff --git a/package/coreutils/patches/patch-m4_fflush_m4 b/package/coreutils/patches/patch-m4_fflush_m4
deleted file mode 100644
index 19ad1b49b..000000000
--- a/package/coreutils/patches/patch-m4_fflush_m4
+++ /dev/null
@@ -1,31 +0,0 @@
---- coreutils-8.21.orig/m4/fflush.m4 2013-01-02 13:34:46.000000000 +0100
-+++ coreutils-8.21/m4/fflush.m4 2013-11-04 20:32:38.000000000 +0100
-@@ -14,7 +14,7 @@ AC_DEFUN([gl_FUNC_FFLUSH],
- [
- AC_REQUIRE([gl_STDIO_H_DEFAULTS])
- gl_FUNC_FFLUSH_STDIN
-- if test $gl_cv_func_fflush_stdin = no; then
-+ if test $gl_cv_func_fflush_stdin != yes; then
- REPLACE_FFLUSH=1
- fi
- ])
-@@ -72,10 +72,17 @@ AC_DEFUN([gl_FUNC_FFLUSH_STDIN],
- return 7;
- return 0;
- ]])], [gl_cv_func_fflush_stdin=yes], [gl_cv_func_fflush_stdin=no],
-- [dnl Pessimistically assume fflush is broken.
-- gl_cv_func_fflush_stdin=no])
-+ [gl_cv_func_fflush_stdin=cross])
- rm conftest.txt
- ])
-+ case $gl_cv_func_fflush_stdin in
-+ yes) gl_func_fflush_stdin=1 ;;
-+ no) gl_func_fflush_stdin=0 ;;
-+ *) gl_func_fflush_stdin='(-1)' ;;
-+ esac
-+ AC_DEFINE_UNQUOTED([FUNC_FFLUSH_STDIN], [$gl_func_fflush_stdin],
-+ [Define to 1 if fflush is known to work on stdin as per POSIX.1-2008,
-+ 0 if fflush is known to not work, -1 if unknown.])
- ])
-
- # Prerequisites of lib/fflush.c.
diff --git a/package/coreutils/patches/patch-m4_fseeko_m4 b/package/coreutils/patches/patch-m4_fseeko_m4
deleted file mode 100644
index 1d6da43f8..000000000
--- a/package/coreutils/patches/patch-m4_fseeko_m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- coreutils-8.21.orig/m4/fseeko.m4 2013-01-02 13:34:46.000000000 +0100
-+++ coreutils-8.21/m4/fseeko.m4 2013-11-04 20:32:38.000000000 +0100
-@@ -37,7 +37,7 @@ AC_DEFUN([gl_FUNC_FSEEKO],
- fi
- m4_ifdef([gl_FUNC_FFLUSH_STDIN], [
- gl_FUNC_FFLUSH_STDIN
-- if test $gl_cv_func_fflush_stdin = no; then
-+ if test $gl_cv_func_fflush_stdin != yes; then
- REPLACE_FSEEKO=1
- fi
- ])
--
cgit v1.2.3
From 73040662a805c7d29b89bb85772d5b09c2a6e63f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 21 Feb 2014 17:31:41 +0100
Subject: fix compile with uclibc
---
package/wget/Makefile | 4 ++--
package/wget/patches/patch-m4_spawn_h_m4 | 19 +++++++++++++++++++
2 files changed, 21 insertions(+), 2 deletions(-)
create mode 100644 package/wget/patches/patch-m4_spawn_h_m4
diff --git a/package/wget/Makefile b/package/wget/Makefile
index 30b074096..7abbe7241 100644
--- a/package/wget/Makefile
+++ b/package/wget/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= wget
-PKG_VERSION:= 1.14
+PKG_VERSION:= 1.15
PKG_RELEASE:= 1
-PKG_MD5SUM:= 12edc291dba8127f2e9696e69f36299e
+PKG_MD5SUM:= 506df41295afc6486662cc47470b4618
PKG_DESCR:= retrieving files using HTTP(S) and FTP
PKG_SECTION:= www
PKG_BUILDDEP:= autotool
diff --git a/package/wget/patches/patch-m4_spawn_h_m4 b/package/wget/patches/patch-m4_spawn_h_m4
new file mode 100644
index 000000000..f49598f3b
--- /dev/null
+++ b/package/wget/patches/patch-m4_spawn_h_m4
@@ -0,0 +1,19 @@
+--- wget-1.15.orig/m4/spawn_h.m4 2014-01-19 11:00:21.000000000 +0100
++++ wget-1.15/m4/spawn_h.m4 2014-02-21 17:25:19.000000000 +0100
+@@ -64,7 +64,15 @@ AC_DEFUN([gl_HAVE_POSIX_SPAWN],
+ dnl once only, before all statements that occur in other macros.
+ AC_REQUIRE([gl_SPAWN_H_DEFAULTS])
+
+- AC_CHECK_FUNCS_ONCE([posix_spawn])
++ LIB_POSIX_SPAWN=
++ AC_SUBST([LIB_POSIX_SPAWN])
++ gl_saved_libs=$LIBS
++ AC_SEARCH_LIBS([posix_spawn], [rt],
++ [test "$ac_cv_search_posix_spawn" = "none required" ||
++ LIB_POSIX_SPAWN=$ac_cv_search_posix_spawn])
++ AC_CHECK_FUNCS([posix_spawn])
++ LIBS=$gl_saved_libs
++
+ if test $ac_cv_func_posix_spawn != yes; then
+ HAVE_POSIX_SPAWN=0
+ fi
--
cgit v1.2.3
From e3c43eebd0ac5151a081109e6c7ca1a02ddfc0d2 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 21 Feb 2014 18:21:11 +0100
Subject: add some stuff for joern
---
TODO | 2 ++
1 file changed, 2 insertions(+)
diff --git a/TODO b/TODO
index 0ac889fbb..cdf057a56 100644
--- a/TODO
+++ b/TODO
@@ -14,3 +14,5 @@
- evaluate libguestfs for image creation
- check for gcc and SSP again
- port w3m
+- rutorrent porting
+- lms perl
--
cgit v1.2.3
From 2e359603d90d5ea1b8a6a20aee8c4a142cd8fafd Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 21 Feb 2014 18:21:18 +0100
Subject: enable pthread debugging in uclibc, when gdb/gdbserver is choosen
---
package/libthread_db/Makefile | 2 ++
toolchain/uClibc/Makefile | 21 ++++++++++++---------
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/package/libthread_db/Makefile b/package/libthread_db/Makefile
index 6827a4fdd..46abcd005 100644
--- a/package/libthread_db/Makefile
+++ b/package/libthread_db/Makefile
@@ -20,6 +20,8 @@ PKG_NAME:= libthread-db
PKG_DESCR:= POSIX threads library for gdb/gdbserver
PKG_SECTION:= libs
+PKG_CFLINE_LIBTHREAD_DB:=depends on ADK_PACKAGE_GDB || ADK_PACKAGE_GDBSERVER
+
PKG_ARCH_DEPENDS:= !m68k
NO_DISTFILES:= 1
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index f84575a3c..3c4af868e 100644
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -39,19 +39,22 @@ $(WRKBUILD)/.headers:
sed -e 's^KERNEL_HEADERS.*$$KERNEL_HEADERS=\"${STAGING_TARGET_DIR}/usr/include\"' \
$(TOPDIR)/target/$(ADK_TARGET_ARCH)/$(UCLIBCCFG) >${WRKBUILD}/.config
ifeq ($(ADK_TARGET_ABI_N64),y)
- $(SED) 's/.*\(CONFIG_MIPS_N64_ABI\).*/\1=y/' ${WRKBUILD}/.config
- $(SED) 's/.*\(CONFIG_MIPS_O32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
- $(SED) 's/.*\(CONFIG_MIPS_N32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
+ $(SED) 's/.*\(CONFIG_MIPS_N64_ABI\).*/\1=y/' ${WRKBUILD}/.config
+ $(SED) 's/.*\(CONFIG_MIPS_O32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
+ $(SED) 's/.*\(CONFIG_MIPS_N32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
endif
ifeq ($(ADK_TARGET_ABI_N32),y)
- $(SED) 's/.*\(CONFIG_MIPS_N32_ABI\).*/\1=y/' ${WRKBUILD}/.config
- $(SED) 's/.*\(CONFIG_MIPS_O32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
- $(SED) 's/.*\(CONFIG_MIPS_N64_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
+ $(SED) 's/.*\(CONFIG_MIPS_N32_ABI\).*/\1=y/' ${WRKBUILD}/.config
+ $(SED) 's/.*\(CONFIG_MIPS_O32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
+ $(SED) 's/.*\(CONFIG_MIPS_N64_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
endif
ifeq ($(ADK_TARGET_ABI_O32),y)
- $(SED) 's/.*\(CONFIG_MIPS_O32_ABI\).*/\1=y/' ${WRKBUILD}/.config
- $(SED) 's/.*\(CONFIG_MIPS_N32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
- $(SED) 's/.*\(CONFIG_MIPS_N64_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
+ $(SED) 's/.*\(CONFIG_MIPS_O32_ABI\).*/\1=y/' ${WRKBUILD}/.config
+ $(SED) 's/.*\(CONFIG_MIPS_N32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
+ $(SED) 's/.*\(CONFIG_MIPS_N64_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
+endif
+ifeq ($(ADK_PACKAGE_GDB),y)
+ $(SED) "s/.*\(PTHREADS_DEBUG_SUPPORT\).*/\1=y/" ${WRKBUILD}/.config
endif
ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
$(SED) 's,.*UCLIBC_HAS_SSP,UCLIBC_HAS_SSP=y,' ${WRKBUILD}/.config
--
cgit v1.2.3