set_soenv.in | 2 ++
xmlsecurity/source/xmlsec/nss/makefile.mk | 16 ++++++----------
xmlsecurity/util/makefile.mk | 6 +++++-
3 files changed, 13 insertions(+), 11 deletions(-)
New commits:
commit 970b89f96ca14028328388cdc16077afd93647dc
Author: Pedro Giffuni <p...@apache.org>
Date: Wed Jul 8 14:27:07 2015 +0000
NSS build fixes
Author: Don Lewis (truckman at FreeBSD)
diff --git a/set_soenv.in b/set_soenv.in
index 2b96d28..90a2217 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1867,6 +1867,8 @@ ToFile( "PKGFORMAT", "@PKGFORMAT@", "e" );
ToFile( "SYSTEM_STDLIBS", "@SYSTEM_STDLIBS@", "e" );
ToFile( "SYSTEM_ZLIB", "@SYSTEM_ZLIB@", "e" );
ToFile( "SYSTEM_NSS", "@SYSTEM_NSS@", "e" );
+ToFile( "NSS_CFLAGS", "@NSS_CFLAGS@", "e" );
+ToFile( "NSS_LIBS", "@NSS_LIBS@", "e" );
ToFile( "SYSTEM_OPENSSL", "@SYSTEM_OPENSSL@", "e" );
ToFile( "OPENSSL_CFLAGS", "@OPENSSL_CFLAGS@", "e" );
ToFile( "OPENSSL_LIBS", "@OPENSSL_LIBS@", "e" );
diff --git a/xmlsecurity/source/xmlsec/nss/makefile.mk
b/xmlsecurity/source/xmlsec/nss/makefile.mk
index 2c298ed..3001e24 100644
--- a/xmlsecurity/source/xmlsec/nss/makefile.mk
+++ b/xmlsecurity/source/xmlsec/nss/makefile.mk
@@ -44,15 +44,11 @@ CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
.IF "$(SYSTEM_NSS)" != "YES"
MOZ_INC = $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
-NSS_INC = $(MOZ_INC)$/nss
-NSPR_INC = $(MOZ_INC)$/nspr
+NSS_CFLAGS = -I$(MOZ_INC)$/nss
+NSPR_CFLAGS = -I$(MOZ_INC)$/nspr
.ELIF "$(GUI)" == "OS2"
-NSS_INC = /@unixroot/usr/include/nss3
-NSPR_INC = /@unixroot/usr/include/nspr4
-.ELSE
-# TODO: better use pkgconfig to find the proper system include path
-NSS_INC = /usr/include/nss3
-NSPR_INC = /usr/include/nspr4
+NSS_CFLAGS = -I/@unixroot/usr/include/nss3
+NSPR_CFLAGS = I/@unixroot/usr/include/nspr4
.ENDIF
.IF "$(GUI)" == "WNT"
@@ -108,10 +104,10 @@ CDEFS += -DXMLSEC_NO_XSLT
# --- Files --------------------------------------------------------
SOLARINC += \
- -I$(NSPR_INC) \
+ $(NSPR_CFLAGS) \
-I$(PRJ)$/source$/xmlsec
-SOLARINC += -I$(NSS_INC)
+SOLARINC += $(NSS_CFLAGS)
SLOFILES = \
$(SLO)$/nssinitializer.obj \
diff --git a/xmlsecurity/util/makefile.mk b/xmlsecurity/util/makefile.mk
index 09857bd..f4b8f45 100644
--- a/xmlsecurity/util/makefile.mk
+++ b/xmlsecurity/util/makefile.mk
@@ -101,13 +101,17 @@ SHL2STDLIBS += \
SHL2STDLIBS +=-ldl
.ENDIF
-.IF "$(ENABLE_NSS_MODULE)"=="YES" && "$(SYSTEM_NSS)"!="YES"
+.IF "$(ENABLE_NSS_MODULE)"=="YES"
+.IF "$(SYSTEM_NSS)"!="YES"
.IF "$(NSPR_LIB)" != ""
SHL2STDLIBS += $(NSPR_LIB)
.ENDIF
.IF "$(NSS_LIB)" != ""
SHL2STDLIBS += $(NSS_LIB)
.ENDIF
+.ELSE
+SHL2STDLIBS += $(NSS_LIBS)
+.ENDIF
.ENDIF
.IF "$(CRYPTO_ENGINE)" == "mscrypto"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
