You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by yl...@apache.org on 2019/03/22 15:18:47 UTC
svn commit: r1856064 - in /apr/apr/branches/1.7.x: ./ configure.in
Author: ylavic
Date: Fri Mar 22 15:18:47 2019
New Revision: 1856064
URL: http://svn.apache.org/viewvc?rev=1856064&view=rev
Log:
Merge r1856063 from trunk:
The string conversion to apr_off_t is strtoll when it's a long long.
Modified:
apr/apr/branches/1.7.x/ (props changed)
apr/apr/branches/1.7.x/configure.in
Propchange: apr/apr/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 22 15:18:47 2019
@@ -1,4 +1,4 @@
/apr/apr/branches/1.4.x:1003369,1101301
-/apr/apr/trunk:733052,739635,741862,741866-741867,741869,741871,745763-745764,746310,747990,748080,748361,748371,748565,748888,748902,748988,749810,760443,767895,775683,782838,783398,783958,784633,784773,788588,789050,793192-793193,794118,794485,795267,799497,800627,809745,809854,810472,811455,813063,821306,829490,831641,832904,835607,888669,892028,892159,892435,892909,896382,896653,899905,901088,902077,902090,908427,910419,910597,917819,917837-917838,923311,923320,925965,929796,930508,931973,932585,951771,960665,960671,979891,983618,989450,990435,1003338,1044440,1044447,1055657,1072165,1078845,1081462,1081495,1083038,1083242,1084662,1086695,1088023,1089031,1089129,1089438,1099348,1103310,1183683,1183685-1183686,1183688,1183693,1183698,1213382,1235047,1236970,1237078,1237507,1240472,1340286,1340288,1340470,1341193,1341196,1343233,1343243,1367050,1368819,1370494,1372018,1372022,1372093,1372849,1376957,1384764,1389077,1400200,1402868,1405985,1406690,1420106,1420109,1425356,1428809,143
8940,1438957-1438959,1442903,1449568,1456418,1459994,1460179-1460180,1460241,1460399,1460405,1462738,1462813,1470186,1470348,1475509,1478905,1480067,1481262,1481265,1484271,1487796,1489517,1496407,1502804,1510354,1516261,1523384,1523479,1523484,1523505,1523521,1523604,1523613,1523615,1523844-1523845,1523853,1524014,1524031,1528797,1528809,1529488,1529495,1529515,1529521,1529668,1530786,1530800,1530988,1531554,1531768,1531884,1532022,1533104,1533111,1533979,1534882,1535027,1535157,1536744,1538171,1539374,1539389,1539455,1539603,1541054,1541061,1541486,1541655,1541666,1541744,1542601,1542779,1543033,1543056,1548575,1550907,1551650,1551659,1558905,1559382,1559873,1559975,1561040,1561260,1561265,1561321,1561347,1561356,1561361,1561394,1561555,1571894,1575509,1578420,1587045,1587063,1587543,1587545,1588878,1588937,1589982,1593611,1593614-1593615,1593680,1594684,1594708,1595549,1597797,1597803,1604590,1604596,1604598,1605104,1610854,1611023,1611107,1611110,1611117,1611120,1611125,1611184,
1611193,1611466,1611515,1611517,1625173,1626564,1634615,1642159,1648830,1664406,1664447,1664451,1664471,1664769-1664770,1664775,1664904,1664911,1664958,1666341,1666411,1666458,1666611,1667420-1667421,1667423,1667900-1667901,1667903,1667914-1667916,1667962,1669077,1671292,1671329,1671356,1671386,1671389,1671513-1671514,1671957,1672354,1672366,1672495,1672575,1675644,1675656,1675668,1676013,1683521,1685929,1696140,1696767,1722547,1722557,1726928,1727020,1727160,1727175,1727199,1728957,1732582,1733451,1733594,1733694,1733706,1733708,1733775,1734816,1736552,1738791,1738925,1750374,1755709,1755740,1755746,1755758,1755954,1761279,1762326,1774712,1774973,1775069,1776994,1776998,1788334,1788337,1788929,1789947,1789998,1790045,1790200,1790296,1790302-1790304,1790330-1790331,1790436,1790439,1790444,1790446,1790488,1790521,1790523,1790569,1790632,1791598,1791718,1791728,1792620-1792622,1792625,1792961,1792963,1794266,1797415,1798105,1805380,1808039,1808836,1808910,1809649,1810452,1813286,18133
30,1814239-1814240,1814326,1814329,1814331,1816527,1816628,1817485,1819857-1819858,1819860-1819861,1819934-1819935,1820080,1820755,1822357,1827534,1832203,1832691,1832985,1834253,1834494,1834541,1836235,1839068,1839493,1839622,1839769,1840372,1841078,1846806,1850087,1850095,1851541-1851542,1854123,1855049,1855347,1855443-1855444,1855839-1855840,1855855,1855864,1855867,1855877,1855949,1856022,1856042-1856043,1856046,1856050
+/apr/apr/trunk:733052,739635,741862,741866-741867,741869,741871,745763-745764,746310,747990,748080,748361,748371,748565,748888,748902,748988,749810,760443,767895,775683,782838,783398,783958,784633,784773,788588,789050,793192-793193,794118,794485,795267,799497,800627,809745,809854,810472,811455,813063,821306,829490,831641,832904,835607,888669,892028,892159,892435,892909,896382,896653,899905,901088,902077,902090,908427,910419,910597,917819,917837-917838,923311,923320,925965,929796,930508,931973,932585,951771,960665,960671,979891,983618,989450,990435,1003338,1044440,1044447,1055657,1072165,1078845,1081462,1081495,1083038,1083242,1084662,1086695,1088023,1089031,1089129,1089438,1099348,1103310,1183683,1183685-1183686,1183688,1183693,1183698,1213382,1235047,1236970,1237078,1237507,1240472,1340286,1340288,1340470,1341193,1341196,1343233,1343243,1367050,1368819,1370494,1372018,1372022,1372093,1372849,1376957,1384764,1389077,1400200,1402868,1405985,1406690,1420106,1420109,1425356,1428809,143
8940,1438957-1438959,1442903,1449568,1456418,1459994,1460179-1460180,1460241,1460399,1460405,1462738,1462813,1470186,1470348,1475509,1478905,1480067,1481262,1481265,1484271,1487796,1489517,1496407,1502804,1510354,1516261,1523384,1523479,1523484,1523505,1523521,1523604,1523613,1523615,1523844-1523845,1523853,1524014,1524031,1528797,1528809,1529488,1529495,1529515,1529521,1529668,1530786,1530800,1530988,1531554,1531768,1531884,1532022,1533104,1533111,1533979,1534882,1535027,1535157,1536744,1538171,1539374,1539389,1539455,1539603,1541054,1541061,1541486,1541655,1541666,1541744,1542601,1542779,1543033,1543056,1548575,1550907,1551650,1551659,1558905,1559382,1559873,1559975,1561040,1561260,1561265,1561321,1561347,1561356,1561361,1561394,1561555,1571894,1575509,1578420,1587045,1587063,1587543,1587545,1588878,1588937,1589982,1593611,1593614-1593615,1593680,1594684,1594708,1595549,1597797,1597803,1604590,1604596,1604598,1605104,1610854,1611023,1611107,1611110,1611117,1611120,1611125,1611184,
1611193,1611466,1611515,1611517,1625173,1626564,1634615,1642159,1648830,1664406,1664447,1664451,1664471,1664769-1664770,1664775,1664904,1664911,1664958,1666341,1666411,1666458,1666611,1667420-1667421,1667423,1667900-1667901,1667903,1667914-1667916,1667962,1669077,1671292,1671329,1671356,1671386,1671389,1671513-1671514,1671957,1672354,1672366,1672495,1672575,1675644,1675656,1675668,1676013,1683521,1685929,1696140,1696767,1722547,1722557,1726928,1727020,1727160,1727175,1727199,1728957,1732582,1733451,1733594,1733694,1733706,1733708,1733775,1734816,1736552,1738791,1738925,1750374,1755709,1755740,1755746,1755758,1755954,1761279,1762326,1774712,1774973,1775069,1776994,1776998,1788334,1788337,1788929,1789947,1789998,1790045,1790200,1790296,1790302-1790304,1790330-1790331,1790436,1790439,1790444,1790446,1790488,1790521,1790523,1790569,1790632,1791598,1791718,1791728,1792620-1792622,1792625,1792961,1792963,1794266,1797415,1798105,1805380,1808039,1808836,1808910,1809649,1810452,1813286,18133
30,1814239-1814240,1814326,1814329,1814331,1816527,1816628,1817485,1819857-1819858,1819860-1819861,1819934-1819935,1820080,1820755,1822357,1827534,1832203,1832691,1832985,1834253,1834494,1834541,1836235,1839068,1839493,1839622,1839769,1840372,1841078,1846806,1850087,1850095,1851541-1851542,1854123,1855049,1855347,1855443-1855444,1855839-1855840,1855855,1855864,1855867,1855877,1855949,1856022,1856042-1856043,1856046,1856050,1856063
/apr/apr/trunk/test/testnames.c:1460405
/httpd/httpd/trunk:1604590
Modified: apr/apr/branches/1.7.x/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/configure.in?rev=1856064&r1=1856063&r2=1856064&view=diff
==============================================================================
--- apr/apr/branches/1.7.x/configure.in (original)
+++ apr/apr/branches/1.7.x/configure.in Fri Mar 22 15:18:47 2019
@@ -1958,7 +1958,7 @@ elif test "$ac_cv_type_off_t" = "yes"; t
], [
APR_CHECK_TYPES_FMT_COMPATIBLE(off_t, long long, lld, [
off_t_fmt="#define APR_OFF_T_FMT \"lld\""
- off_t_strfn='apr_strtoi64'
+ off_t_strfn='strtoll'
], [
APR_CHECK_TYPES_FMT_COMPATIBLE(off_t, $int64_value, I64d, [
off_t_fmt="#define APR_OFF_T_FMT APR_INT64_T_FMT"
Re: svn commit: r1856064 - in /apr/apr/branches/1.7.x: ./ configure.in
Posted by Yann Ylavic <yl...@gmail.com>.
Due to AC_CACHE_CHECK, when APR_CHECK_TYPES_FMT_COMPATIBLE "fails" it
prints either a "yes" or "no".
So if the root APR_CHECK_TYPES_FMT_COMPATIBLE succeeds all is good,
which is the case for off_t on your system because long is first, so
we have a single "yes".
But if the root fails, the int64 case on your system because with int
first, the [ACTION-IF-FALSE] branch is taken *but* somehow the "no"
will be printed after the alternative, so here we are.
IOW, yes/no printing for nested APR_CHECK_TYPES_FMT_COMPATIBLE depends
entirely on how/when autoconf decides to print the result.
But my autotools foo are quite limited so I can't help here..
On Fri, Mar 22, 2019 at 6:12 PM William A Rowe Jr <wr...@rowe-clan.net> wrote:
>
> Doesn't make sense, that would be a noop (unless $apr_cvname is used in the true/false condition).
>
> Somewhere you nested something oddly. I worked around nesting with my last patch to this logic for the purpose of this specific macro, but in many other autoconf cases, true/false (as we used to do) don't evaluate as you might expect them to.
>
> On Fri, Mar 22, 2019 at 11:49 AM Yann Ylavic <yl...@gmail.com> wrote:
>>
>> On Fri, Mar 22, 2019 at 4:28 PM William A Rowe Jr <wr...@rowe-clan.net> wrote:
>> > +checking whether int64_t and int use fmt %d... checking whether int64_t and long use fmt %ld... yes
>> > +no
>>
>> "yes" for %ld and "no" for %d, in stack order?
>>
>> Possibly it would print better with:
>>
>> Index: build/apr_common.m4
>> ===================================================================
>> --- build/apr_common.m4 (revision 1856042)
>> +++ build/apr_common.m4 (working copy)
>> @@ -995,9 +995,9 @@ APR_TRY_COMPILE_NO_WARNING([#include <sys/types.h>
>> ptr1 = &chk2;
>> *ptr1 = *ptr2 = 0;
>> printf("%$3 %$3", chk1, chk2);
>> -], [apr_cvname=yes
>> -$4], [apr_cvname=no
>> -$5])])
>> +], [$4
>> +apr_cvname=yes], [$5
>> +apr_cvname=no])])
>> ])
>>
>> dnl
>> --
Re: svn commit: r1856064 - in /apr/apr/branches/1.7.x: ./ configure.in
Posted by William A Rowe Jr <wr...@rowe-clan.net>.
Doesn't make sense, that would be a noop (unless $apr_cvname is used in the
true/false condition).
Somewhere you nested something oddly. I worked around nesting with my last
patch to this logic for the purpose of this specific macro, but in many
other autoconf cases, true/false (as we used to do) don't evaluate as you
might expect them to.
On Fri, Mar 22, 2019 at 11:49 AM Yann Ylavic <yl...@gmail.com> wrote:
> On Fri, Mar 22, 2019 at 4:28 PM William A Rowe Jr <wr...@rowe-clan.net>
> wrote:
> > +checking whether int64_t and int use fmt %d... checking whether int64_t
> and long use fmt %ld... yes
> > +no
>
> "yes" for %ld and "no" for %d, in stack order?
>
> Possibly it would print better with:
>
> Index: build/apr_common.m4
> ===================================================================
> --- build/apr_common.m4 (revision 1856042)
> +++ build/apr_common.m4 (working copy)
> @@ -995,9 +995,9 @@ APR_TRY_COMPILE_NO_WARNING([#include <sys/types.h>
> ptr1 = &chk2;
> *ptr1 = *ptr2 = 0;
> printf("%$3 %$3", chk1, chk2);
> -], [apr_cvname=yes
> -$4], [apr_cvname=no
> -$5])])
> +], [$4
> +apr_cvname=yes], [$5
> +apr_cvname=no])])
> ])
>
> dnl
> --
>
Re: svn commit: r1856064 - in /apr/apr/branches/1.7.x: ./ configure.in
Posted by Yann Ylavic <yl...@gmail.com>.
On Fri, Mar 22, 2019 at 6:31 PM William A Rowe Jr <wr...@rowe-clan.net> wrote:
>
> This was the fix required for APR_TRY_COMPILE_NO_WARNING... likely a function you started calling needs a similar fix, which restored the environment in time for the action-if-true / action-if-false to both behave without an unusual environment.
I don't think so, if you change the off_t case you wrote like the
below, you'll probably see the same yes..no sequence :
Index: configure.in
===================================================================
--- configure.in (revision 1856063)
+++ configure.in (working copy)
@@ -1878,14 +1878,14 @@ elif test "$ac_cv_type_off_t" = "yes"; then
# where int and long are the same size and interchangable.
off_t_value=off_t
off_t_size="$ac_cv_sizeof_off_t"
+ APR_CHECK_TYPES_FMT_COMPATIBLE(off_t, int, d, [
+ off_t_fmt="#define APR_OFF_T_FMT \"d\""
+ off_t_strfn='strtoi'
+ ], [
APR_CHECK_TYPES_FMT_COMPATIBLE(off_t, long, ld, [
off_t_fmt="#define APR_OFF_T_FMT \"ld\""
off_t_strfn='strtol'
], [
- APR_CHECK_TYPES_FMT_COMPATIBLE(off_t, int, d, [
- off_t_fmt="#define APR_OFF_T_FMT \"d\""
- off_t_strfn='strtoi'
- ], [
APR_CHECK_TYPES_FMT_COMPATIBLE(off_t, long long, lld, [
off_t_fmt="#define APR_OFF_T_FMT \"lld\""
off_t_strfn='strtoll'
--
Re: svn commit: r1856064 - in /apr/apr/branches/1.7.x: ./ configure.in
Posted by William A Rowe Jr <wr...@rowe-clan.net>.
This was the fix required for APR_TRY_COMPILE_NO_WARNING... likely a
function you started calling needs a similar fix, which restored the
environment in time for the action-if-true / action-if-false to both behave
without an unusual environment.
--- apr/apr/branches/1.7.x/build/apr_common.m4 (original)
+++ apr/apr/branches/1.7.x/build/apr_common.m4 Tue Mar 19 15:26:46 2019
@@ -511,9 +511,9 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING],
[int main(int argc, const char *const *argv) {]
[[$2]]
[ return 0; }]
- )],
- [$3], [$4])
- CFLAGS=$apr_save_CFLAGS
+ )], [CFLAGS=$apr_save_CFLAGS
+$3], [CFLAGS=$apr_save_CFLAGS
+$4])
])
dnl
On Fri, Mar 22, 2019 at 11:49 AM Yann Ylavic <yl...@gmail.com> wrote:
> On Fri, Mar 22, 2019 at 4:28 PM William A Rowe Jr <wr...@rowe-clan.net>
> wrote:
> > +checking whether int64_t and int use fmt %d... checking whether int64_t
> and long use fmt %ld... yes
> > +no
>
> "yes" for %ld and "no" for %d, in stack order?
>
> Possibly it would print better with:
>
> Index: build/apr_common.m4
> ===================================================================
> --- build/apr_common.m4 (revision 1856042)
> +++ build/apr_common.m4 (working copy)
> @@ -995,9 +995,9 @@ APR_TRY_COMPILE_NO_WARNING([#include <sys/types.h>
> ptr1 = &chk2;
> *ptr1 = *ptr2 = 0;
> printf("%$3 %$3", chk1, chk2);
> -], [apr_cvname=yes
> -$4], [apr_cvname=no
> -$5])])
> +], [$4
> +apr_cvname=yes], [$5
> +apr_cvname=no])])
> ])
>
> dnl
> --
>
Re: svn commit: r1856064 - in /apr/apr/branches/1.7.x: ./ configure.in
Posted by Yann Ylavic <yl...@gmail.com>.
On Fri, Mar 22, 2019 at 4:28 PM William A Rowe Jr <wr...@rowe-clan.net> wrote:
> +checking whether int64_t and int use fmt %d... checking whether int64_t and long use fmt %ld... yes
> +no
"yes" for %ld and "no" for %d, in stack order?
Possibly it would print better with:
Index: build/apr_common.m4
===================================================================
--- build/apr_common.m4 (revision 1856042)
+++ build/apr_common.m4 (working copy)
@@ -995,9 +995,9 @@ APR_TRY_COMPILE_NO_WARNING([#include <sys/types.h>
ptr1 = &chk2;
*ptr1 = *ptr2 = 0;
printf("%$3 %$3", chk1, chk2);
-], [apr_cvname=yes
-$4], [apr_cvname=no
-$5])])
+], [$4
+apr_cvname=yes], [$5
+apr_cvname=no])])
])
dnl
--
Re: svn commit: r1856064 - in /apr/apr/branches/1.7.x: ./ configure.in
Posted by William A Rowe Jr <wr...@rowe-clan.net>.
On Fri, Mar 22, 2019 at 10:18 AM <yl...@apache.org> wrote:
> Author: ylavic
> Date: Fri Mar 22 15:18:47 2019
> New Revision: 1856064
>
> URL: http://svn.apache.org/viewvc?rev=1856064&view=rev
> Log:
> Merge r1856063 from trunk:
>
> The string conversion to apr_off_t is strtoll when it's a long long.
One thing remains odd;
--- ../configure.log 2019-03-20 13:49:43.254852386 -0500
+++ configure.log 2019-03-22 10:05:13.886964928 -0500
@@ -267,6 +267,7 @@
checking grp.h usability... yes
checking grp.h presence... yes
checking for grp.h... yes
+checking for inttypes.h... (cached) yes
checking io.h usability... no
checking io.h presence... no
checking for io.h... no
@@ -418,10 +419,12 @@
checking for socklen_t... yes
checking size of void*... 8
checking size of char... 1
+checking size of short... 2
checking size of int... 4
checking size of long... 8
-checking size of short... 2
checking size of long long... 8
+checking whether int64_t and int use fmt %d... checking whether int64_t
and long use fmt %ld... yes
+no
checking for INT64_C... yes
checking size of pid_t... 4
checking whether ssize_t and long use fmt %ld... yes
@@ -488,7 +491,7 @@
checking for working PROCESS_SHARED locks... yes
checking for robust cross-process mutex support... yes
checking for pthread_condattr_setpshared... yes
-decision on apr_lock implementation method... SysV IPC semget()
+decision on apr_lock implementation method... pthread pshared mutex
checking if fcntl returns EACCES when F_SETLK is already held... no
checking if all interprocess locks affect threads... no
checking if POSIX sems affect threads in the same process... no
Mostly looking good but the nested tests in int64_t look like a problem.