Update from 3.10 to the recent release 3.13.

Remove needless patches.
This commit is contained in:
Sergey A. Osokin 2020-04-08 23:51:33 +00:00
parent fc1f819e46
commit a0d85f01fc
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=531160
6 changed files with 28 additions and 41 deletions

View file

@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= libhoard
PORTVERSION= 3.10
PORTREVISION= 1
PORTVERSION= 3.13
CATEGORIES= devel
MASTER_SITES= https://github.com/emeryberger/Hoard/releases/download/${PORTVERSION}/
DISTNAME= Hoard-${PORTVERSION}-source
DISTNAME= hoard-release
MAINTAINER= ports@FreeBSD.org
COMMENT= Fast, scalable, and memory-efficient allocator for MP
@ -20,11 +19,11 @@ BROKEN_mips64= no spin lock implementation is available for this platform
BROKEN_powerpc64= Does not build: Error: instruction address is not a multiple of 4
BROKEN_sparc64= Does not build
USE_CXXSTD= gnu++98
USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/Hoard/src
MAKEFILE= GNUmakefile
USES= gmake compiler:c++14-lang
ALL_TARGET= freebsd
USE_LDCONFIG= yes
PLIST_FILES= lib/libhoard.so lib/libhoard.so.1

View file

@ -1,2 +1,3 @@
SHA256 (Hoard-3.10-source.tar.gz) = 9776dd824d193937fa5b079f3f16611eaac54876fecff26a6aec0adb029cbca7
SIZE (Hoard-3.10-source.tar.gz) = 253110
TIMESTAMP = 1586388520
SHA256 (hoard-release.tar.gz) = 56399859f95e5a91c998f665d7e56095e8c888c77b33f7d9a5c3b64356658d76
SIZE (hoard-release.tar.gz) = 1554232

View file

@ -0,0 +1,20 @@
--- GNUmakefile.orig 2019-01-02 03:35:46 UTC
+++ GNUmakefile
@@ -3,7 +3,7 @@
CPPFLAGS = -std=c++14 -O3 -DNDEBUG -ffast-math -fno-builtin-malloc -Wall -Wextra -Wshadow -Wconversion -Wuninitialized
#CPPFLAGS = -std=c++14 -g -O0 -ffast-math -fno-builtin-malloc -Wall -Wextra -Wshadow -Wconversion -Wuninitialized
-CXX = clang++
+#CXX = clang++
# Prefix for installations (Unix / Mac)
@@ -80,7 +80,7 @@ WIN_INCLUDES = /I. /Iinclude /Iinclude/util /Iinclude/
# Compile commands for individual targets.
#
-FREEBSD_COMPILE = $(CXX) -g $(CPPFLAGS) -DNDEBUG -fPIC $(INCLUDES) -D_REENTRANT=1 -shared $(SUNW_SRC) -Bsymbolic -o libhoard.so -lpthread
+FREEBSD_COMPILE = $(CXX) $(CXXFLAGS) -DNDEBUG -fPIC $(INCLUDES) -D_REENTRANT=1 -shared $(SUNW_SRC) -Bsymbolic -o libhoard.so -pthread
DEBIAN_COMPILE = $(CXX) -g -O3 -fPIC -DNDEBUG -I. -Iinclude -Iinclude/util -Iinclude/hoard -Iinclude/superblocks -IHeap-Layers -D_REENTRANT=1 -shared source/libhoard.cpp source/unixtls.cpp Heap-Layers/wrappers/wrapper.cpp -Bsymbolic -o libhoard.so -lpthread -lstdc++ -ldl

View file

@ -1,11 +0,0 @@
--- Makefile.orig 2019-01-27 10:26:30 UTC
+++ Makefile
@@ -47,7 +47,7 @@ WIN_INCLUDES = /I. /Iinclude /Iinclude/util /Iinclude/
# Compile commands for individual targets.
#
-FREEBSD_COMPILE = g++ -g $(CPPFLAGS) -DNDEBUG -DNDEBUG $(INCLUDES) -D_REENTRANT=1 -shared $(UNIX_SRC) -Bsymbolic -o libhoard.so -pthread -fPIC
+FREEBSD_COMPILE = $(CXX) $(CXXFLAGS) -DNDEBUG -DNDEBUG $(INCLUDES) -D_REENTRANT=1 -shared $(UNIX_SRC) -Bsymbolic -Wl,-soname=libhoard.so.1 $(LDFLAGS) -o libhoard.so -pthread -fPIC
MACOS_COMPILE = clang++ -ftemplate-depth=1024 -arch i386 -arch x86_64 -pipe -g $(CPPFLAGS) -DNDEBUG $(INCLUDES) -D_REENTRANT=1 -compatibility_version 1 -current_version 1 -dynamiclib -D'CUSTOM_PREFIX(x)=xx\#\#x' $(MACOS_SRC) -o libhoard.dylib -ldl -lpthread

View file

@ -1,11 +0,0 @@
--- Heap-Layers/heaps/debug/sanitycheckheap.h.orig 2013-10-21 01:01:57.000000000 +0200
+++ Heap-Layers/heaps/debug/sanitycheckheap.h 2016-04-07 23:39:09.104819000 +0200
@@ -27,7 +27,7 @@ namespace HL {
/// This approach lets us use SanityCheckHeaps when we're replacing malloc.
// The objects are pairs, mapping void * pointers to sizes.
- typedef std::pair<const void *, size_t> objType;
+ typedef std::pair<void * const, size_t> objType;
// The heap is a simple freelist heap.
typedef HL::FreelistHeap<HL::ZoneHeap<HL::MmapHeap, 16384> > heapType;

View file

@ -1,11 +0,0 @@
--- src/source/unixtls.cpp.orig 2014-08-21 06:10:50.000000000 +0200
+++ source/unixtls.cpp 2014-08-21 06:12:43.000000000 +0200
@@ -315,7 +315,7 @@
const pthread_attr_t *attr,
void * (*start_routine) (void *),
void * arg)
-#if !defined(__SUNPRO_CC) && !defined(__APPLE__)
+#if !defined(__SUNPRO_CC) && !defined(__APPLE__) && !defined(__FreeBSD__)
throw ()
#endif
{