Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit decc6a4

Browse files
author
Skip Montanaro
committed
Split OPT make variable into OPT and BASECFLAGS. The latter contains those
compiler flags which are necessary to get a clean compile. The former is for user-specified optimizer, debug, trace fiddling. See patch 640843. Add /sw/lib and /sw/include to setup.py search paths on Darwin to take advantage of fink goodies. Add scriptsinstall target to Makefile to install certain scripts from Tools/scripts directory.
1 parent dc392e3 commit decc6a4

5 files changed

Lines changed: 748 additions & 1452 deletions

File tree

Makefile.pre.in

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ MAKESETUP= $(srcdir)/Modules/makesetup
5454

5555
# Compiler options
5656
OPT= @OPT@
57-
CFLAGS= $(OPT)
57+
BASECFLAGS= @BASECFLAGS@
58+
CFLAGS= $(BASECFLAGS) $(OPT)
5859
CPPFLAGS= -I. -I$(srcdir)/Include
5960
LDFLAGS= @LDFLAGS@
6061
LDLAST= @LDLAST@
@@ -844,6 +845,13 @@ idleinstall:
844845
--install-scripts=$(BINDIR) \
845846
--install-platlib=$(DESTSHARED)
846847

848+
# This installs a few of the useful scripts in Tools/scripts
849+
scriptsinstall:
850+
SRCDIR=$(srcdir) \
851+
./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py install \
852+
--prefix=$(prefix) \
853+
--install-scripts=$(BINDIR)
854+
847855
# Build the toplevel Makefile
848856
Makefile.pre: Makefile.pre.in config.status
849857
CONFIG_FILES=Makefile.pre CONFIG_HEADERS= $(SHELL) config.status

Misc/NEWS

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,24 @@ Tools/Demos
2626
Build
2727
-----
2828

29+
- On systems which build using the configure script, compiler flags which
30+
used to be lumped together using the OPT flag have been split into two
31+
groups, OPT and BASECFLAGS. OPT is meant to carry just optimization- and
32+
debug-related flags like "-g" and "-O3". BASECFLAGS is meant to carry
33+
compiler flags that are required to get a clean compile. On some
34+
platforms (many Linux flavors in particular) BASECFLAGS will be empty by
35+
default. On others, such as Mac OS X and SCO, it will contain required
36+
flags. This change allows people building Python to override OPT without
37+
fear of clobbering compiler flags which are required to get a clean build.
38+
39+
- On Darwin/Mac OS X platforms, /sw/lib and /sw/include are added to the
40+
relevant search lists in setup.py. This allows users building Python to
41+
take advantage of the many packages available from the fink project
42+
<http://fink.sf.net/>.
43+
44+
- A new Makefile target, scriptsinstall, installs a number of useful scripts
45+
from the Tools/scripts directory.
46+
2947
C API
3048
-----
3149

0 commit comments

Comments
 (0)