diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-08-03 11:41:11 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-08-03 11:41:11 +0000 |
| commit | b546a4a0a81949e2c1e4603e19ce7de493ca81d7 (patch) | |
| tree | e61e9a9623de80f20cf45130ce3cc99204f75b0e /libxslt | |
| parent | 6fc51a5724f60c9e04485081f1b59e7fa80d156e (diff) | |
INTEGRATION: CWS cmcfixes35 (1.4.4); FILE MERGED
2007/07/23 18:00:54 cmc 1.4.4.4: #i78310# someone has been messing with this
2007/07/23 09:43:56 cmc 1.4.4.3: RESYNC: (1.5-1.7); FILE MERGED
2007/07/05 12:40:53 cmc 1.4.4.2: RESYNC: (1.4-1.5); FILE MERGED
2007/06/13 10:43:05 cmc 1.4.4.1: #i78310# add rpath of ORIGIN to libxslt
Diffstat (limited to 'libxslt')
| -rw-r--r-- | libxslt/makefile.mk | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index d307e88ab1f6..5593723b2e86 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: obo $ $Date: 2007-07-25 07:16:43 $ +# last change: $Author: hr $ $Date: 2007-08-03 12:41:11 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -78,22 +78,29 @@ BUILD_ACTION=nmake BUILD_DIR=$(CONFIGURE_DIR) .ENDIF .ELSE + +.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN' -Wl,-noinhibit-exec -Wl,-z,noexecstack +.ENDIF # "$(OS)$(COM)"=="LINUXGCC" +.IF "$(OS)$(COM)"=="SOLARISC52" +LDFLAGS:=-Wl,-R'$$$$ORIGIN' +.ENDIF # "$(OS)$(COM)"=="SOLARISC52" + .IF "$(SYSBASE)"!="" xslt_CFLAGS+=-I$(SYSBASE)$/usr$/include -I$(SOLARINCDIR)$/external .IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX" -xslt_LDFLAGS+=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -L$(SOLARLIBDIR) -lpthread -ldl +LDFLAGS+=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -L$(SOLARLIBDIR) -lpthread -ldl .ENDIF .ENDIF # "$(SYSBASE)"!="" + +.EXPORT: LDFLAGS + .IF "$(COMNAME)"=="sunpro5" xslt_CFLAGS+=-xc99=none .ENDIF # "$(COMNAME)"=="sunpro5" CONFIGURE_DIR= -xslt_LDFLAGS+=-lxml2 -lz -.IF "$(OS)"=="FREEBSD" -xslt_LDFLAGS+=-L$(SOLARLIBDIR) -.ENDIF CONFIGURE_ACTION=chmod 777 libxml2-config && .$/configure -CONFIGURE_FLAGS=--enable-ipv6=no --without-crypto --without-python --enable-static=no --with-sax1=yes CFLAGS="$(xslt_CFLAGS)" LDFLAGS="$(xslt_LDFLAGS)" +CONFIGURE_FLAGS=--enable-ipv6=no --without-crypto --without-python --enable-static=no --with-sax1=yes CFLAGS="$(xslt_CFLAGS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) |