diff options
| -rw-r--r-- | package/gdb/Makefile | 4 | ||||
| -rw-r--r-- | package/nspr/patches/patch-nspr_pr_src_misc_prnetdb_c | 16 | ||||
| -rw-r--r-- | package/nss/Makefile | 11 |
3 files changed, 26 insertions, 5 deletions
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/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 |