Summary: | textproc/uim build error in 8-current | ||
---|---|---|---|
Product: | Ports & Packages | Reporter: | Takuya Harada <tharada> |
Component: | Individual Port(s) | Assignee: | MANTANI Nobutaka <nobutaka> |
Status: | Closed FIXED | ||
Severity: | Affects Only Me | ||
Priority: | Normal | ||
Version: | Latest | ||
Hardware: | Any | ||
OS: | Any |
Description
Takuya Harada
2007-10-19 16:20:01 UTC
Responsible Changed From-To: freebsd-ports-bugs->nobutaka Over to maintainer (via the GNATS Auto Assign Tool) I applied this patch with my 8-current box. No build error have occurred. reference: http://bugs.freedesktop.org/attachment.cgi?id=12334&action=view ---cut here---- Index: src/storage-compact.h =================================================================== --- sigscheme/src/storage-compact.h (revision 5037) +++ sigscheme/src/storage-compact.h (working copy) @@ -639,11 +639,14 @@ (SCM_ASSERT(SCM_ALIGNED_SYMBOL_NAME(n)), \ SCM_SET_Y(SCM_SYMBOL_PTR(o), (scm_uintobj_t)(n) | SCM_MTAG_SYMBOL)) #define SCM_ISAL_SYMBOL_INIT(o, n, c) \ - (SCM_ASSERT(SCM_ALIGNED_SYMBOL_NAME(n)), \ - SCM_INIT((o), \ - (c), \ - (scm_uintobj_t)(n) | SCM_MTAG_SYMBOL, \ - SCM_PTAG_MISC)) + do { \ + char *_s = scm_align_str(n); \ + (SCM_ASSERT(SCM_ALIGNED_SYMBOL_NAME(_s)), \ + SCM_INIT((o), \ + (c), \ + (scm_uintobj_t)(_s) | SCM_MTAG_SYMBOL, \ + SCM_PTAG_MISC)); \ + } while (0) #define SCM_CELL_SYMBOLP(c) SCM_MISC_CELL_TYPEP((c), SYMBOL) #define SCM_CELL_SYMBOL_FIN(c) \ do { \ Index: src/sigscheme.h =================================================================== --- sigscheme/src/sigscheme.h (revision 5037) +++ sigscheme/src/sigscheme.h (working copy) @@ -1242,6 +1242,7 @@ SCM_EXPORT void *scm_calloc(size_t number, size_t size); SCM_EXPORT void *scm_realloc(void *ptr, size_t size); SCM_EXPORT char *scm_strdup(const char *str); +SCM_EXPORT char *scm_align_str(char *str); /* storage-gc.c */ SCM_EXPORT void scm_gc_protect(ScmObj *var); Index: src/alloc.c =================================================================== --- sigscheme/src/alloc.c (revision 5037) +++ sigscheme/src/alloc.c (working copy) @@ -181,7 +181,6 @@ return copied; } -#if 0 /* For 'name' slot of symbol object on storage-compact. If your malloc(3) does * not ensure 8-bytes alignment, Complete this function and hook this into * symbol object creation and modification. -- YamaKen 2006-05-30 */ @@ -192,17 +191,16 @@ size_t size; /* Use ScmCell-alignment to ensure at least 8-bytes aligned. */ - if ((uintptr_t)ptr % sizeof(ScmCell)) { + if ((uintptr_t)str % sizeof(ScmCell)) { size = strlen(str) + sizeof(""); - copied = scm_malloc_aligned8(size); + copied = scm_malloc_aligned(size); strcpy(copied, str); free(str); return copied; } else { - return ptr; + return str; } } -#endif /*======================================= Extendable Local Buffer ---cut here---- nobutaka 2007-11-11 06:37:21 UTC FreeBSD ports repository Modified files: textproc/uim Makefile pkg-plist Added files: textproc/uim/files patch-sigscheme_libgcroots_include_private_gcconfig.h patch-sigscheme_src_alloc.c patch-sigscheme_src_sigscheme.h patch-sigscheme_src_storage-compact.h Log: - Fix pkg-plist. - Fix build error on 7-stable and 8-current. [1] - Fix build error on amd64. [2] PR: ports/117325 [1], ports/117677 [2] Submitted by: Takuya Harada <tharada@e-mail.jp> [1], Yoshiaki Kasahara <kasahara@nc.kyushu-u.ac.jp> [2] Approved by: portmgr (pav) Revision Changes Path 1.68 +1 -0 ports/textproc/uim/Makefile 1.1 +13 -0 ports/textproc/uim/files/patch-sigscheme_libgcroots_include_private_gcconfig.h (new) 1.1 +31 -0 ports/textproc/uim/files/patch-sigscheme_src_alloc.c (new) 1.1 +10 -0 ports/textproc/uim/files/patch-sigscheme_src_sigscheme.h (new) 1.1 +22 -0 ports/textproc/uim/files/patch-sigscheme_src_storage-compact.h (new) 1.33 +1 -0 ports/textproc/uim/pkg-plist _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org" State Changed From-To: open->closed Committed, thanks! |