| 1 |
patrick 09/09/10 10:51:38 |
| 2 |
|
| 3 |
Added: xerces-c-3.0.1-libicu.patch |
| 4 |
Log: |
| 5 |
Fix for compilation with ICU 4.2. Fixes #269659. Thanks to the half dozen people who wrote and tested the patch. |
| 6 |
(Portage version: 2.2_rc40/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 dev-libs/xerces-c/files/xerces-c-3.0.1-libicu.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/xerces-c/files/xerces-c-3.0.1-libicu.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/xerces-c/files/xerces-c-3.0.1-libicu.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: xerces-c-3.0.1-libicu.patch |
| 15 |
=================================================================== |
| 16 |
--- src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in.orig 2009-09-01 20:29:37.000000000 +0200 |
| 17 |
+++ src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in 2009-09-01 20:30:21.000000000 +0200 |
| 18 |
@@ -50,8 +50,8 @@ PKGDATA=$(ICU_PREFIX)/bin/pkgdata |
| 19 |
|
| 20 |
# Add -v if you want to see more verbose output. |
| 21 |
# |
| 22 |
-PKGDATAOPTS=-d . -M '"CC=$(CC)" "CXX=$(CXX)" "AR=$(AR)" "RANLIB=$(RANLIB)" \ |
| 23 |
-"CPPFLAGS=$(CPPFLAGS)" "CFLAGS=$(CFLAGS)" "CXXFLAGS=$(CXXFLAGS)" "LDFLAGS=$(LDFLAGS)"' |
| 24 |
+PKGDATAOPTSSHARED=-d . -r 3.0.1 |
| 25 |
+PKGDATAOPTSSTATIC=-d . |
| 26 |
|
| 27 |
# Resource shortname |
| 28 |
PKGNAME=xercesc_messages_$(INTERFACE_VER_U) |
| 29 |
@@ -78,13 +78,13 @@ all: xercesc_messages.lo |
| 30 |
xercesc_messages.lo: $(RESFILES) |
| 31 |
ifeq ($(BUILD_SHARED),yes) |
| 32 |
@rm -f $(PKGNAME)_dat.o root_res.o |
| 33 |
- $(PKGDATA) --name $(PKGNAME) --mode dll $(PKGDATAOPTS) $(RESLIST) |
| 34 |
+ $(PKGDATA) --name $(PKGNAME) --mode dll $(PKGDATAOPTSSHARED) $(RESLIST) |
| 35 |
mv $(PKGNAME)_dat.o $(PKGNAME)_dat-pic.o |
| 36 |
@if test -f root_res.o; then mv root_res.o root_res-pic.o; fi |
| 37 |
endif |
| 38 |
ifeq ($(BUILD_STATIC),yes) |
| 39 |
@rm -f $(PKGNAME)_dat.o $(PKGNAME)_dat.ao root_res.o root_res.ao |
| 40 |
- $(PKGDATA) --name $(PKGNAME) --mode static $(PKGDATAOPTS) $(RESLIST) |
| 41 |
+ $(PKGDATA) --name $(PKGNAME) --mode static $(PKGDATAOPTSSTATIC) $(RESLIST) |
| 42 |
@if test -f $(PKGNAME)_dat.ao; then mv $(PKGNAME)_dat.ao $(PKGNAME)_dat.o; fi |
| 43 |
@if test -f root_res.ao; then mv root_res.ao root_res.o; fi |
| 44 |
endif |
Archives