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
7210025a
Commit
7210025a
authored
12 years ago
by
Gregory P. Smith
Browse files
Options
Browse Files
Download
Plain Diff
merge heads.
parents
c10f5c28
e236ad31
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
321 additions
and
298 deletions
+321
-298
Include/patchlevel.h
Include/patchlevel.h
+1
-1
Makefile.pre.in
Makefile.pre.in
+2
-2
Misc/README.OpenBSD
Misc/README.OpenBSD
+1
-1
PC/pyconfig.h
PC/pyconfig.h
+1
-1
Python/thread.c
Python/thread.c
+1
-1
README
README
+5
-5
configure
configure
+309
-286
configure.ac
configure.ac
+0
-0
pyconfig.h.in
pyconfig.h.in
+1
-1
No files found.
Include/patchlevel.h
View file @
7210025a
...
...
@@ -6,7 +6,7 @@
defined(PY_MAJOR_VERSION).
When the major or minor version changes, the VERSION variable in
configure.
in
must also be changed.
configure.
ac
must also be changed.
There is also (independent) API version information in modsupport.h.
*/
...
...
This diff is collapsed.
Click to expand it.
Makefile.pre.in
View file @
7210025a
...
...
@@ -152,7 +152,7 @@ SRCDIRS= @SRCDIRS@
SUBDIRSTOO
=
Include Lib Misc Demo
# Files and directories to be distributed
CONFIGFILES
=
configure configure.
in
acconfig.h pyconfig.h.in Makefile.pre.in
CONFIGFILES
=
configure configure.
ac
acconfig.h pyconfig.h.in Makefile.pre.in
DISTFILES
=
README ChangeLog
$(CONFIGFILES)
DISTDIRS
=
$(SUBDIRS)
$(SUBDIRSTOO)
Ext-dummy
DIST
=
$(DISTFILES)
$(DISTDIRS)
...
...
@@ -1165,7 +1165,7 @@ recheck:
$(SHELL)
config.status
--recheck
$(SHELL)
config.status
# Rebuild the configure script from configure.
in
; also rebuild pyconfig.h.in
# Rebuild the configure script from configure.
ac
; also rebuild pyconfig.h.in
autoconf
:
(
cd
$(srcdir)
;
autoconf
)
(
cd
$(srcdir)
;
autoheader
)
...
...
This diff is collapsed.
Click to expand it.
Misc/README.OpenBSD
View file @
7210025a
...
...
@@ -29,7 +29,7 @@ script to disable certain options. Search for a line that looks like:
If your version is not in that list, e.g., 3.9, add the version
number. In this case, you would just need to add a 9 after the 8.
If you modify configure.
in
, you will need to regenerate configure
If you modify configure.
ac
, you will need to regenerate configure
with autoconf.
If your version is already in the list, this is not a known problem.
...
...
This diff is collapsed.
Click to expand it.
PC/pyconfig.h
View file @
7210025a
...
...
@@ -342,7 +342,7 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */
# define SIZEOF_FPOS_T 8
# define SIZEOF_HKEY 8
# define SIZEOF_SIZE_T 8
/* configure.
in
defines HAVE_LARGEFILE_SUPPORT iff HAVE_LONG_LONG,
/* configure.
ac
defines HAVE_LARGEFILE_SUPPORT iff HAVE_LONG_LONG,
sizeof(off_t) > sizeof(long), and sizeof(PY_LONG_LONG) >= sizeof(off_t).
On Win64 the second condition is not true, but if fpos_t replaces off_t
then this is true. The uses of HAVE_LARGEFILE_SUPPORT imply that Win64
...
...
This diff is collapsed.
Click to expand it.
Python/thread.c
View file @
7210025a
...
...
@@ -24,7 +24,7 @@
#include <stdlib.h>
#ifdef __sgi
#ifndef HAVE_PTHREAD_H
/* XXX Need to check in configure.
in
*/
#ifndef HAVE_PTHREAD_H
/* XXX Need to check in configure.
ac
*/
#undef _POSIX_THREADS
#endif
#endif
...
...
This diff is collapsed.
Click to expand it.
README
View file @
7210025a
...
...
@@ -241,7 +241,7 @@ longer:
- NeXT
- Irix 4 and --with-sgi-dl
- Linux 1
- Systems defining __d6_pthread_create (configure.
in
)
- Systems defining __d6_pthread_create (configure.
ac
)
- Systems defining PY_PTHREAD_D4, PY_PTHREAD_D6,
or PY_PTHREAD_D7 in thread_pthread.h
- Systems using --with-dl-dld
...
...
@@ -680,10 +680,10 @@ platforms, additional compiler and/or linker options are required for
threads to work properly. Below is a table of those options,
collected by Bill Janssen. We would love to automate this process
more, but the information below is not enough to write a patch for the
configure.
in
file, so manual intervention is required. If you patch
the configure.
in
file and are confident that the patch works, please
configure.
ac
file, so manual intervention is required. If you patch
the configure.
ac
file and are confident that the patch works, please
send in the patch. (Don't bother patching the configure script itself
-- it is regenerated each time the configure.
in
file changes.)
-- it is regenerated each time the configure.
ac
file changes.)
Compiler switches for threads
.............................
...
...
@@ -1201,7 +1201,7 @@ RISCOS/ Files specific to RISC OS port
Tools/ Some useful programs written in Python
pyconfig.h.in Source from which pyconfig.h is created (GNU autoheader output)
configure Configuration shell script (GNU autoconf output)
configure.
in
Configuration specification (input for GNU autoconf)
configure.
ac
Configuration specification (input for GNU autoconf)
install-sh Shell script used to install files
setup.py Python script used to build extension modules
...
...
This diff is collapsed.
Click to expand it.
configure
View file @
7210025a
This diff is collapsed.
Click to expand it.
configure.
in
→
configure.
ac
View file @
7210025a
File moved
This diff is collapsed.
Click to expand it.
pyconfig.h.in
View file @
7210025a
/* pyconfig.h.in. Generated from configure.
in
by autoheader. */
/* pyconfig.h.in. Generated from configure.
ac
by autoheader. */
#ifndef Py_PYCONFIG_H
...
...
This diff is collapsed.
Click to expand it.
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