trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From iga...@apache.org
Subject svn commit: r1147296 - in /trafficserver/traffic/branches/3.0.x: ./ CHANGES STATUS mgmt/Makefile.am
Date Fri, 15 Jul 2011 19:44:29 GMT
Author: igalic
Date: Fri Jul 15 19:44:29 2011
New Revision: 1147296

URL: http://svn.apache.org/viewvc?rev=1147296&view=rev
Log:
backport TS-868

Modified:
    trafficserver/traffic/branches/3.0.x/   (props changed)
    trafficserver/traffic/branches/3.0.x/CHANGES
    trafficserver/traffic/branches/3.0.x/STATUS
    trafficserver/traffic/branches/3.0.x/mgmt/Makefile.am

Propchange: trafficserver/traffic/branches/3.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 15 19:44:29 2011
@@ -1,4 +1,4 @@
 /incubator/trafficserver/traffic/branches/dev:891823-915885
 /trafficserver/traffic/branches/ts-291:965529-991993
 /trafficserver/traffic/branches/wccp:1021790-1040544
-/trafficserver/traffic/trunk:1129268,1131080,1131473,1133066,1133071,1133639,1135769-1135770,1137111,1137775,1137844,1137846,1143116,1144094,1144096,1144746,1146414
+/trafficserver/traffic/trunk:1129268,1131080,1131473,1133066,1133071,1133639,1135769-1135770,1137111,1137775,1137844,1137846,1142523,1143116,1144094,1144096,1144746,1146414

Modified: trafficserver/traffic/branches/3.0.x/CHANGES
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/CHANGES?rev=1147296&r1=1147295&r2=1147296&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/CHANGES (original)
+++ trafficserver/traffic/branches/3.0.x/CHANGES Fri Jul 15 19:44:29 2011
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 
 Changes with Apache Traffic Server 3.0.1
+  *) [TS-868] build fails with --as-needed. Author: Ilya Barygin.
+
   *) [TS-860] Built in error for host not found looks like Internet Explorer
     error. Author: William Bardwell 
 

Modified: trafficserver/traffic/branches/3.0.x/STATUS
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/STATUS?rev=1147296&r1=1147295&r2=1147296&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/STATUS (original)
+++ trafficserver/traffic/branches/3.0.x/STATUS Fri Jul 15 19:44:29 2011
@@ -44,11 +44,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     Jira: https://issues.apache.org/jira/browse/TS-842
     +1: igalic, zwoop, amc
 
-  * Build: build fails with --as-needed --no-copy-dt-needed-entries
-    Trunk patch: http://svn.apache.org/viewvc?rev=1142523&view=rev
-    Jira: https://issues.apache.org/jira/browse/TS-868
-    +1: igalic, zwoop, amc
-
 RELEASE PROCESS
 
 The Traffic Server release process is documented at

Modified: trafficserver/traffic/branches/3.0.x/mgmt/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/mgmt/Makefile.am?rev=1147296&r1=1147295&r2=1147296&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/mgmt/Makefile.am (original)
+++ trafficserver/traffic/branches/3.0.x/mgmt/Makefile.am Fri Jul 15 19:44:29 2011
@@ -97,7 +97,7 @@ traffic_manager_LDADD = \
   $(top_builddir)/mgmt/tools/libinkconfigapi.a \
   $(top_builddir)/lib/ts/libtsutil.la \
   @LIBEXPAT@ @LIBPCRE@ \
-  @LIBSSL@ @LIBTCL@ @LIBICONV@ \
+  @LIBTCL@ @LIBICONV@ \
   -lm @LIBDL@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ \
   @LIBTHREAD@ @LIBRT@ @LIBEXECINFO@ @LIBCAP@
 
@@ -107,3 +107,6 @@ traffic_manager_LDADD += \
   $(top_builddir)/lib/wccp/libwccp.a \
   $(top_builddir)/lib/tsconfig/libtsconfig.la
 endif
+
+traffic_manager_LDADD += @LIBSSL@
+



Mime
View raw message