Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
85755031
Commit
85755031
authored
Sep 14, 2018
by
Benjamin Peterson
Committed by
GitHub
Sep 14, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[2.7] Don't run AC_STRUCT_TIMEZONE twice. (GH-9309)
(cherry picked from commit
a4414ef2
)
parent
0b9fe173
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
76 deletions
+0
-76
configure
configure
+0
-71
configure.ac
configure.ac
+0
-5
No files found.
configure
View file @
85755031
...
@@ -14379,77 +14379,6 @@ $as_echo "#define HAVE_BROKEN_POLL 1" >>confdefs.h
...
@@ -14379,77 +14379,6 @@ $as_echo "#define HAVE_BROKEN_POLL 1" >>confdefs.h
fi
fi
# Before we can test tzset, we need to check if struct tm has a tm_zone
# (which is not required by ISO C or UNIX spec) and/or if we support
# tzname[]
ac_fn_c_check_member
"
$LINENO
"
"struct tm"
"tm_zone"
"ac_cv_member_struct_tm_tm_zone"
"#include <sys/types.h>
#include <
$ac_cv_struct_tm
>
"
if
test
"x
$ac_cv_member_struct_tm_tm_zone
"
=
xyes
;
then
:
cat
>>
confdefs.h
<<
_ACEOF
#define HAVE_STRUCT_TM_TM_ZONE 1
_ACEOF
fi
if
test
"
$ac_cv_member_struct_tm_tm_zone
"
=
yes
;
then
$as_echo
"#define HAVE_TM_ZONE 1"
>>
confdefs.h
else
ac_fn_c_check_decl
"
$LINENO
"
"tzname"
"ac_cv_have_decl_tzname"
"#include <time.h>
"
if
test
"x
$ac_cv_have_decl_tzname
"
=
xyes
;
then
:
ac_have_decl
=
1
else
ac_have_decl
=
0
fi
cat
>>
confdefs.h
<<
_ACEOF
#define HAVE_DECL_TZNAME
$ac_have_decl
_ACEOF
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking for tzname"
>
&5
$as_echo_n
"checking for tzname... "
>
&6
;
}
if
${
ac_cv_var_tzname
+
:
}
false
;
then
:
$as_echo_n
"(cached) "
>
&6
else
cat
confdefs.h -
<<
_ACEOF
>conftest.
$ac_ext
/* end confdefs.h. */
#include <time.h>
#if !HAVE_DECL_TZNAME
extern char *tzname[];
#endif
int
main ()
{
return tzname[0][0];
;
return 0;
}
_ACEOF
if
ac_fn_c_try_link
"
$LINENO
"
;
then
:
ac_cv_var_tzname
=
yes
else
ac_cv_var_tzname
=
no
fi
rm
-f
core conftest.err conftest.
$ac_objext
\
conftest
$ac_exeext
conftest.
$ac_ext
fi
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result:
$ac_cv_var_tzname
"
>
&5
$as_echo
"
$ac_cv_var_tzname
"
>
&6
;
}
if
test
$ac_cv_var_tzname
=
yes
;
then
$as_echo
"#define HAVE_TZNAME 1"
>>
confdefs.h
fi
fi
# check tzset(3) exists and works like we expect it to
# check tzset(3) exists and works like we expect it to
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking for working tzset()"
>
&5
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking for working tzset()"
>
&5
$as_echo_n
"checking for working tzset()... "
>
&6
;
}
$as_echo_n
"checking for working tzset()... "
>
&6
;
}
...
...
configure.ac
View file @
85755031
...
@@ -4413,11 +4413,6 @@ then
...
@@ -4413,11 +4413,6 @@ then
[Define if poll() sets errno on invalid file descriptors.])
[Define if poll() sets errno on invalid file descriptors.])
fi
fi
# Before we can test tzset, we need to check if struct tm has a tm_zone
# (which is not required by ISO C or UNIX spec) and/or if we support
# tzname[]
AC_STRUCT_TIMEZONE
# check tzset(3) exists and works like we expect it to
# check tzset(3) exists and works like we expect it to
AC_MSG_CHECKING(for working tzset())
AC_MSG_CHECKING(for working tzset())
AC_CACHE_VAL(ac_cv_working_tzset, [
AC_CACHE_VAL(ac_cv_working_tzset, [
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment