- Revision
- 11127
- Author
- vajda
- Date
- 2006-07-11 14:04:30 -0700 (Tue, 11 Jul 2006)
Log Message
- added patch to workaround __eprintf problem on intel os x
Modified Paths
Added Paths
Diff
Modified: trunk/external/PyICU/Makefile (11126 => 11127)
--- trunk/external/PyICU/Makefile 2006-07-11 19:02:59 UTC (rev 11126) +++ trunk/external/PyICU/Makefile 2006-07-11 21:04:30 UTC (rev 11127) @@ -1,7 +1,7 @@ VERSION=0.5-$(SVNVER) SVNVER=62 -RELVER=$(VERSION)-$(BRANCH_REV_PREFIX)4 +RELVER=$(VERSION)-$(BRANCH_REV_PREFIX)5 PYICU=$(BUILD_ROOT)/PyICU SRC="" BUILD=$(SNAP) @@ -36,7 +36,10 @@ MANIFEST=$(SNAP)/$(SITE)/PyICU.py $(SNAP)/$(SITE)/_PyICU.so -build: expand +apply: patches-$(VERSION) + patch -Nup0 < patches-$(VERSION) + +build: expand apply MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET) \ $(MAKE) -C $(SRC) \ PREFIX=$(PREFIX) \
Added: trunk/external/PyICU/patches-0.5-62 (11126 => 11127)
--- trunk/external/PyICU/patches-0.5-62 2006-07-11 19:02:59 UTC (rev 11126) +++ trunk/external/PyICU/patches-0.5-62 2006-07-11 21:04:30 UTC (rev 11127) @@ -0,0 +1,30 @@ +--- PyICU-0.5-62/_PyICU.cpp 2006-07-11 13:27:53.000000000 -0700 ++++ PyICU-0.5-62-patched/_PyICU.cpp 2006-07-11 13:27:06.000000000 -0700 +@@ -35,6 +35,16 @@ + #include "calendar.h" + #include "collator.h" + ++#ifdef EPRINTF ++#include <assert.h> ++void __eprintf(const char *format, const char *file, unsigned line, ++ const char *e) ++{ ++ printf(format, file, line, e); ++ abort(); ++} ++#endif ++ + /* const variable descriptor */ + + class t_descriptor { +--- PyICU-0.5-62/Makefile 2006-07-11 13:31:16.000000000 -0700 ++++ PyICU-0.5-62-patched/Makefile 2006-07-11 13:31:14.000000000 -0700 +@@ -87,7 +87,7 @@ + ICU_INC=$(PREFIX_ICU)/include + ICU_LIB=$(PREFIX_ICU)/lib + ifeq ($(DEBUG),1) +-CCFLAGS=-O0 -g ++CCFLAGS=-O0 -g -DEPRINTF + LDFLAGS=-g + else + CCFLAGS=-O2
_______________________________________________ Commits mailing list [email protected] http://lists.osafoundation.org/mailman/listinfo/commits
