You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ig...@apache.org on 2011/06/21 12:49:49 UTC
svn commit: r1137952 - in /trafficserver/traffic/branches/3.0.x: ./ CHANGES
STATUS build/lzma.m4
Author: igalic
Date: Tue Jun 21 10:49:48 2011
New Revision: 1137952
URL: http://svn.apache.org/viewvc?rev=1137952&view=rev
Log:
Backport [TS-839]: Build problems when specifying lmza location.
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/build/lzma.m4
Propchange: trafficserver/traffic/branches/3.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 21 10:49:48 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,1137111,1137844,1137846
+/trafficserver/traffic/trunk:1129268,1131080,1131473,1133066,1133071,1135769-1135770,1137111,1137844,1137846
Modified: trafficserver/traffic/branches/3.0.x/CHANGES
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/CHANGES?rev=1137952&r1=1137951&r2=1137952&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/CHANGES (original)
+++ trafficserver/traffic/branches/3.0.x/CHANGES Tue Jun 21 10:49:48 2011
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 3.0.0
+ *) [TS-839] Build problems when specifying lmza location.
+
*) [TS-840] Regression checks fail (again) due to faulty assert use.
Author: Arno Toell.
Modified: trafficserver/traffic/branches/3.0.x/STATUS
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/STATUS?rev=1137952&r1=1137951&r2=1137952&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/STATUS (original)
+++ trafficserver/traffic/branches/3.0.x/STATUS Tue Jun 21 10:49:48 2011
@@ -45,11 +45,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
Jira: https://issues.apache.org/jira/browse/TS-828
+1: zwoop, zym
- * build: Build failure with custom lmza directory location.
- Trunk patch: http://svn.apache.org/viewvc?rev=1135769&view=rev
- Jira: https://issues.apache.org/jira/browse/TS-839
- +1: zwoop, igalic, zym
-
* build: remove uninstall target from build system
Trunk patch: http://svn.apache.org/viewvc?rev=1136958&view=rev
Jira: https://issues.apache.org/jira/browse/TS-842
Modified: trafficserver/traffic/branches/3.0.x/build/lzma.m4
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/build/lzma.m4?rev=1137952&r1=1137951&r2=1137952&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/build/lzma.m4 (original)
+++ trafficserver/traffic/branches/3.0.x/build/lzma.m4 Tue Jun 21 10:49:48 2011
@@ -82,7 +82,7 @@ if test "$enable_lzma" != "no"; then
if test "$lzma_base_dir" != "/usr"; then
TS_ADDTO(CPPFLAGS, [-I${lzma_include}])
TS_ADDTO(LDFLAGS, [-L${lzma_ldflags}])
- TS_ADDTO(LIBTOOL_LINK_FLAGS, [-R${zma_ldflags}])
+ TS_ADDTO(LIBTOOL_LINK_FLAGS, [-R${lzma_ldflags}])
fi
AC_CHECK_LIB(lzma, lzma_code, [lzma_have_libs=1])
if test "$lzma_have_libs" != "0"; then