diff options
| author | Stefan Eßer <se@FreeBSD.org> | 2012-06-18 09:48:49 +0000 |
|---|---|---|
| committer | Stefan Eßer <se@FreeBSD.org> | 2012-06-18 09:48:49 +0000 |
| commit | 5abf4738c3be5cc45541f167a72d1c008242031f (patch) | |
| tree | f64cb1f228c9f0ed1c76c6c4919850ab7fc4c3b5 /sysutils | |
| parent | - Fix PLIST (diff) | |
Unbreak by removal of the assignment to malloc_options (which does not
exist in 10-CURRENT after the import of the new jemalloc).
Jason Evans announced in a mail to -current back in February 2008, that
the "H" option had been made obsolete due to a change in jemalloc, but
I leave the port unchanged for versions before 10-CURRENT.
Notes
Notes:
svn path=/head/; revision=299557
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/samesame/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/samesame/files/patch-samearchive.cpp | 12 | ||||
| -rw-r--r-- | sysutils/samesame/files/patch-samesame.cpp | 12 |
3 files changed, 24 insertions, 4 deletions
diff --git a/sysutils/samesame/Makefile b/sysutils/samesame/Makefile index 8bae1ca001cb..ea1c83c89090 100644 --- a/sysutils/samesame/Makefile +++ b/sysutils/samesame/Makefile @@ -41,10 +41,6 @@ OPTIONS= DEBUG "Enables debugging support" Off \ .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 1000000 -BROKEN= does not build -.endif - .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --enable-debug .endif diff --git a/sysutils/samesame/files/patch-samearchive.cpp b/sysutils/samesame/files/patch-samearchive.cpp new file mode 100644 index 000000000000..46317598c89b --- /dev/null +++ b/sysutils/samesame/files/patch-samearchive.cpp @@ -0,0 +1,12 @@ +--- src/samearchive.cpp~ 2010-02-04 09:08:04.000000000 +0100 ++++ src/samearchive.cpp 2012-06-18 11:33:47.307181515 +0200 +@@ -162,7 +162,9 @@ + { + #if HAVE_MALLOC + #if __BSD_VISIBLE ++#if __FreeBSD_version < 1000000 + _malloc_options = "H"; ++#endif // __FreeBSD_version + #endif // __BSD_VISIBLE + #else // HAVE_MALLOC + #error malloc function required, see file config.h.in diff --git a/sysutils/samesame/files/patch-samesame.cpp b/sysutils/samesame/files/patch-samesame.cpp new file mode 100644 index 000000000000..b8d58b4e777d --- /dev/null +++ b/sysutils/samesame/files/patch-samesame.cpp @@ -0,0 +1,12 @@ +--- src/samefile.cpp~ 2010-07-14 13:22:15.000000000 +0200 ++++ src/samefile.cpp 2012-06-18 11:28:10.941708203 +0200 +@@ -120,7 +120,9 @@ + { + #if HAVE_MALLOC + #if __BSD_VISIBLE ++#if __FreeBSD_version < 1000000 + _malloc_options = "H"; ++#endif // __FreeBSD_version + #endif // __BSD_VISIBLE + #else // HAVE_MALLOC + #error malloc function required, see file config.h.in |