diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-03-26 11:24:02 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-03-26 11:24:02 +0000 |
| commit | 40e1c468929000e7ad6482677d398bf87012a77e (patch) | |
| tree | 25652aa9a12d7cda12874025e7d72290ee5dcee4 /libxmlsec | |
| parent | e380b224830ddeaf24222c00fcdf1db53adb8738 (diff) | |
INTEGRATION: CWS hr40 (1.9.12); FILE MERGED
2006/12/01 18:07:25 hr 1.9.12.4: #i70840#: the -Wl,-z,noexecstack switch is available on all systems with GNU ld
2006/11/28 16:45:26 hr 1.9.12.3: #i70840#: fix typo
2006/11/28 13:32:19 hjs 1.9.12.2: #i72063# add to CFLAGS instead of overwriting
2006/11/28 13:07:32 hr 1.9.12.1: #i70840#: disable executable stack (linux compiled with GCC)
Diffstat (limited to 'libxmlsec')
| -rw-r--r-- | libxmlsec/makefile.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index f7882b7ee3da..7a260c90bc70 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.10 $ # -# last change: $Author: hr $ $Date: 2006-06-19 18:58:55 $ +# last change: $Author: ihi $ $Date: 2007-03-26 12:24:02 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -99,6 +99,11 @@ xmlsec_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN' .IF "$(OS)$(COM)"=="SOLARISC52" xmlsec_LDFLAGS+=-Wl,-R'$$$$ORIGIN' .ENDIF # "$(OS)$(COM)"=="SOLARISC52" + +.IF "$(OS)$(COM)"=="LINUXGCC" +xmlsec_LDFLAGS+=-Wl,-z,noexecstack +.ENDIF + LDFLAGS:=$(xmlsec_LDFLAGS) .EXPORT: LDFLAGS @@ -112,7 +117,7 @@ LDFLAGS:=$(xmlsec_LDFLAGS) .ENDIF CONFIGURE_DIR= #CONFIGURE_ACTION=chmod 777 libxml2-config && .$/configure CFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)" LDFLAGS="$(xmlsec_LDFLAGS)" -CONFIGURE_ACTION=chmod 777 libxml2-config && .$/configure CFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)" +CONFIGURE_ACTION=chmod 777 libxml2-config && .$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)" CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no # system-mozilla needs pkgconfig to get the information about nss # FIXME: This also will enable pkg-config usage for libxml2. It *seems* |