diff options
Diffstat (limited to 'package')
31 files changed, 250 insertions, 157 deletions
diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index 416cbb475..71f91f564 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= MesaLib PKG_VERSION:= 9.2.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= df801a975045150790e10e2ccf32193f PKG_DESCR:= MESA 3D graphics library PKG_SECTION:= libs diff --git a/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h b/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h new file mode 100644 index 000000000..021601b7f --- /dev/null +++ b/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h @@ -0,0 +1,11 @@ +--- Mesa-9.2.2.orig/src/gallium/include/pipe/p_config.h 2013-10-18 00:26:23.000000000 +0200 ++++ Mesa-9.2.2/src/gallium/include/pipe/p_config.h 2014-01-06 12:26:04.042469119 +0100 +@@ -126,7 +126,7 @@ + * Endian detection. + */ + +-#ifdef __GLIBC__ ++#ifdef __linux__ + #include <endian.h> + + #if __BYTE_ORDER == __LITTLE_ENDIAN diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 0e53be8e4..413744638 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= asterisk PKG_VERSION:= 1.8.20.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 99204257de80a42c4e287fc93dfe714a PKG_DESCR:= Open Source PBX PKG_SECTION:= phone @@ -102,7 +102,7 @@ endif INSTALL_STYLE:= manual -TARGET_LDFLAGS+= -lm +TARGET_LDFLAGS+= -lm -ltinfo MAKE_ENV= ASTCFLAGS="${TARGET_CPPFLAGS} -DHAVE_STRTOQ" \ ASTLDFLAGS="${TARGET_LDFLAGS}" MAKE_FLAGS+= DESTDIR="$(WRKINST)" \ diff --git a/package/firefox/Makefile b/package/firefox/Makefile index f1764e14f..229b09dea 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= firefox PKG_VERSION:= 26.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 91ce51cc6474f1269484e5327643a59c PKG_DESCR:= graphical webbrowser PKG_SECTION:= x11/apps diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure new file mode 100644 index 000000000..884cea4dd --- /dev/null +++ b/package/firefox/patches/patch-configure @@ -0,0 +1,30 @@ +--- mozilla-release.orig/configure 2013-12-05 17:08:46.000000000 +0100 ++++ mozilla-release/configure 2014-01-06 18:17:43.008094174 +0100 +@@ -9787,27 +9787,6 @@ if test -z "$GNU_CC"; then + esac + fi + +-if test "$GNU_CC" -a -n "$DEVELOPER_OPTIONS"; then +- if $CC -Wl,--version 2>&1 | grep -q "GNU ld"; then +- GOLD=$($CC -print-prog-name=ld.gold) +- case "$GOLD" in +- /*) +- ;; +- *) +- GOLD=$(which $GOLD) +- ;; +- esac +- if test -n "$GOLD"; then +- mkdir -p $_objdir/build/unix/gold +- ln -s "$GOLD" $_objdir/build/unix/gold/ld +- if $CC -B $_objdir/build/unix/gold -Wl,--version 2>&1 | grep -q "GNU gold"; then +- LDFLAGS="$LDFLAGS -B $_objdir/build/unix/gold" +- else +- rm -rf $_objdir/build/unix/gold +- fi +- fi +- fi +-fi + + if test "$GNU_CC"; then + if test -z "$DEVELOPER_OPTIONS"; then diff --git a/package/firefox/patches/patch-gfx_layers_BufferUnrotate_cpp b/package/firefox/patches/patch-gfx_layers_BufferUnrotate_cpp new file mode 100644 index 000000000..0a96d2259 --- /dev/null +++ b/package/firefox/patches/patch-gfx_layers_BufferUnrotate_cpp @@ -0,0 +1,10 @@ +--- mozilla-release.orig/gfx/layers/BufferUnrotate.cpp 2013-12-05 17:07:31.000000000 +0100 ++++ mozilla-release/gfx/layers/BufferUnrotate.cpp 2014-01-06 21:27:39.000000000 +0100 +@@ -8,6 +8,7 @@ + #include <stdint.h> + #include <stdio.h> + #include <stdlib.h> ++#include <string.h> + + void BufferUnrotate(uint8_t* aBuffer, int aByteWidth, int aHeight, + int aByteStride, int aXBoundary, int aYBoundary) diff --git a/package/gdb/Makefile b/package/gdb/Makefile index 6e5acdc32..61d564be7 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -35,10 +35,14 @@ XAKE_FLAGS+= LDFLAGS='${TARGET_LDFLAGS}' # disable honour cflags stuff XAKE_FLAGS+= GCC_HONOUR_COPTS:=s +post-extract: + -mv $(STAGING_DIR)/usr/lib/libiberty.a $(STAGING_DIR)/usr/lib/libiberty.a.bak + gdb-install: ${INSTALL_DIR} ${IDIR_GDB}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/gdb ${IDIR_GDB}/usr/bin/ # shipped libbfd conflicts with system wide one rm -f ${WRKINST}/usr/lib/libbfd* + -mv $(STAGING_DIR)/usr/lib/libiberty.a.bak $(STAGING_DIR)/usr/lib/libiberty.a include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/gmp/Makefile b/package/gmp/Makefile index 2a57980f0..41fd1531f 100644 --- a/package/gmp/Makefile +++ b/package/gmp/Makefile @@ -8,7 +8,7 @@ PKG_NAME:= gmp PKG_DESCR:= GNU multiprecision arithmetic library PKG_SECTION:= libs PKG_URL:= http://gmplib.org/ -PKG_BUILDDEP:= autotool flex-host bison-host +PKG_BUILDDEP:= flex-host bison-host PKG_LIBNAME:= libgmp PKG_OPTS:= dev @@ -16,8 +16,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBGMP,libgmp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -AUTOTOOL_STYLE:= autoreconf - libgmp-install: ${INSTALL_DIR} ${IDIR_LIBGMP}/usr/lib ${CP} ${WRKINST}/usr/lib/libgmp.so* ${IDIR_LIBGMP}/usr/lib diff --git a/package/gmp/patches/patch-Makefile_am b/package/gmp/patches/patch-Makefile_am deleted file mode 100644 index 5180e545a..000000000 --- a/package/gmp/patches/patch-Makefile_am +++ /dev/null @@ -1,11 +0,0 @@ ---- gmp-4.3.2.orig/Makefile.am 2010-01-07 21:09:02.000000000 +0100 -+++ gmp-4.3.2/Makefile.am 2013-10-29 22:08:10.000000000 +0100 -@@ -25,7 +25,7 @@ - # Makefiles in subdirectories, but here we must omit it so automake gives - # the actual ansi2knr build rule, not "cd $(top_builddir) && make ansi2knr". - # --AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies ansi2knr -+AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies - - - # Libtool -version-info for libgmp.la and libmp.la. See "Versioning" in the diff --git a/package/gmp/patches/patch-configure_in b/package/gmp/patches/patch-configure_in deleted file mode 100644 index bcf07870f..000000000 --- a/package/gmp/patches/patch-configure_in +++ /dev/null @@ -1,21 +0,0 @@ ---- gmp-4.3.2.orig/configure.in 2010-01-07 21:09:02.000000000 +0100 -+++ gmp-4.3.2/configure.in 2013-10-29 22:13:19.000000000 +0100 -@@ -65,7 +65,7 @@ dnl - dnl Note that there's a copy of these options in the top-level Makefile.am, - dnl so update there too if changing anything. - dnl --AM_INIT_AUTOMAKE([1.8 gnu no-dependencies $(top_builddir)/ansi2knr]) -+AM_INIT_AUTOMAKE([1.8 gnu no-dependencies]) - AM_CONFIG_HEADER(config.h:config.in) - AM_MAINTAINER_MODE - -@@ -2072,9 +2072,6 @@ fi - echo " MPN_PATH=\"$path\"" - - --# Automake ansi2knr support. --AM_C_PROTOTYPES -- - CL_AS_NOEXECSTACK - - GMP_PROG_AR diff --git a/package/gmp/patches/patch-longlong_h b/package/gmp/patches/patch-longlong_h new file mode 100644 index 000000000..dd42a0ebc --- /dev/null +++ b/package/gmp/patches/patch-longlong_h @@ -0,0 +1,11 @@ +--- gmp-5.1.3.orig/longlong.h 2013-09-30 12:18:28.000000000 +0200 ++++ gmp-5.1.3/longlong.h 2014-01-06 16:07:47.886035812 +0100 +@@ -1230,7 +1230,7 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype + #define UDIV_TIME 100 + #endif /* __mips */ + +-#if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64 ++#if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64 && defined (_LP64) + #if __GMP_GNUC_PREREQ (4,4) + #define umul_ppmm(w1, w0, u, v) \ + do { \ diff --git a/package/libXt/patches/patch-util_Makefile_in b/package/libXt/patches/patch-util_Makefile_in deleted file mode 100644 index b20260a8e..000000000 --- a/package/libXt/patches/patch-util_Makefile_in +++ /dev/null @@ -1,20 +0,0 @@ ---- libXt-1.1.3.orig/util/Makefile.in 2012-03-16 06:52:18.000000000 +0100 -+++ libXt-1.1.3/util/Makefile.in 2013-04-30 13:38:32.000000000 +0200 -@@ -106,7 +106,7 @@ CFLAGS = @CFLAGS_FOR_BUILD@ - CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ - CHANGELOG_CMD = @CHANGELOG_CMD@ - CPP = @CPP@ --CPPFLAGS = @CPPFLAGS@ -+CPPFLAGS = @CPPFLAGS_FOR_BUILD@ - CWARNFLAGS = @CWARNFLAGS@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ -@@ -246,7 +246,7 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - EXTRA_DIST = Shell.ht StrDefs.ct StrDefs.ht string.list $(appman_PRE) --AM_CFLAGS = $(XT_CFLAGS) -+AM_CFLAGS = - makestrs_SOURCES = makestrs.c - - # Man page diff --git a/package/libnids/Makefile b/package/libnids/Makefile index d93bed8e9..66a83f79f 100644 --- a/package/libnids/Makefile +++ b/package/libnids/Makefile @@ -5,12 +5,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libnids PKG_VERSION:= 1.24 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 72d37c79c85615ffe158aa524d649610 PKG_DESCR:= Network Intrusion Detection System library PKG_SECTION:= libs PKG_DEPENDS:= libnet libpcap glib -PKG_BUILDDEP:= libnet libpcap glib +PKG_BUILDDEP:= autotool libnet libpcap glib PKG_URL:= http://libnids.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libnids/} PKG_OPTS:= dev @@ -21,10 +21,10 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBNIDS,libnids,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -TARGET_CPPFLAGS+= -D_GNU_SOURCE TARGET_LDFLAGS+= -lpthread CONFIGURE_ENV+= ac_cv_lib_nsl_gethostbyname=no CONFIGURE_ARGS+= --with-libpcap=${STAGING_TARGET_DIR}/usr +AUTOTOOL_STYLE:= autoreconf XAKE_FLAGS+= install_prefix="${WRKINST}" libnids-install: diff --git a/package/libnids/patches/patch-configure b/package/libnids/patches/patch-configure deleted file mode 100644 index 01a4d76fd..000000000 --- a/package/libnids/patches/patch-configure +++ /dev/null @@ -1,17 +0,0 @@ ---- libnids-1.24.orig/configure 2006-05-01 19:14:51.000000000 +0200 -+++ libnids-1.24/configure 2011-05-16 16:03:49.766610900 +0200 -@@ -3919,11 +3919,11 @@ echo "${ECHO_T}no" >&6 - *) - echo "$as_me:$LINENO: result: $withval" >&5 - echo "${ECHO_T}$withval" >&6 -- if test -f $withval/pcap.h -a -f $withval/libpcap.a; then -+ if test -f $withval/include/pcap.h; then - owd=`pwd` - if cd $withval; then withval=`pwd`; cd $owd; fi -- PCAP_CFLAGS="-I$withval -I$withval/bpf" -- PCAPLIB="-L$withval -lpcap" -+ PCAP_CFLAGS="-I$withval/include -I$withval/include/bpf" -+ PCAPLIB="-L$withval/lib -lpcap" - else - { { echo "$as_me:$LINENO: error: pcap.h or libpcap.a not found in $withval" >&5 - echo "$as_me: error: pcap.h or libpcap.a not found in $withval" >&2;} diff --git a/package/libnids/patches/patch-configure_in b/package/libnids/patches/patch-configure_in new file mode 100644 index 000000000..2554d2f32 --- /dev/null +++ b/package/libnids/patches/patch-configure_in @@ -0,0 +1,20 @@ +--- libnids-1.24.orig/configure.in 2006-05-01 19:14:51.000000000 +0200 ++++ libnids-1.24/configure.in 2014-01-06 16:25:57.765584034 +0100 +@@ -65,13 +65,13 @@ AC_ARG_WITH(libpcap, + ;; + *) + AC_MSG_RESULT($withval) +- if test -f $withval/pcap.h -a -f $withval/libpcap.a; then ++ if test -f $withval/include/pcap.h; then + owd=`pwd` + if cd $withval; then withval=`pwd`; cd $owd; fi +- PCAP_CFLAGS="-I$withval -I$withval/bpf" +- PCAPLIB="-L$withval -lpcap" ++ PCAP_CFLAGS="-I$withval/include -I$withval/include/bpf" ++ PCAPLIB="-L$withval/lib -lpcap" + else +- AC_ERROR(pcap.h or libpcap.a not found in $withval) ++ AC_ERROR(pcap.h not found in $withval) + fi + ;; + esac ], diff --git a/package/libvpx/Makefile b/package/libvpx/Makefile index 8e59ff3e4..97dec8bcb 100644 --- a/package/libvpx/Makefile +++ b/package/libvpx/Makefile @@ -70,7 +70,7 @@ ifeq ($(ADK_TARGET_SYSTEM_FON_FON2100),y) CONFIGURE_ARGS+= --target=mips32-linux-gcc endif ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) -CONFIGURE_ARGS+= --target=mips32-linux-gcc +CONFIGURE_ARGS+= --target=mips64-linux-gcc endif ifeq ($(ADK_TARGET_SYSTEM_BROADCOM_BCM47XX),y) CONFIGURE_ARGS+= --target=mips32-linux-gcc diff --git a/package/libvpx/patches/patch-build_make_Makefile b/package/libvpx/patches/patch-build_make_Makefile index e1a6d5fa8..8a7c04d2d 100644 --- a/package/libvpx/patches/patch-build_make_Makefile +++ b/package/libvpx/patches/patch-build_make_Makefile @@ -1,6 +1,6 @@ ---- libvpx-v0.9.7-p1.orig/build/make/Makefile 2011-08-15 23:02:45.000000000 +0200 -+++ libvpx-v0.9.7-p1/build/make/Makefile 2011-09-17 18:03:25.467990966 +0200 -@@ -193,8 +193,8 @@ endif +--- libvpx-v1.2.0.orig/build/make/Makefile 2013-10-14 20:16:36.000000000 +0200 ++++ libvpx-v1.2.0/build/make/Makefile 2014-01-06 11:06:33.806841128 +0100 +@@ -210,8 +210,8 @@ endif define linker_template $(1): $(filter-out -%,$(2)) $(1): @@ -9,9 +9,9 @@ + $(if $(quiet),@echo " [CC] $$@") + $(qexec)$$(CC) $$(strip $$(INTERNAL_LDFLAGS) $$(LDFLAGS) -o $$@ $(2) $(3) $$(extralibs)) endef - # make-3.80 has a bug with expanding large input strings to the eval function, - # which was triggered in some cases by the following component of -@@ -227,8 +227,8 @@ define so_template + define linkerxx_template + $(1): $(filter-out -%,$(2)) +@@ -250,8 +250,8 @@ define so_template # # This needs further abstraction for dealing with non-GNU linkers. $(1): diff --git a/package/libvpx/patches/patch-build_make_configure_sh b/package/libvpx/patches/patch-build_make_configure_sh index 829ede0c8..c080a4c05 100644 --- a/package/libvpx/patches/patch-build_make_configure_sh +++ b/package/libvpx/patches/patch-build_make_configure_sh @@ -1,5 +1,5 @@ ---- libvpx-v1.2.0.orig/build/make/configure.sh 2013-09-04 20:49:22.000000000 +0200 -+++ libvpx-v1.2.0/build/make/configure.sh 2013-10-14 20:15:20.000000000 +0200 +--- libvpx-v1.2.0.orig/build/make/configure.sh 2013-10-14 20:16:36.000000000 +0200 ++++ libvpx-v1.2.0/build/make/configure.sh 2014-01-06 11:27:27.889747488 +0100 @@ -305,7 +305,7 @@ check_cpp() { check_ld() { log check_ld "$@" @@ -9,3 +9,32 @@ } check_header(){ +@@ -952,7 +952,7 @@ process_common_toolchain() { + + esac + ;; +- mips*) ++ mips32*) + link_with_cc=gcc + setup_gnu_toolchain + tune_cflags="-mtune=" +@@ -964,6 +964,19 @@ process_common_toolchain() { + check_add_asflags -march=${tgt_isa} + check_add_asflags -KPIC + ;; ++ mips64*) ++ link_with_cc=gcc ++ setup_gnu_toolchain ++ tune_cflags="-mtune=" ++ if enabled dspr2; then ++ check_add_cflags -mips32r2 -mdspr2 ++ disable fast_unaligned ++ fi ++ # use cflags from adk ++ #check_add_cflags -march=${tgt_isa} ++ #check_add_asflags -march=${tgt_isa} ++ check_add_asflags -KPIC ++ ;; + ppc*) + enable ppc + bits=${tgt_isa##ppc} diff --git a/package/libvpx/patches/patch-build_make_rtcd_sh b/package/libvpx/patches/patch-build_make_rtcd_sh new file mode 100644 index 000000000..75ddffe61 --- /dev/null +++ b/package/libvpx/patches/patch-build_make_rtcd_sh @@ -0,0 +1,18 @@ +--- libvpx-v1.2.0.orig/build/make/rtcd.sh 2013-10-14 20:16:36.000000000 +0200 ++++ libvpx-v1.2.0/build/make/rtcd.sh 2014-01-06 11:24:01.457213627 +0100 +@@ -338,6 +338,15 @@ case $arch in + fi + mips + ;; ++ mips64) ++ ALL_ARCHS=$(filter mips64) ++ dspr2=$([ -f "$config_file" ] && eval echo $(grep HAVE_DSPR2 "$config_file")) ++ HAVE_DSPR2="${dspr2#*=}" ++ if [ "$HAVE_DSPR2" = "yes" ]; then ++ ALL_ARCHS=$(filter mips64 dspr2) ++ fi ++ mips ++ ;; + armv5te) + ALL_ARCHS=$(filter edsp) + arm diff --git a/package/libvpx/patches/patch-configure b/package/libvpx/patches/patch-configure new file mode 100644 index 000000000..b53e47b8a --- /dev/null +++ b/package/libvpx/patches/patch-configure @@ -0,0 +1,18 @@ +--- libvpx-v1.2.0.orig/configure 2013-10-14 20:16:36.000000000 +0200 ++++ libvpx-v1.2.0/configure 2014-01-06 11:22:14.096914325 +0100 +@@ -98,6 +98,7 @@ all_platforms="${all_platforms} armv7-li + all_platforms="${all_platforms} armv7-linux-gcc" #neon Cortex-A8 + all_platforms="${all_platforms} armv7-none-rvct" #neon Cortex-A8 + all_platforms="${all_platforms} mips32-linux-gcc" ++all_platforms="${all_platforms} mips64-linux-gcc" + all_platforms="${all_platforms} ppc32-darwin8-gcc" + all_platforms="${all_platforms} ppc32-darwin9-gcc" + all_platforms="${all_platforms} ppc32-linux-gcc" +@@ -210,6 +211,7 @@ ARCH_EXT_LIST=" + neon + + mips32 ++ mips64 + dspr2 + + mmx diff --git a/package/mpfr/patches/patch-ltmain_sh b/package/mpfr/patches/patch-ltmain_sh deleted file mode 100644 index 117f89c34..000000000 --- a/package/mpfr/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- mpfr-2.4.2.orig/ltmain.sh 2009-11-30 03:43:54.000000000 +0100 -+++ mpfr-2.4.2/ltmain.sh 2011-01-15 14:26:14.000000000 +0100 -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" diff --git a/package/mpfr/patches/patch-mpfr-longlong_h b/package/mpfr/patches/patch-mpfr-longlong_h deleted file mode 100644 index 7bf1567ee..000000000 --- a/package/mpfr/patches/patch-mpfr-longlong_h +++ /dev/null @@ -1,48 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- mpfr-2.4.1.orig/mpfr-longlong.h 2009-02-20 10:43:17.000000000 +0100 -+++ mpfr-2.4.1/mpfr-longlong.h 2009-05-29 15:11:21.000000000 +0200 -@@ -1011,10 +1011,19 @@ extern UWtype __MPN(udiv_qrnnd) _PROTO ( - #endif /* __m88000__ */ - - #if defined (__mips) && W_TYPE_SIZE == 32 --#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7 -+#if __GMP_GNUC_PREREQ (4,4) -+#define umul_ppmm(w1, w0, u, v) \ -+ do { \ -+ UDItype __ll = (UDItype)(u) * (v); \ -+ w1 = __ll >> 32; \ -+ w0 = __ll; \ -+ } while (0) -+#endif -+#if !defined (umul_ppmm) && __GMP_GNUC_PREREQ (2,7) - #define umul_ppmm(w1, w0, u, v) \ - __asm__ ("multu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v)) --#else -+#endif -+#if !defined (umul_ppmm) - #define umul_ppmm(w1, w0, u, v) \ - __asm__ ("multu %2,%3\n\tmflo %0\n\tmfhi %1" \ - : "=d" (w0), "=d" (w1) : "d" (u), "d" (v)) -@@ -1024,10 +1033,20 @@ extern UWtype __MPN(udiv_qrnnd) _PROTO ( - #endif /* __mips */ - - #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64 --#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7 -+#if __GMP_GNUC_PREREQ (4,4) -+#define umul_ppmm(w1, w0, u, v) \ -+ do { \ -+ typedef unsigned int __ll_UTItype __attribute__((mode(TI))); \ -+ __ll_UTItype __ll = (__ll_UTItype)(u) * (v); \ -+ w1 = __ll >> 64; \ -+ w0 = __ll; \ -+ } while (0) -+#endif -+#if !defined (umul_ppmm) && __GMP_GNUC_PREREQ (2,7) - #define umul_ppmm(w1, w0, u, v) \ - __asm__ ("dmultu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v)) --#else -+#endif -+#if !defined (umul_ppmm) - #define umul_ppmm(w1, w0, u, v) \ - __asm__ ("dmultu %2,%3\n\tmflo %0\n\tmfhi %1" \ - : "=d" (w0), "=d" (w1) : "d" (u), "d" (v)) diff --git a/package/mpfr/patches/patch-src_mpfr-longlong_h b/package/mpfr/patches/patch-src_mpfr-longlong_h new file mode 100644 index 000000000..e68cfa752 --- /dev/null +++ b/package/mpfr/patches/patch-src_mpfr-longlong_h @@ -0,0 +1,11 @@ +--- mpfr-3.1.2.orig/src/mpfr-longlong.h 2013-03-13 16:37:32.000000000 +0100 ++++ mpfr-3.1.2/src/mpfr-longlong.h 2014-01-06 16:29:39.854354889 +0100 +@@ -1043,7 +1043,7 @@ extern UWtype __MPN(udiv_qrnnd) _PROTO ( + #define UDIV_TIME 100 + #endif /* __mips */ + +-#if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64 ++#if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64 && defined (_LP64) + #if __GMP_GNUC_PREREQ (4,4) + #define umul_ppmm(w1, w0, u, v) \ + do { \ diff --git a/package/mtr/Makefile b/package/mtr/Makefile index 83db697d1..c00a554cd 100644 --- a/package/mtr/Makefile +++ b/package/mtr/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mtr PKG_VERSION:= 0.75 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 23baca52d0922c2ecba7eba05317868c PKG_DESCR:= ncurses traceroute/ping tool PKG_SECTION:= net @@ -20,6 +20,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MTR,mtr,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TARGET_LDFLAGS+= -ltinfo CONFIGURE_ENV+= ac_cv_lib_resolv_res_mkquery=yes CONFIGURE_ARGS+= --without-gtk diff --git a/package/mutt/Makefile b/package/mutt/Makefile index 6d46125d6..0454d4627 100644 --- a/package/mutt/Makefile +++ b/package/mutt/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mutt PKG_VERSION:= 1.5.20 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 027cdd9959203de0c3c64149a7ee351c PKG_DESCR:= Mail text client PKG_SECTION:= mail @@ -18,6 +18,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MUTT,mutt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TARGET_LDFLAGS+= -ltinfo CONFIGURE_ARGS+= --includedir=${WRKBUILD}/. \ --oldincludedir=${WRKBUILD}/. \ --with-homespool="~/Maildir" \ diff --git a/package/nspr/patches/patch-nspr_pr_src_misc_prnetdb_c b/package/nspr/patches/patch-nspr_pr_src_misc_prnetdb_c new file mode 100644 index 000000000..f2021a63b --- /dev/null +++ b/package/nspr/patches/patch-nspr_pr_src_misc_prnetdb_c @@ -0,0 +1,16 @@ +--- nspr-4.10.2.orig/nspr/pr/src/misc/prnetdb.c 2013-11-09 10:49:40.000000000 +0100 ++++ nspr-4.10.2/nspr/pr/src/misc/prnetdb.c 2014-01-06 17:48:32.869546316 +0100 +@@ -89,6 +89,13 @@ PRLock *_pr_dnsLock = NULL; + #define _PR_HAVE_5_ARG_GETPROTO_R + #endif + ++#if !defined(__GLIBC__) ++#undef _PR_HAVE_GETPROTO_R ++#undef _PR_HAVE_GETPROTO_R_INT ++#undef _PR_HAVE_GETPROTO_R_POINTER ++#undef _PR_HAVE_5_ARG_GETPROTO_R ++#endif ++ + #if !defined(_PR_HAVE_GETPROTO_R) + PRLock* _getproto_lock = NULL; + #endif diff --git a/package/nss/Makefile b/package/nss/Makefile index 7f9227b10..ffffc69e1 100644 --- a/package/nss/Makefile +++ b/package/nss/Makefile @@ -4,18 +4,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:= nss -PKG_VERSION:= 3.15.2 -PKG_RELEASE:= 2 +PKG_VERSION:= 3.15.3.1 +PKG_RELEASE:= 1 PKG_MAJ_VERSION:= 3 PKG_MIN_VERSION:= 15 -PKG_PATCH_VERSION:= 2 -PKG_MD5SUM:= 154223568f9734c76c164b46c774450c +PKG_PATCH_VERSION:= 3 +PKG_PATCH2_VERSION:= 1 +PKG_MD5SUM:= 1d444fffdb1f890a000003b50295b5aa PKG_DESCR:= Network Security Services (NSS) library PKG_SECTION:= libs PKG_BUILDDEP:= nspr zlib sqlite PKG_DEPENDS:= nspr zlib libsqlite PKG_URL:= http://www.mozilla.org/projects/security/pki/nss/ -PKG_SITES:= ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${PKG_MAJ_VERSION}_${PKG_MIN_VERSION}_${PKG_PATCH_VERSION}_RTM/src/ +PKG_SITES:= ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${PKG_MAJ_VERSION}_${PKG_MIN_VERSION}_${PKG_PATCH_VERSION}_${PKG_PATCH2_VERSION}_RTM/src/ PKG_NOPARALLEL:= 1 PKG_HOST_DEPENDS:= !cygwin diff --git a/package/python2/patches/patch-Modules_posixmodule_c b/package/python2/patches/patch-Modules_posixmodule_c new file mode 100644 index 000000000..5374fb975 --- /dev/null +++ b/package/python2/patches/patch-Modules_posixmodule_c @@ -0,0 +1,20 @@ +--- Python-2.7.5.orig/Modules/posixmodule.c 2013-05-12 05:32:51.000000000 +0200 ++++ Python-2.7.5/Modules/posixmodule.c 2014-01-06 10:49:56.103893388 +0100 +@@ -6552,7 +6552,7 @@ PyDoc_STRVAR(posix_close__doc__, + Close a file descriptor (for low level IO)."); + + static PyObject * +-posix_close(PyObject *self, PyObject *args) ++posix_pyclose(PyObject *self, PyObject *args) + { + int fd, res; + if (!PyArg_ParseTuple(args, "i:close", &fd)) +@@ -8930,7 +8930,7 @@ static PyMethodDef posix_methods[] = { + {"tcsetpgrp", posix_tcsetpgrp, METH_VARARGS, posix_tcsetpgrp__doc__}, + #endif /* HAVE_TCSETPGRP */ + {"open", posix_open, METH_VARARGS, posix_open__doc__}, +- {"close", posix_close, METH_VARARGS, posix_close__doc__}, ++ {"close", posix_pyclose, METH_VARARGS, posix_close__doc__}, + {"closerange", posix_closerange, METH_VARARGS, posix_closerange__doc__}, + {"dup", posix_dup, METH_VARARGS, posix_dup__doc__}, + {"dup2", posix_dup2, METH_VARARGS, posix_dup2__doc__}, diff --git a/package/python3/patches/patch-Modules_posixmodule_c b/package/python3/patches/patch-Modules_posixmodule_c new file mode 100644 index 000000000..537958513 --- /dev/null +++ b/package/python3/patches/patch-Modules_posixmodule_c @@ -0,0 +1,20 @@ +--- Python-3.3.2.orig/Modules/posixmodule.c 2013-05-15 18:32:59.000000000 +0200 ++++ Python-3.3.2/Modules/posixmodule.c 2014-01-06 18:59:54.000000000 +0100 +@@ -7679,7 +7679,7 @@ PyDoc_STRVAR(posix_close__doc__, + Close a file descriptor (for low level IO)."); + + static PyObject * +-posix_close(PyObject *self, PyObject *args) ++posix_pyclose(PyObject *self, PyObject *args) + { + int fd, res; + if (!PyArg_ParseTuple(args, "i:close", &fd)) +@@ -11082,7 +11082,7 @@ static PyMethodDef posix_methods[] = { + {"open", (PyCFunction)posix_open,\ + METH_VARARGS | METH_KEYWORDS, + posix_open__doc__}, +- {"close", posix_close, METH_VARARGS, posix_close__doc__}, ++ {"close", posix_pyclose, METH_VARARGS, posix_close__doc__}, + {"closerange", posix_closerange, METH_VARARGS, posix_closerange__doc__}, + {"device_encoding", device_encoding, METH_VARARGS, device_encoding__doc__}, + {"dup", posix_dup, METH_VARARGS, posix_dup__doc__}, diff --git a/package/tcsh/Makefile b/package/tcsh/Makefile index b1e93b373..419ea5576 100644 --- a/package/tcsh/Makefile +++ b/package/tcsh/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= tcsh PKG_VERSION:= 6.18.01 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 6eed09dbd4223ab5b6955378450d228a PKG_DESCR:= alternative csh PKG_SECTION:= shells @@ -18,6 +18,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,TCSH,tcsh,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TARGET_LDFLAGS+= -ltinfo CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes tcsh-install: diff --git a/package/trafshow/Makefile b/package/trafshow/Makefile index 2e60ec055..3af13570f 100644 --- a/package/trafshow/Makefile +++ b/package/trafshow/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= trafshow PKG_VERSION:= 5.2.3 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 0b2f0bb23b7832138b7d841437b9e182 PKG_DESCR:= traffic analyzing tool PKG_SECTION:= net @@ -20,7 +20,8 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,TRAFSHOW,trafshow,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TARGET_CPPFLAGS+= -DHAVE_SOCKADDR_STORAGE -DHAVE_HAS_COLORS +TARGET_CPPFLAGS+= -DHAVE_SOCKADDR_STORAGE -DHAVE_HAS_COLORS -D_GNU_SOURCE +TARGET_LDFLAGS+= -ltinfo trafshow-install: ${INSTALL_DIR} ${IDIR_TRAFSHOW}/usr/bin |