Author: svn-role Date: Thu Mar 8 04:00:05 2018 New Revision: 1826169 URL: http://svn.apache.org/viewvc?rev=1826169&view=rev Log: Merge r1825306 from trunk:
* r1825306 Silence OSX ranlib warnings about object files with no symbols when linking with an external LZ4 library. Justification: The core build should be warning-free. Votes: +1: brane, philip, jamessan Modified: subversion/branches/1.10.x/ (props changed) subversion/branches/1.10.x/STATUS subversion/branches/1.10.x/subversion/libsvn_subr/lz4/lz4.c Propchange: subversion/branches/1.10.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 8 04:00:05 2018 @@ -100,4 +100,4 @@ /subversion/branches/verify-at-commit:1462039-1462408 /subversion/branches/verify-keep-going:1439280-1546110 /subversion/branches/wc-collate-path:1402685-1480384 -/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820044,1820046-1820047,1820518,1820627,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822587,1822591,1822996,1823202-1823203,1823211,1823327,1823791,1823966,1823989,1824033,1825024,1825045,1825215,1825266,1825721,1825736,1825778 +/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820044,1820046-1820047,1820518,1820627,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822587,1822591,1822996,1823202-1823203,1823211,1823327,1823791,1823966,1823989,1824033,1825024,1825045,1825215,1825266,1825306,1825721,1825736,1825778 Modified: subversion/branches/1.10.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1826169&r1=1826168&r2=1826169&view=diff ============================================================================== --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Thu Mar 8 04:00:05 2018 @@ -43,12 +43,3 @@ Veto-blocked changes: Approved changes: ================= - - * r1825306 - Silence OSX ranlib warnings about object files with no symbols when - linking with an external LZ4 library. - Justification: - The core build should be warning-free. - Votes: - +1: brane, philip, jamessan - Modified: subversion/branches/1.10.x/subversion/libsvn_subr/lz4/lz4.c URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_subr/lz4/lz4.c?rev=1826169&r1=1826168&r2=1826169&view=diff ============================================================================== --- subversion/branches/1.10.x/subversion/libsvn_subr/lz4/lz4.c (original) +++ subversion/branches/1.10.x/subversion/libsvn_subr/lz4/lz4.c Thu Mar 8 04:00:05 2018 @@ -1471,4 +1471,11 @@ int LZ4_decompress_fast_withPrefix64k(co } #endif /* LZ4_COMMONDEFS_ONLY */ +#else /* !SVN_INTERNAL_LZ4 */ + +/* Silence OSX ranlib warnings about object files with no symbols. */ +#include <apr.h> +extern const apr_uint32_t svn__fake__lz4internal; +const apr_uint32_t svn__fake__lz4internal = 0xdeadbeef; + #endif /* SVN_INTERNAL_LZ4 */