From b09c81f022b5c9cb55a3f95b6e794795efc2687d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 19 Feb 2014 07:44:09 +0100 Subject: fix bindir path --- mk/build.mk | 9 ++++----- scripts/create.sh | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/mk/build.mk b/mk/build.mk index c765d4e62..61da89c18 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -638,16 +638,15 @@ bulkallmod: if [ -f .exit ];then echo "Bulk build failed!"; cat .exit;rm .exit; exit 1;fi \ done -${TOPDIR}/bin/tools/pkgmaker: $(TOPDIR)/tools/adk/pkgmaker.c $(TOPDIR)/tools/adk/sortfile.c $(TOPDIR)/tools/adk/strmap.c - @mkdir -p $(TOPDIR)/bin/tools +${BIN_DIR}/pkgmaker: $(TOPDIR)/tools/adk/pkgmaker.c $(TOPDIR)/tools/adk/sortfile.c $(TOPDIR)/tools/adk/strmap.c @$(CC_FOR_BUILD) -g -o $@ tools/adk/pkgmaker.c tools/adk/sortfile.c tools/adk/strmap.c -${TOPDIR}/bin/tools/pkgrebuild: $(TOPDIR)/tools/adk/pkgrebuild.c $(TOPDIR)/tools/adk/strmap.c +${BIN_DIR}/pkgrebuild: $(TOPDIR)/tools/adk/pkgrebuild.c $(TOPDIR)/tools/adk/strmap.c @$(CC_FOR_BUILD) -g -o $@ tools/adk/pkgrebuild.c tools/adk/strmap.c -package/Config.in.auto menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) ${TOPDIR}/bin/tools/pkgmaker ${TOPDIR}/bin/tools/pkgrebuild +package/Config.in.auto menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) ${BIN_DIR}/pkgmaker ${BIN_DIR}/pkgrebuild @echo "Generating menu structure ..." - @$(TOPDIR)/bin/tools/pkgmaker + @$(BIN_DIR)/pkgmaker @:>.menu ${BIN_DIR}/depmaker: $(TOPDIR)/tools/adk/depmaker.c diff --git a/scripts/create.sh b/scripts/create.sh index 058942314..634a87643 100755 --- a/scripts/create.sh +++ b/scripts/create.sh @@ -31,8 +31,8 @@ TOPDIR=$(pwd) me=$0 case :$PATH: in -(*:$TOPDIR/bin/tools:*) ;; -(*) export PATH=$PATH:$TOPDIR/bin/tools ;; +(*:$TOPDIR/bin:*) ;; +(*) export PATH=$PATH:$TOPDIR/bin ;; esac test -n "$KSH_VERSION" || if ! which mksh >/dev/null 2>&1; then @@ -43,7 +43,7 @@ test -n "$KSH_VERSION" || if ! which mksh >/dev/null 2>&1; then gzip -dc dl/"$df" | (cd build_mksh; cpio -mid) cd build_mksh/mksh bash Build.sh -r -c lto || bash Build.sh -r || exit 1 - cp mksh "$TOPDIR"/bin/tools/ + cp mksh "$TOPDIR"/bin cd "$TOPDIR" rm -rf build_mksh fi -- cgit v1.2.3 From a3e0acaddd963e5b303b71039405c762dc130052 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 19 Feb 2014 07:45:09 +0100 Subject: use system libraries to make package smaller --- package/openjdk7/Makefile | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index ffc3a188f..3556f1c01 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -16,8 +16,10 @@ PKG_BUILDDEP+= renderproto-host libXrender-host alsa-lib-host libffi-host gcj-h PKG_BUILDDEP+= classpath-host jamvm-host ant-host cups-host openjdk7-host nss PKG_BUILDDEP+= alsa-lib xproto libjpeg-turbo zlib giflib libpng freetype cups PKG_BUILDDEP+= libX11 libXt libXp libXinerama libXrender libXtst libiconv-tiny +PKG_BUILDDEP+= libpng giflib gtk+ glib fontconfig PKG_DEPENDS:= zlib libstdcxx libffi libpthread libxtst libxi libgcc cups -PKG_DEPENDS+= libfreetype libxrender libx11 libxext libpthread nss +PKG_DEPENDS+= libfreetype libxrender libx11 libxext libpthread nss libjpeg-turbo +PKG_DEPENDS+= libpng giflib libgtk glib fontconfig PKG_URL:= http://openjdk.org/ PKG_SITES:= http://icedtea.classpath.org/download/source/ @@ -67,17 +69,17 @@ CONFIGURE_COMMON:= --disable-docs \ --with-rmic=$(BOOTSTRAPJDK)/bin/rmic \ --with-native2ascii=$(BOOTSTRAPJDK)/bin/native2ascii \ --with-gcj=$(STAGING_HOST_DIR)/usr/bin/gcj \ - --enable-nss \ --without-hotspot-build \ - --disable-system-jpeg \ + --enable-nss \ + --enable-system-zlib \ + --enable-system-jpeg \ + --enable-system-png \ + --enable-system-gif \ + --enable-system-gtk \ + --enable-system-gio \ + --enable-system-fontconfig \ --disable-system-lcms \ - --disable-system-zlib \ - --disable-system-png \ - --disable-system-gif \ - --disable-system-gtk \ - --disable-system-gio \ --disable-system-kerberos \ - --disable-system-fontconfig \ --disable-compile-against-syscalls \ --without-rhino @@ -122,9 +124,9 @@ HOST_CONFIGURE_ARGS+=\ --with-javac=$(STAGING_HOST_DIR)/usr/bin/ecj \ --with-ecj-jar=${STAGING_HOST_DIR}/usr/share/java/ecj.jar \ --without-hotspot-build \ + --disable-system-zlib \ --disable-system-jpeg \ --disable-system-lcms \ - --disable-system-zlib \ --disable-system-png \ --disable-system-gif \ --disable-system-gtk \ -- cgit v1.2.3 From 56a530a29681c54a613fc10bfdfed5ed720c4415 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 19 Feb 2014 07:46:01 +0100 Subject: update todo --- TODO | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TODO b/TODO index 78e669578..7987b70a0 100644 --- a/TODO +++ b/TODO @@ -1,12 +1,12 @@ +- update glibc/eglibc to 2.19 +- update gcc to 4.8.2 - qemu-system-mips64el memory alloc probs - hash-style=gnu for non-mips and non-musl - add toolchain archive creation target -- add hash-style=gnu for non-mips non-musl - add arm hard and softfloat toolchains - add misp64 n32/n64 toolchains - add support for static toolchains - add fb full screen logo -- update gcc to 4.8.2 - port opkg with gpg signing - restart network (kill wpa_supplicant) - essid with spaces -- cgit v1.2.3 From bedc6ddd687a0c8f6b4a14531963998b2e3e51c5 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 19 Feb 2014 08:12:02 +0100 Subject: fixes, there is no vars.mk included at this time of the build process --- mk/build.mk | 34 ++++++++-------------------------- package/base-files/Makefile | 2 +- 2 files changed, 9 insertions(+), 27 deletions(-) diff --git a/mk/build.mk b/mk/build.mk index 61da89c18..101a5aa05 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -344,16 +344,6 @@ endif ifneq (,$(filter CYGWIN%,${OStype})) @echo ADK_HOST_CYGWIN=y > $(TOPDIR)/.defconfig endif -ifeq ($(ADKtype),shuttle-sa76) - @echo ADK_LINUX_NATIVE=y >> $(TOPDIR)/.defconfig - @echo ADK_TARGET_SYSTEM_SHUTTLE_SA76=y >> $(TOPDIR)/.defconfig - @sed -e "s#config ADK_TARGET#config ADK_NATIVE#" target/$(ARCH_FOR_BUILD)/sys-available/$(ADKtype) > \ - target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype) - @echo "choice" > $(TOPDIR)/target/config/Config.in.native - @echo "prompt \"Target system (autodetected)\"" >> $(TOPDIR)/target/config/Config.in.native - @echo "source \"target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native - @echo "endchoice" >> $(TOPDIR)/target/config/Config.in.native -endif ifeq ($(ADKtype),ibm-x40) @echo ADK_LINUX_NATIVE=y >> $(TOPDIR)/.defconfig @echo ADK_TARGET_SYSTEM_IBM_X40=y >> $(TOPDIR)/.defconfig @@ -438,15 +428,6 @@ endif ifneq (,$(filter CYGWIN%,${OStype})) @echo ADK_HOST_CYGWIN=y > $(TOPDIR)/all.config endif -ifeq ($(ADKtype),shuttle-sa76) - @echo ADK_TARGET_SYSTEM_SHUTTLE_SA76=y >> $(TOPDIR)/all.config - @sed -e "s#TARGET#NATIVE#" target/$(ARCH_FOR_BUILD)/sys-available/$(ADKtype) > \ - target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype) - @echo "choice" > $(TOPDIR)/target/config/Config.in.native - @echo "prompt \"Target system (autodetected)\"" >> $(TOPDIR)/target/config/Config.in.native - @echo "source \"target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native - @echo "endchoice" >> $(TOPDIR)/target/config/Config.in.native -endif ifeq ($(ADKtype),ibm-x40) @echo ADK_TARGET_SYSTEM_IBM_X40=y >> $(TOPDIR)/all.config @sed -e "s#TARGET#NATIVE#" target/$(ARCH_FOR_BUILD)/sys-available/$(ADKtype) > \ @@ -638,23 +619,24 @@ bulkallmod: if [ -f .exit ];then echo "Bulk build failed!"; cat .exit;rm .exit; exit 1;fi \ done -${BIN_DIR}/pkgmaker: $(TOPDIR)/tools/adk/pkgmaker.c $(TOPDIR)/tools/adk/sortfile.c $(TOPDIR)/tools/adk/strmap.c +${TOPDIR}/bin/pkgmaker: $(TOPDIR)/tools/adk/pkgmaker.c $(TOPDIR)/tools/adk/sortfile.c $(TOPDIR)/tools/adk/strmap.c + mkdir -p ${TOPDIR}/bin @$(CC_FOR_BUILD) -g -o $@ tools/adk/pkgmaker.c tools/adk/sortfile.c tools/adk/strmap.c -${BIN_DIR}/pkgrebuild: $(TOPDIR)/tools/adk/pkgrebuild.c $(TOPDIR)/tools/adk/strmap.c +${TOPDIR}/bin/pkgrebuild: $(TOPDIR)/tools/adk/pkgrebuild.c $(TOPDIR)/tools/adk/strmap.c @$(CC_FOR_BUILD) -g -o $@ tools/adk/pkgrebuild.c tools/adk/strmap.c -package/Config.in.auto menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) ${BIN_DIR}/pkgmaker ${BIN_DIR}/pkgrebuild +package/Config.in.auto menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) ${TOPDIR}/bin/pkgmaker ${TOPDIR}/bin/pkgrebuild @echo "Generating menu structure ..." - @$(BIN_DIR)/pkgmaker + @$(TOPDIR)/bin/pkgmaker @:>.menu -${BIN_DIR}/depmaker: $(TOPDIR)/tools/adk/depmaker.c - $(CC_FOR_BUILD) -g -o $(BIN_DIR)/depmaker $(TOPDIR)/tools/adk/depmaker.c +${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 @echo "Generating dependencies ..." - @$(BIN_DIR)/depmaker > ${TOPDIR}/package/Depends.mk + @$(TOPDIR)/bin/depmaker > ${TOPDIR}/package/Depends.mk .PHONY: menu dep diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 06b4ce766..0b0f95950 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -82,7 +82,7 @@ endif echo "::1 localhost" >> $(IDIR_BASE_FILES)/etc/hosts echo "127.0.1.1 $(ADK_RUNTIME_HOSTNAME)" >> $(IDIR_BASE_FILES)/etc/hosts test -z $(ADK_RUNTIME_PASSWORD) || \ - $(SED) 's,\*NP\*,'"$$(${TOPDIR}/bin/tools/mkcrypt \ + $(SED) 's,\*NP\*,'"$$(${TOPDIR}/bin/mkcrypt \ ${ADK_RUNTIME_PASSWORD}),g" $(IDIR_BASE_FILES)/etc/shadow git log -1|head -1|sed -e 's#commit ##' \ > $(IDIR_BASE_FILES)/etc/adkversion -- cgit v1.2.3 From 136d1168be3efd776fc6bfa197aa18e5f641dedc Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 19 Feb 2014 08:44:32 +0100 Subject: fix build with latest uclibc --- package/screen/Makefile | 2 +- package/screen/patches/patch-configure | 6 +++--- package/screen/patches/patch-process_c | 15 +++++++++++++++ package/screen/patches/patch-pty_c | 14 ++++++++++++++ package/screen/patches/patch-screen_c | 13 +++++++++++++ package/screen/patches/patch-tty_sh | 13 +++++++++++++ 6 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 package/screen/patches/patch-process_c create mode 100644 package/screen/patches/patch-pty_c create mode 100644 package/screen/patches/patch-screen_c create mode 100644 package/screen/patches/patch-tty_sh diff --git a/package/screen/Makefile b/package/screen/Makefile index e448c3b29..fd8b4e594 100644 --- a/package/screen/Makefile +++ b/package/screen/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= screen PKG_VERSION:= 4.0.3 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 8506fd205028a96c741e4037de6e3c42 PKG_DESCR:= A window manager for the terminal session PKG_SECTION:= misc diff --git a/package/screen/patches/patch-configure b/package/screen/patches/patch-configure index 91f90dc4c..884ebef58 100644 --- a/package/screen/patches/patch-configure +++ b/package/screen/patches/patch-configure @@ -1,5 +1,5 @@ --- screen-4.0.3.orig/configure 2003-12-05 14:46:53.000000000 +0100 -+++ screen-4.0.3/configure 2010-01-23 10:18:22.000000000 +0100 ++++ screen-4.0.3/configure 2014-02-19 08:18:45.000000000 +0100 @@ -124,7 +124,7 @@ done fi if test ! -f "$as_myself"; then @@ -63,7 +63,7 @@ ;; *=*) -@@ -633,7 +633,7 @@ Try \`$0 --help' for more information." +@@ -633,7 +633,7 @@ Try \`$0 --help' for more information." # Reject names that are not valid shell variable names. expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 @@ -490,7 +490,7 @@ --help | --hel | -h ) echo "$ac_cs_usage"; exit 0 ;; --debug | --d* | -d ) -@@ -8516,7 +8480,7 @@ Try \`$0 --help' for more information." +@@ -8516,7 +8480,7 @@ Try \`$0 --help' for more information." Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} diff --git a/package/screen/patches/patch-process_c b/package/screen/patches/patch-process_c new file mode 100644 index 000000000..d41cee752 --- /dev/null +++ b/package/screen/patches/patch-process_c @@ -0,0 +1,15 @@ +--- screen-4.0.3.orig/process.c 2003-09-18 14:53:54.000000000 +0200 ++++ screen-4.0.3/process.c 2014-02-19 08:27:28.000000000 +0100 +@@ -35,12 +35,6 @@ + + + #include "config.h" +- +-/* for solaris 2.1, Unixware (SVR4.2) and possibly others: */ +-#ifdef SVR4 +-# include +-#endif +- + #include "screen.h" + #include "extern.h" + #include "logfile.h" diff --git a/package/screen/patches/patch-pty_c b/package/screen/patches/patch-pty_c new file mode 100644 index 000000000..e62923e01 --- /dev/null +++ b/package/screen/patches/patch-pty_c @@ -0,0 +1,14 @@ +--- screen-4.0.3.orig/pty.c 2003-09-08 16:26:18.000000000 +0200 ++++ screen-4.0.3/pty.c 2014-02-19 08:26:17.000000000 +0100 +@@ -33,11 +33,6 @@ + # include + #endif + +-/* for solaris 2.1, Unixware (SVR4.2) and possibly others */ +-#ifdef HAVE_SVR4_PTYS +-# include +-#endif +- + #if defined(sun) && defined(LOCKPTY) && !defined(TIOCEXCL) + # include + #endif diff --git a/package/screen/patches/patch-screen_c b/package/screen/patches/patch-screen_c new file mode 100644 index 000000000..441dd6255 --- /dev/null +++ b/package/screen/patches/patch-screen_c @@ -0,0 +1,13 @@ +--- screen-4.0.3.orig/screen.c 2003-09-08 16:26:41.000000000 +0200 ++++ screen-4.0.3/screen.c 2014-02-19 08:27:10.000000000 +0100 +@@ -50,10 +50,6 @@ + + #include "config.h" + +-#ifdef SVR4 +-# include +-#endif +- + #if defined(SYSV) && !defined(ISC) + # include + #endif diff --git a/package/screen/patches/patch-tty_sh b/package/screen/patches/patch-tty_sh new file mode 100644 index 000000000..218a3f9e8 --- /dev/null +++ b/package/screen/patches/patch-tty_sh @@ -0,0 +1,13 @@ +--- screen-4.0.3.orig/tty.sh 2003-09-08 16:24:25.000000000 +0200 ++++ screen-4.0.3/tty.sh 2014-02-19 08:40:44.000000000 +0100 +@@ -76,10 +76,6 @@ exit 0 + #endif + + #include "config.h" +-#ifdef SVR4 +-#include /* for I_POP */ +-#endif +- + #include "screen.h" + #include "extern.h" + -- cgit v1.2.3 From ad87a3b0ba6e8b101f54de3fdfbf1b3bc914373d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 19 Feb 2014 12:20:33 +0100 Subject: update glibc --- toolchain/glibc/Makefile.inc | 4 +- toolchain/glibc/patches/sparc-fpu-workaround.patch | 84 ---------------------- 2 files changed, 2 insertions(+), 86 deletions(-) delete mode 100644 toolchain/glibc/patches/sparc-fpu-workaround.patch diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc index 7acb49bb3..4a34c9d18 100644 --- a/toolchain/glibc/Makefile.inc +++ b/toolchain/glibc/Makefile.inc @@ -2,9 +2,9 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= glibc -PKG_VERSION:= 2.18 +PKG_VERSION:= 2.19 PKG_RELEASE:= 1 -PKG_MD5SUM:= b67b22b428ed183148d1344da6d22ea9 +PKG_MD5SUM:= 5374d29864b583622b62bfc6b8429418 PKG_SITES:= ${MASTER_SITE_GNU:=glibc/} GLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \ --host=$(REAL_GNU_TARGET_NAME) \ diff --git a/toolchain/glibc/patches/sparc-fpu-workaround.patch b/toolchain/glibc/patches/sparc-fpu-workaround.patch deleted file mode 100644 index d90f8c525..000000000 --- a/toolchain/glibc/patches/sparc-fpu-workaround.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -Nur glibc-2.18.orig/sysdeps/sparc/sparc32/fpu/s_fdimf.S glibc-2.18/sysdeps/sparc/sparc32/fpu/s_fdimf.S ---- glibc-2.18.orig/sysdeps/sparc/sparc32/fpu/s_fdimf.S 2013-08-11 00:52:55.000000000 +0200 -+++ glibc-2.18/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 . -- -- 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 -- . */ -- --#include -- --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 glibc-2.18.orig/sysdeps/sparc/sparc32/fpu/s_fdim.S glibc-2.18/sysdeps/sparc/sparc32/fpu/s_fdim.S ---- glibc-2.18.orig/sysdeps/sparc/sparc32/fpu/s_fdim.S 2013-08-11 00:52:55.000000000 +0200 -+++ glibc-2.18/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 . -- -- 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 -- . */ -- --#include --#include -- --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 1abce8781525931b856754751e2595e68be74e0f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb 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 . -- -- 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 -- . */ -- --#include -- --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 . -- -- 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 -- . */ -- --#include --#include -- --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