diff options
| author | stefan <stefan@FreeBSD.org> | 2010-06-29 23:11:26 +0800 |
|---|---|---|
| committer | stefan <stefan@FreeBSD.org> | 2010-06-29 23:11:26 +0800 |
| commit | 46a90094be98ffd729988caaea48a3940c81146b (patch) | |
| tree | bf2b35e5b396fff3456270b34deb1b1afb02adbd /textproc | |
| parent | d1be665d3f3aef884637765a1edf1362d9d3a869 (diff) | |
| download | freebsd-ports-gnome-46a90094be98ffd729988caaea48a3940c81146b.tar.gz freebsd-ports-gnome-46a90094be98ffd729988caaea48a3940c81146b.tar.zst freebsd-ports-gnome-46a90094be98ffd729988caaea48a3940c81146b.zip | |
In textproc/xerces-c2 and textproc/xerces-c2-devel, use -lgcc_pic only on
systems < 7.0-RELEASE.
PR: 136984
Submitted by: Meena <meena.vyas@sun.com>
Patch by: arved
Approved by: maintainer timeout (>11 months)
Feature safe: yes
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/xerces-c2-devel/Makefile | 4 | ||||
| -rw-r--r-- | textproc/xerces-c2-devel/files/patch-src-xercesc-Makefile.incl | 11 | ||||
| -rw-r--r-- | textproc/xerces-c2/Makefile | 4 | ||||
| -rw-r--r-- | textproc/xerces-c2/files/patch-src-xercesc-Makefile.incl | 11 |
4 files changed, 8 insertions, 22 deletions
diff --git a/textproc/xerces-c2-devel/Makefile b/textproc/xerces-c2-devel/Makefile index 2e8741bc936f..11a2536abea7 100644 --- a/textproc/xerces-c2-devel/Makefile +++ b/textproc/xerces-c2-devel/Makefile @@ -139,6 +139,10 @@ pre-extract: post-patch: @${REINPLACE_CMD} -e 's#CP = -cp -p#CP = -cp#' \ ${WRKSRC}/src/xercesc/Makefile.incl +.if ${OSVERSION} < 700000 + @${REINPLACE_CMD} -e 's,-lgcc,-lgcc_pic,' \ + ${WRKSRC}/src/xercesc/Makefile.incl +.endif pre-configure: @${CHMOD} 700 ${CONFIGURE_WRKSRC}/runConfigure diff --git a/textproc/xerces-c2-devel/files/patch-src-xercesc-Makefile.incl b/textproc/xerces-c2-devel/files/patch-src-xercesc-Makefile.incl deleted file mode 100644 index 961f8f7233e8..000000000000 --- a/textproc/xerces-c2-devel/files/patch-src-xercesc-Makefile.incl +++ /dev/null @@ -1,11 +0,0 @@ ---- src/xercesc/Makefile.incl.orig Thu Aug 30 21:10:20 2007 -+++ src/xercesc/Makefile.incl Fri Jan 11 13:40:47 2008 -@@ -591,7 +591,7 @@ - - ifeq (${TRANSCODER}, ICU) - PLATFORM_COMPILE_OPTIONS += -I/usr/local/include -- ALLLIBS = ${LIBS} -L/usr/local/lib -L${ICUROOT} -licuuc -licudata -lgcc -+ ALLLIBS = ${LIBS} -L/usr/local/lib -L${ICUROOT} -licuuc -licudata -lgcc_pic - else - ALLLIBS = ${LIBS} - endif diff --git a/textproc/xerces-c2/Makefile b/textproc/xerces-c2/Makefile index bb2d33c7b190..fe8804312c6b 100644 --- a/textproc/xerces-c2/Makefile +++ b/textproc/xerces-c2/Makefile @@ -142,6 +142,10 @@ post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ ${WRKSRC}/src/xercesc/Makefile.incl \ ${WRKSRC}/src/xercesc/runConfigure +.if ${OSVERSION} < 700000 + @${REINPLACE_CMD} -e 's,-lgcc,-lgcc_pic,' \ + ${WRKSRC}/src/xercesc/Makefile.incl +.endif pre-configure: @${CHMOD} 700 ${CONFIGURE_WRKSRC}/runConfigure diff --git a/textproc/xerces-c2/files/patch-src-xercesc-Makefile.incl b/textproc/xerces-c2/files/patch-src-xercesc-Makefile.incl deleted file mode 100644 index 9b42675607ea..000000000000 --- a/textproc/xerces-c2/files/patch-src-xercesc-Makefile.incl +++ /dev/null @@ -1,11 +0,0 @@ ---- src/xercesc/Makefile.incl.orig Wed Sep 7 11:55:53 2005 -+++ src/xercesc/Makefile.incl Mon Apr 10 14:54:15 2006 -@@ -411,7 +411,7 @@ - MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared -fPIC ${LDFLAGS} - ifeq (${TRANSCODER}, ICU) - PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM} -I/usr/local/include -- ALLLIBS = ${LIBS} -L/usr/local/lib -L${ICUROOT} -licuuc -licudata -lgcc -+ ALLLIBS = ${LIBS} -L/usr/local/lib -L${ICUROOT} -licuuc -licudata -lgcc_pic - else - PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM} - ALLLIBS = ${LIBS} |