diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-02-15 00:52:00 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-02-15 00:52:00 +0800 |
| commit | 4c836cabcda29f2093da50af70e20a4d330a8985 (patch) | |
| tree | f2cfd814c6771177b341350264ec59647a6f9927 /devel | |
| parent | 02b6929e764190ae09693f7f8f336a978682be6c (diff) | |
| download | marcuscom-ports-4c836cabcda29f2093da50af70e20a4d330a8985.tar marcuscom-ports-4c836cabcda29f2093da50af70e20a4d330a8985.tar.gz marcuscom-ports-4c836cabcda29f2093da50af70e20a4d330a8985.tar.bz2 marcuscom-ports-4c836cabcda29f2093da50af70e20a4d330a8985.tar.lz marcuscom-ports-4c836cabcda29f2093da50af70e20a4d330a8985.tar.xz marcuscom-ports-4c836cabcda29f2093da50af70e20a4d330a8985.tar.zst marcuscom-ports-4c836cabcda29f2093da50af70e20a4d330a8985.zip | |
Make sure the valloc(3) prototype is not masked on systems that do not
support posix_memalign(3).
Obtained from: glib CVS
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5689 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/glib20/Makefile | 3 | ||||
| -rw-r--r-- | devel/glib20/files/patch-glib_gslice.c | 24 |
2 files changed, 26 insertions, 1 deletions
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 0c7399aad..ad05c181f 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -3,11 +3,12 @@ # Whom: Vanilla I. Shu <vanilla@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/glib20/Makefile,v 1.65 2006/01/31 20:36:48 marcus Exp $ +# $MCom: ports/devel/glib20/Makefile,v 1.66 2006/02/11 17:23:03 ahze Exp $ # PORTNAME= glib PORTVERSION= 2.9.6 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.9,} \ ftp://ftp.gtk.org/pub/gtk/v2.9/ \ diff --git a/devel/glib20/files/patch-glib_gslice.c b/devel/glib20/files/patch-glib_gslice.c new file mode 100644 index 000000000..a59be1a0b --- /dev/null +++ b/devel/glib20/files/patch-glib_gslice.c @@ -0,0 +1,24 @@ +--- glib/gslice.c.orig Tue Feb 14 11:45:19 2006 ++++ glib/gslice.c Tue Feb 14 11:46:37 2006 +@@ -20,7 +20,8 @@ + + #include "config.h" + +-#ifdef HAVE_POSIX_MEMALIGN ++#if defined(HAVE_POSIX_MEMALIGN) && defined(POSIX_MEMALIGN_WITH_COMPLIANT_ALLOCS) ++#define HAVE_COMPLIANT_POSIX_MEMALIGN 1 + #define _XOPEN_SOURCE 600 /* posix_memalign() */ + #endif + #include <stdlib.h> /* posix_memalign() */ +@@ -37,11 +38,6 @@ + #include <windows.h> + #include <process.h> + #endif +- +-#if defined HAVE_POSIX_MEMALIGN && defined POSIX_MEMALIGN_WITH_COMPLIANT_ALLOCS +-# define HAVE_COMPLIANT_POSIX_MEMALIGN 1 +-#endif +- + + /* the GSlice allocator is split up into 4 layers, roughly modelled after the slab + * allocator and magazine extensions as outlined in: |