Author: pfg
Date: Thu Sep 24 20:55:49 2015
New Revision: 1705145
URL: http://svn.apache.org/viewvc?rev=1705145&view=rev
Log:
i126553 - (Back)Port FreeBSD build enhancements
Bring major updates from trunk for the FreeBSD build.
This targets the FreeBSD port external libraries.
r1654282:
Fix system-serf
r1689883:
Fix system-nss
r1689959:
Fix system-jpeg
Modified:
openoffice/branches/AOO410/ (props changed)
openoffice/branches/AOO410/main/ (props changed)
openoffice/branches/AOO410/main/set_soenv.in
openoffice/branches/AOO410/main/svtools/Library_svt.mk
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfCallbacks.hxx
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfRequestProcessor.hxx
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfSession.cxx
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfTypes.hxx
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfUri.hxx
openoffice/branches/AOO410/main/xmlsecurity/source/xmlsec/nss/makefile.mk
openoffice/branches/AOO410/main/xmlsecurity/util/makefile.mk
Propchange: openoffice/branches/AOO410/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 24 20:55:49 2015
@@ -2,4 +2,4 @@
/openoffice/branches/ia2:1417739-1541842
/openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302,1669457,1669459,1669462-1669463,1669465,1694132,1702894,1702898,1702986,1702988
+/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302,1654282,1669457,1669459,1669462-1669463,1669465,1689883,1689959,1694132,1702894,1702898,1702986,1702988
Propchange: openoffice/branches/AOO410/main/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 24 20:55:49 2015
@@ -2,4 +2,4 @@
/openoffice/branches/ia2/main:1417739-1541842
/openoffice/branches/ooxml-osba/main:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01/main:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1621121,1623847,1623849-1623850,1642300-1642302,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1692551,1694132,1700135,1702894,1702898,1702986,1702988
+/openoffice/trunk/main:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1621121,1623847,1623849-1623850,1642300-1642302,1654282,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1700135,1702894,1702898,1702986,1702988
Modified: openoffice/branches/AOO410/main/set_soenv.in
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/set_soenv.in?rev=1705145&r1=1705144&r2=1705145&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/set_soenv.in (original)
+++ openoffice/branches/AOO410/main/set_soenv.in Thu Sep 24 20:55:49 2015
@@ -1828,6 +1828,8 @@ ToFile( "PKGFORMAT", "@PKGFORMAT
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" );
Modified: openoffice/branches/AOO410/main/svtools/Library_svt.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/svtools/Library_svt.mk?rev=1705145&r1=1705144&r2=1705145&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/svtools/Library_svt.mk (original)
+++ openoffice/branches/AOO410/main/svtools/Library_svt.mk Thu Sep 24 20:55:49
2015
@@ -76,6 +76,12 @@ $(eval $(call gb_Library_add_linked_libs
$(eval $(call gb_Library_set_ldflags,svt,\
$$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \
))
+ifeq ($(OS),FREEBSD)
+# JDK jpeg library on FreeBSD lives under ${JAVA_HOME}/jre/lib/${ARCH}/
+$(eval $(call gb_Library_set_ldflags,svt,\
+ $$(filter-out -L$$(JAVA_HOME)/jre/lib/%,$$(LDFLAGS)) \
+))
+endif
ifeq ($(GUIBASE),os2)
# YD FIXME above is not working... needs ldflags hack...
$(eval $(call gb_Library_set_ldflags,svt,\
Modified:
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfCallbacks.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfCallbacks.hxx?rev=1705145&r1=1705144&r2=1705145&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfCallbacks.hxx
(original)
+++ openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfCallbacks.hxx Thu
Sep 24 20:55:49 2015
@@ -23,7 +23,7 @@
#ifndef INCLUDED_CALLBACKS_HXX
#define INCLUDED_CALLBACKS_HXX
-#include <serf/serf.h>
+#include <serf.h>
extern "C" apr_status_t Serf_ConnectSetup( apr_socket_t *skt,
serf_bucket_t **read_bkt,
Modified:
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx?rev=1705145&r1=1705144&r2=1705145&view=diff
==============================================================================
---
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx
(original)
+++
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx
Thu Sep 24 20:55:49 2015
@@ -24,7 +24,7 @@
#include "SerfCopyReqProcImpl.hxx"
-#include <serf/serf.h>
+#include <serf.h>
namespace http_dav_ucp
{
Modified:
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx?rev=1705145&r1=1705144&r2=1705145&view=diff
==============================================================================
---
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
(original)
+++
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
Thu Sep 24 20:55:49 2015
@@ -24,7 +24,7 @@
#include "SerfDeleteReqProcImpl.hxx"
-#include <serf/serf.h>
+#include <serf.h>
namespace http_dav_ucp
{
Modified:
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx?rev=1705145&r1=1705144&r2=1705145&view=diff
==============================================================================
---
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
(original)
+++
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
Thu Sep 24 20:55:49 2015
@@ -24,7 +24,7 @@
#include "SerfMkColReqProcImpl.hxx"
-#include <serf/serf.h>
+#include <serf.h>
namespace http_dav_ucp
{
Modified:
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx?rev=1705145&r1=1705144&r2=1705145&view=diff
==============================================================================
---
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
(original)
+++
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
Thu Sep 24 20:55:49 2015
@@ -24,7 +24,7 @@
#include "SerfMoveReqProcImpl.hxx"
-#include <serf/serf.h>
+#include <serf.h>
namespace http_dav_ucp
{
Modified:
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx?rev=1705145&r1=1705144&r2=1705145&view=diff
==============================================================================
---
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
(original)
+++
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
Thu Sep 24 20:55:49 2015
@@ -24,7 +24,7 @@
#include "SerfPostReqProcImpl.hxx"
-#include <serf/serf.h>
+#include <serf.h>
using namespace com::sun::star;
Modified:
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx?rev=1705145&r1=1705144&r2=1705145&view=diff
==============================================================================
---
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
(original)
+++
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
Thu Sep 24 20:55:49 2015
@@ -26,7 +26,7 @@
#include "SerfPutReqProcImpl.hxx"
-#include <serf/serf.h>
+#include <serf.h>
namespace http_dav_ucp
{
Modified:
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfRequestProcessor.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfRequestProcessor.hxx?rev=1705145&r1=1705144&r2=1705145&view=diff
==============================================================================
---
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfRequestProcessor.hxx
(original)
+++
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfRequestProcessor.hxx
Thu Sep 24 20:55:49 2015
@@ -26,7 +26,7 @@
#include <apr_errno.h>
#include <apr_pools.h>
-#include <serf/serf.h>
+#include <serf.h>
#include "DAVTypes.hxx"
#include "DAVResource.hxx"
Modified:
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx?rev=1705145&r1=1705144&r2=1705145&view=diff
==============================================================================
---
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx
(original)
+++
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx
Thu Sep 24 20:55:49 2015
@@ -22,7 +22,7 @@
#ifndef INCLUDED_SERFREQUESTPROCESSORIMPL_HXX
#define INCLUDED_SERFREQUESTPROCESSORIMPL_HXX
-#include <serf/serf.h>
+#include <serf.h>
#include <sal/types.h>
#include "DAVRequestEnvironment.hxx"
Modified: openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfSession.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfSession.cxx?rev=1705145&r1=1705144&r2=1705145&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfSession.cxx
(original)
+++ openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfSession.cxx Thu
Sep 24 20:55:49 2015
@@ -30,7 +30,7 @@
#include "ucbhelper/simplecertificatevalidationrequest.hxx"
#include "AprEnv.hxx"
-#include <apr/apr_strings.h>
+#include <apr_strings.h>
#include "DAVAuthListener.hxx"
#include "SerfTypes.hxx"
Modified: openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfTypes.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfTypes.hxx?rev=1705145&r1=1705144&r2=1705145&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfTypes.hxx
(original)
+++ openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfTypes.hxx Thu Sep
24 20:55:49 2015
@@ -24,7 +24,7 @@
#ifndef INCLUDED_SERFTYPES_HXX
#define INCLUDED_SERFTYPES_HXX
-#include <serf/serf.h>
+#include <serf.h>
typedef serf_connection_t SerfConnection;
Modified: openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfUri.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfUri.hxx?rev=1705145&r1=1705144&r2=1705145&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfUri.hxx (original)
+++ openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfUri.hxx Thu Sep
24 20:55:49 2015
@@ -23,7 +23,7 @@
#ifndef INCLUDED_SERFURI_HXX
#define INCLUDED_SERFURI_HXX
-#include <apr-util/apr_uri.h>
+#include <apr_uri.h>
#include <rtl/ustring.hxx>
#include "DAVException.hxx"
Modified:
openoffice/branches/AOO410/main/xmlsecurity/source/xmlsec/nss/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/xmlsecurity/source/xmlsec/nss/makefile.mk?rev=1705145&r1=1705144&r2=1705145&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/xmlsecurity/source/xmlsec/nss/makefile.mk
(original)
+++ openoffice/branches/AOO410/main/xmlsecurity/source/xmlsec/nss/makefile.mk
Thu Sep 24 20:55:49 2015
@@ -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 \
Modified: openoffice/branches/AOO410/main/xmlsecurity/util/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/xmlsecurity/util/makefile.mk?rev=1705145&r1=1705144&r2=1705145&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/xmlsecurity/util/makefile.mk (original)
+++ openoffice/branches/AOO410/main/xmlsecurity/util/makefile.mk Thu Sep 24
20:55:49 2015
@@ -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"
