[Python-checkins] python/dist/src Makefile.pre.in, 1.136,
1.137 configure.in, 1.429, 1.430 configure, 1.418, 1.419
jlt63 at users.sourceforge.net
jlt63 at users.sourceforge.net
Thu Sep 4 05:04:09 EDT 2003
Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1:/tmp/cvs-serv8405
Modified Files:
Makefile.pre.in configure.in configure
Log Message:
This patch enables the building of Cygwin Python with a static core
which still supports shared extensions. It takes advantage the latest
Cygwin binutils (i.e., 20030901-1) which can export symbols from
executables:
http://cygwin.com/ml/cygwin-announce/2003-09/msg00002.html
Additionally, it finally lays to rest the following mailing list
subthread:
http://mail.python.org/pipermail/python-list/2002-May/102500.html
I tested the patch under Red Hat Linux 8.0 too
Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.136
retrieving revision 1.137
diff -C2 -d -r1.136 -r1.137
*** Makefile.pre.in 13 Jul 2003 10:10:42 -0000 1.136
--- Makefile.pre.in 4 Sep 2003 11:04:04 -0000 1.137
***************
*** 380,387 ****
$(LN) -fsn Versions/Current/Resources $(PYTHONFRAMEWORKDIR)/Resources
! # This rule builds the Cygwin Python DLL
! libpython$(VERSION).dll.a: $(LIBRARY_OBJS)
! $(LDSHARED) -Wl,--out-implib=$@ -o $(DLLLIBRARY) $^ \
! $(LIBS) $(MODLIBS) $(SYSLIBS)
--- 380,391 ----
$(LN) -fsn Versions/Current/Resources $(PYTHONFRAMEWORKDIR)/Resources
! # This rule builds the Cygwin Python DLL and import library if configured
! # for a shared core library; otherwise, this rule is a noop.
! $(DLLLIBRARY) libpython$(VERSION).dll.a: $(LIBRARY_OBJS)
! if test -n "$(DLLLIBRARY)"; then \
! $(LDSHARED) -Wl,--out-implib=$@ -o $(DLLLIBRARY) $^ \
! $(LIBS) $(MODLIBS) $(SYSLIBS); \
! else true; \
! fi
Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.429
retrieving revision 1.430
diff -C2 -d -r1.429 -r1.430
*** configure.in 9 Aug 2003 09:06:52 -0000 1.429
--- configure.in 4 Sep 2003 11:04:04 -0000 1.430
***************
*** 540,543 ****
--- 540,550 ----
;;
esac
+ else # shared is disabled
+ case $ac_sys_system in
+ CYGWIN*)
+ BLDLIBRARY='$(LIBRARY)'
+ LDLIBRARY='libpython$(VERSION).dll.a'
+ ;;
+ esac
fi
***************
*** 1372,1375 ****
--- 1379,1387 ----
fi;;
esac;;
+ CYGWIN*)
+ if test $enable_shared = "no"
+ then
+ LINKFORSHARED='-Wl,--out-implib=$(LDLIBRARY)'
+ fi;;
esac
fi
Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.418
retrieving revision 1.419
diff -C2 -d -r1.418 -r1.419
*** configure 9 Aug 2003 09:06:51 -0000 1.418
--- configure 4 Sep 2003 11:04:04 -0000 1.419
***************
*** 1,4 ****
#! /bin/sh
! # From configure.in Revision: 1.428 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.57 for python 2.4.
--- 1,4 ----
#! /bin/sh
! # From configure.in Revision: 1.429 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.57 for python 2.4.
***************
*** 3620,3623 ****
--- 3620,3630 ----
;;
esac
+ else # shared is disabled
+ case $ac_sys_system in
+ CYGWIN*)
+ BLDLIBRARY='$(LIBRARY)'
+ LDLIBRARY='libpython$(VERSION).dll.a'
+ ;;
+ esac
fi
***************
*** 10193,10196 ****
--- 10200,10208 ----
fi;;
esac;;
+ CYGWIN*)
+ if test $enable_shared = "no"
+ then
+ LINKFORSHARED='-Wl,--out-implib=$(LDLIBRARY)'
+ fi;;
esac
fi
More information about the Python-checkins
mailing list