Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/languages
In directory vz-cvs-3.sog:/tmp/cvs-serv11567
Added Files:
python33.info python33.patch
Log Message:
Welcome to python 3.3.0.
--- NEW FILE: python33.info ---
Info2: <<
Package: python%type_pkg[python]
Version: 3.3.0
Revision: 1
Type: python 3.3
Maintainer: Daniel Johnson <[email protected]>
Depends: <<
%N-shlibs (= %v-%r),
blt-shlibs,
bzip2-shlibs,
gdbm3-shlibs,
libgettext8-shlibs,
liblzma5-shlibs,
libncursesw5-shlibs,
openssl100-shlibs (>= 1.0.1c-1),
readline5-shlibs,
sqlite3-shlibs (>= 3.7.2-2),
tcltk (>= 8.4.1-1),
x11
<<
BuildConflicts: libquicktime0
BuildDepends: <<
blt-dev (>= 2.4z-15),
bzip2-dev,
fink (>= 0.32),
gdbm3,
gettext-bin,
gettext-tools,
libgettext8-dev,
liblzma5,
libncursesw5,
readline5,
sqlite3-dev (>= 3.7.2-2),
openssl100-dev (>= 1.0.1c-1),
tcltk-dev (>= 8.4.1-1),
x11-dev
<<
Provides: argparse-py%type_pkg[python], futures-py%type_pkg[python]
Source: http://python.org/ftp/python/%v/Python-%{v}.tar.xz
Source-MD5: 2e7533b4009ac4adae62a7797a442e7a
Source2: http://www.python.org/ftp/python/doc/%v/python-%v-docs-html.tar.bz2
Source2-MD5: d8de7264eb5b03b54044825b765324c7
PatchFile: %n.patch
PatchFile-MD5: 4471d36c13d7efbf30ce72ddec685027
PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
UseMaxBuildJobs: true
ConfigureParams: --enable-shared --with-dbmliborder=gdbm
--enable-loadable-sqlite-extensions
CompileScript: <<
#!/bin/sh -ex
darwin_vers=`uname -r | cut -d. -f1`
if [ "$darwin_vers" -ge 11 ]; then
perl -pi -e 's/ -lSystemStubs//' ./configure
perl -pi -e 's/-O3/-fwrapv -O3/' ./configure
fi
if [ "%m" = "x86_64" ]; then
#perl -pi.bak -e 's|num_missing != 2:|num_missing != 2:|g'
./setup.py
# Architecture:x86_64 has tcltk-8.5.x, other arch have 8.4.x
perl -pi.bak -e "s/8.4\'/8.5\'/" ./setup.py
fi
%{default_script}
<<
InfoTest: <<
TestScript: <<
LANG=en_US.UTF-8 make -k test EXTRATESTOPTS='-w -unone -x
test_httpservers' || exit 2
# Remove stray .pyc that get made during tests to keep
validator happy.
find ./Tools -name "*.pyc" -delete
find ./Tools -name "__pycache__" -delete
<<
<<
InstallScript: <<
#!/bin/sh -ex
# _sysconfigdata.py contains build-time variables that point to %b.
# This is harmless but upsets fink's validator.
# Change to %p/lib to make fink happy.
perl -pi -e 's,%b,%p/lib,' Lib/_sysconfigdata.py
# install fails with -j greater than 1
export MAKEFLAGS=-j1
make install DESTDIR=%d
# we don't want -lintl to appear in LIBS otherwise python-config will
propagate it
perl -pi -e 's/-lintl //'
%i/lib/python%type_raw[python]/config-%type_raw[python]m/Makefile
# fix all main things to be python-versioned filenames with
# unversioned symlinks to them
pushd %i/bin
for f in idle3 pydoc3 pyvenv; do
mv ${f} ${f}-%type_raw[python]
ln -s ${f}-%type_raw[python] %i/bin/${f}
done
#Remove this for now to avoid conflicting with 'python' package.
rm 2to3
popd
ln -s python%type_raw[python].1 %i/share/man/man1/python3.1
# install some docs and other useful tidbits
rm -rf Misc/RPM
/bin/cp -R Misc Tools %i/lib/python%type_raw[python]
mkdir -p %i/share/doc/%n/html
/bin/cp -R ../python-%v-docs-html/ %i/share/doc/%n/html
<<
SplitOff: <<
Package: %N-shlibs
Depends: libgettext8-shlibs
Files:
lib/python%type_raw[python]/config-%type_raw[python]m/libpython%type_raw[python]m.dylib
Shlibs:
%p/lib/python%type_raw[python]/config-%type_raw[python]m/libpython3.3m.dylib
3.3.0 %n (>= 3.3.0-1)
DocFiles: README LICENSE
<<
SplitOff2: <<
Package: python3
Depends: %N (>= %v-%r)
Files: <<
bin/idle3
bin/pydoc3
bin/python3
bin/python3-config
lib/pkgconfig/python3.pc
share/man/man1/python3.1
<<
DocFiles: README LICENSE
Description: Generic "python3" command that invokes python%type_pkg[python]
<<
DocFiles: README LICENSE
Description: Interpreted, object-oriented language
DescDetail: <<
Python is often compared to Tcl, Perl, Scheme or Java.
This package installs unix python - not the OSX Framework version.
Builds a two-level namespace dynamic libpython (needed for koffice).
The interpretter is installed as "python%type_raw[python]", and all associated
commands are similarly named with the python-version in them. To get
the simple "python3" command, install the fink package "python3" (note:
the "python3" command there is not guaranteed to be python%type_raw[python]!).
<<
DescUsage: <<
python%type_raw[python] changes the compiler options used to compile
third-party python modules. Please do not add %type_raw[python] variants
to them without actually testing that they build cleanly.
<<
DescPackaging: <<
Patch a lot of things to impliment shared-lib support for
non-Framework build on Darwin.
Static libpython is installed in
lib/pythonX.X/config-%type_raw[python]m/ but
shared goes in %p/lib by default. Fink's packaging has always
placed manually-built shared lib in config/ along side static,
This gives consistency regardless of -search_paths_first.
Continue this practice so that -pyXX varianted packages don't
need special-casing for certain variants.
Make sure all compiled modules link against libpython%type_raw[python]
(and
propagate this to third-party compiled modules) to ensure that
all symbols resolved at compile-time to avoid packager
mistakes and user runtime surprises.
Play lots of games to make sure we get expected support
libraries.
Adjust "python3" unversioned link to be a symlink not a hard link.
Shared lib is buried next to static one instead of being in
%p/lib because that's where it's always been in the fink
package series. Why would they be in different places? Patch
-config script to continue this tradition (bug in previous
versions accidentally did the Right Thing here).
New in 3.2, .pyc files are saved in the __pycache__ directory
at the same level as the matching .py file. Any packages that
expect the .pyc file to be next to the .py file will need adjustment.
The .pyc and .so files also include the python version in the name.
<<
DescPort: <<
libpython needs to link to CF because that lib has the parent
thread that load modules that need to have CF available. See:
http://bugs.python.org/issue7085
bsddb is gone so drop db* patch and dep.
Patch setup.py to find ncursesw headers and drop libncurses5 dep.
Ensure $(LDFLAGS) is used linking libpython or else it can't find
libintl.
Patch ctypes to look in %p/lib for libraries.
<<
License: OSI-Approved
Homepage: http://www.python.org
<<
--- NEW FILE: python33.patch ---
diff -r c191d21cefaf -r dd4591c0b441 Lib/ctypes/macholib/dyld.py
--- a/Lib/ctypes/macholib/dyld.py Sun Sep 23 17:15:21 2012 +0200
+++ b/Lib/ctypes/macholib/dyld.py Tue Aug 28 15:29:06 2012 -0400
@@ -16,6 +16,7 @@
#
DEFAULT_FRAMEWORK_FALLBACK = [
os.path.expanduser("~/Library/Frameworks"),
+ "@PREFIX@/lib",
"/Library/Frameworks",
"/Network/Library/Frameworks",
"/System/Library/Frameworks",
diff -r c191d21cefaf -r dd4591c0b441 Makefile.pre.in
--- a/Makefile.pre.in Sun Sep 23 17:15:21 2012 +0200
+++ b/Makefile.pre.in Tue Aug 28 15:29:06 2012 -0400
@@ -503,8 +503,7 @@
$(BLDSHARED) $(NO_AS_NEEDED) -o $@ -Wl,-h$@ $^
libpython$(LDVERSION).dylib: $(LIBRARY_OBJS)
- $(CC) -dynamiclib -Wl,-single_module $(PY_LDFLAGS) -undefined
dynamic_lookup -Wl,-install_name,$(prefix)/lib/libpython$(LDVERSION).dylib
-Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@
$(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
-
+ $(CC) -dynamiclib -Wl,-single_module $(LDFLAGS) @LIBTOOL_CRUFT@ -o $@
$(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LDLAST)
libpython$(VERSION).sl: $(LIBRARY_OBJS)
$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM)
$(LDLAST)
@@ -899,7 +898,7 @@
# Install the interpreter with $(VERSION) affixed
# This goes into $(exec_prefix)
altbininstall: $(BUILDPYTHON)
- @for i in $(BINDIR) $(LIBDIR); \
+ @for i in $(BINDIR) $(LIBDIR) $(LIBPL); \
do \
if test ! -d $(DESTDIR)$$i; then \
echo "Creating directory $$i"; \
@@ -912,15 +911,15 @@
if test -f $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE) -o -h
$(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE); \
then rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE); \
fi; \
- (cd $(DESTDIR)$(BINDIR); $(LN) python$(LDVERSION)$(EXE)
python$(VERSION)$(EXE)); \
+ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)$(EXE)
python$(VERSION)$(EXE)); \
fi
if test -f $(LDLIBRARY); then \
if test -n "$(DLLLIBRARY)" ; then \
$(INSTALL_SHARED) $(DLLLIBRARY) $(DESTDIR)$(BINDIR); \
else \
- $(INSTALL_SHARED) $(LDLIBRARY)
$(DESTDIR)$(LIBDIR)/$(INSTSONAME); \
+ $(INSTALL_SHARED) $(LDLIBRARY)
$(DESTDIR)$(LIBPL)/$(INSTSONAME); \
if test $(LDLIBRARY) != $(INSTSONAME); then \
- (cd $(DESTDIR)$(LIBDIR); $(LN) -sf
$(INSTSONAME) $(LDLIBRARY)) \
+ (cd $(DESTDIR)$(LIBPL); $(LN) -sf $(INSTSONAME)
$(LDLIBRARY)) \
fi \
fi; \
if test -n "$(PY3LIBRARY)"; then \
diff -r c191d21cefaf -r dd4591c0b441 Misc/python-config.in
--- a/Misc/python-config.in Sun Sep 23 17:15:21 2012 +0200
+++ b/Misc/python-config.in Tue Aug 28 15:29:06 2012 -0400
@@ -47,13 +47,10 @@
elif opt in ('--libs', '--ldflags'):
libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
libs.append('-lpython' + pyver + sys.abiflags)
- # add the prefix/lib/pythonX.Y/config dir, but only if there is no
- # shared library in prefix/lib/.
+ # add the prefix/lib/pythonX.Y/config dir (fink keeps shared
+ # library there too)
if opt == '--ldflags':
- if not getvar('Py_ENABLE_SHARED'):
- libs.insert(0, '-L' + getvar('LIBPL'))
- if not getvar('PYTHONFRAMEWORK'):
- libs.extend(getvar('LINKFORSHARED').split())
+ libs.insert(0, '-L' + getvar('LIBPL'))
print(' '.join(libs))
elif opt == '--extension-suffix':
diff -r c191d21cefaf -r dd4591c0b441 Misc/python.pc.in
--- a/Misc/python.pc.in Sun Sep 23 17:15:21 2012 +0200
+++ b/Misc/python.pc.in Tue Aug 28 15:29:06 2012 -0400
@@ -1,7 +1,7 @@
# See: man pkg-config
prefix=@prefix@
exec_prefix=@exec_prefix@
-libdir=@libdir@
+libdir=@libdir@/python@VERSION@/config-@VERSION@@ABIFLAGS@
includedir=@includedir@
Name: Python
diff -r c191d21cefaf -r dd4591c0b441 Modules/_dbmmodule.c
--- a/Modules/_dbmmodule.c Sun Sep 23 17:15:21 2012 +0200
+++ b/Modules/_dbmmodule.c Tue Aug 28 15:29:06 2012 -0400
@@ -20,7 +20,7 @@
static char *which_dbm = "GNU gdbm"; /* EMX port of GDBM */
#endif
#elif defined(HAVE_GDBM_NDBM_H)
-#include <gdbm/ndbm.h>
+#include <ndbm.h>
static char *which_dbm = "GNU gdbm";
#elif defined(HAVE_GDBM_DASH_NDBM_H)
#include <gdbm-ndbm.h>
diff -r c191d21cefaf -r dd4591c0b441 Modules/posixmodule.c
--- a/Modules/posixmodule.c Sun Sep 23 17:15:21 2012 +0200
+++ b/Modules/posixmodule.c Tue Aug 28 15:29:06 2012 -0400
@@ -944,7 +944,7 @@
#endif /* MS_WINDOWS */
/* Return a dictionary corresponding to the POSIX environment table */
-#ifdef WITH_NEXT_FRAMEWORK
+#ifdef __APPLE__
/* On Darwin/MacOSX a shared library or framework has no access to
** environ directly, we must obtain it with _NSGetEnviron().
*/
@@ -971,7 +971,7 @@
d = PyDict_New();
if (d == NULL)
return NULL;
-#ifdef WITH_NEXT_FRAMEWORK
+#ifdef __APPLE__
if (environ == NULL)
environ = *_NSGetEnviron();
#endif
diff -r c191d21cefaf -r dd4591c0b441 configure
--- a/configure Sun Sep 23 17:15:21 2012 +0200
+++ b/configure Tue Aug 28 15:29:06 2012 -0400
@@ -5570,7 +5570,7 @@
;;
Darwin*)
LDLIBRARY='libpython$(LDVERSION).dylib'
- BLDLIBRARY='-L. -lpython$(LDVERSION)'
+ BLDLIBRARY="`pwd`/$LDLIBRARY"
RUNSHARED='DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}'
;;
AIX*)
@@ -8241,8 +8241,8 @@
#ARCH_RUN_32BIT="true"
fi
- LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only
${MACOSX_DEFAULT_ARCH}"
- LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name
$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+ LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs"
+ LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name
$(BINLIBDEST)/config-$(LDVERSION)/$(INSTSONAME)'
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION)
-current_version $(VERSION)';;
esac
@@ -8357,15 +8357,6 @@
# Use -undefined dynamic_lookup whenever possible (10.3 and
later).
# This allows an extension to be used in any Python
- if test ${MACOSX_DEPLOYMENT_TARGET} '>' 10.2
- then
- if test "${enable_universalsdk}"; then
- LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot
${UNIVERSALSDK} ${LDFLAGS}"
- fi
- LDSHARED='$(CC) -bundle -undefined dynamic_lookup'
- LDCXXSHARED='$(CXX) -bundle -undefined dynamic_lookup'
- BLDSHARED="$LDSHARED"
- else
LDSHARED='$(CC) -bundle'
LDCXXSHARED='$(CXX) -bundle'
if test "$enable_framework" ; then
@@ -8375,11 +8366,10 @@
LDCXXSHARED="$LDCXXSHARED
"'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else
# No framework, use the Python app as
bundle-loader
- BLDSHARED="$LDSHARED "'-bundle_loader
$(BUILDPYTHON)'
- LDSHARED="$LDSHARED "'-bundle_loader
$(BINDIR)/python$(VERSION)$(EXE)'
- LDCXXSHARED="$LDCXXSHARED "'-bundle_loader
$(BINDIR)/python$(VERSION)$(EXE)'
+ BLDSHARED="$LDSHARED "'$(BLDLIBRARY)'
+ LDSHARED="$LDSHARED
"'-L$(BINLIBDEST)/config-$(LDVERSION) -lpython$(LDVERSION)'
+ LDCXXSHARED="$LDCXXSHARED
"'-L$(BINLIBDEST)/config-$(LDVERSION) -lpython$(LDVERSION)'
fi
- fi
;;
Linux*|GNU*|QNX*)
LDSHARED='$(CC) -shared'
@@ -8488,7 +8478,7 @@
Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
# -u libsys_s pulls in all symbols in libsys
Darwin/*)
- LINKFORSHARED="$extra_undefs -framework CoreFoundation"
+ LINKFORSHARED="$extra_undefs -Wl,-framework,CoreFoundation"
if test "$enable_framework"
then
LINKFORSHARED="$LINKFORSHARED
"'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
@@ -14678,7 +14668,7 @@
if test $ac_sys_system = Darwin
then
- LIBS="$LIBS -framework CoreFoundation"
+ LIBS="$LIBS -Wl,-framework,CoreFoundation"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for %zd printf() format
support" >&5
diff -r c191d21cefaf -r dd4591c0b441 setup.py
--- a/setup.py Sun Sep 23 17:15:21 2012 +0200
+++ b/setup.py Tue Aug 28 15:29:06 2012 -0400
@@ -278,13 +278,17 @@
longest, g))
if missing:
+ num_missing=len(missing)
print()
print("Python build finished, but the necessary bits to build "
"these modules were not found:")
print_three_column(missing)
print("To find the necessary bits, look in setup.py in"
" detect_modules() for the module's name.")
+ print ("(Fink package build should have 2 missing)")
print()
+ if num_missing != 2:
+ sys.exit(1)
if self.failed:
failed = self.failed[:]
@@ -292,6 +296,7 @@
print("Failed to build these modules:")
print_three_column(failed)
print()
+ sys.exit(1)
def build_extension(self, ext):
@@ -459,8 +464,8 @@
# directories (i.e. '.' and 'Include') must be first. See issue
# 10520.
if not cross_compiling:
- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+ add_dir_to_list(self.compiler.library_dirs, '@PREFIX@/lib')
+ add_dir_to_list(self.compiler.include_dirs, '@PREFIX@/include')
# only change this for cross builds for 3.3, issues on Mageia
if cross_compiling:
self.add_gcc_paths()
@@ -1043,13 +1048,8 @@
# We hunt for #define SQLITE_VERSION "n.n.n"
# We need to find >= sqlite version 3.0.8
sqlite_incdir = sqlite_libdir = None
- sqlite_inc_paths = [ '/usr/include',
- '/usr/include/sqlite',
- '/usr/include/sqlite3',
- '/usr/local/include',
- '/usr/local/include/sqlite',
- '/usr/local/include/sqlite3',
- ]
+ sqlite_inc_paths = [ '@PREFIX@/include'
+ ]
if cross_compiling:
sqlite_inc_paths = []
MIN_SQLITE_VERSION_NUMBER = (3, 0, 8)
@@ -1062,7 +1062,7 @@
if host_platform == 'darwin':
sysroot = macosx_sdk_root()
- for d_ in inc_dirs + sqlite_inc_paths:
+ for d_ in sqlite_inc_paths:
d = d_
if host_platform == 'darwin' and is_macosx_sdk_path(d):
d = os.path.join(sysroot, d[1:])
@@ -1095,11 +1095,9 @@
sqlite_dirs_to_check = [
os.path.join(sqlite_incdir, '..', 'lib64'),
os.path.join(sqlite_incdir, '..', 'lib'),
- os.path.join(sqlite_incdir, '..', '..', 'lib64'),
- os.path.join(sqlite_incdir, '..', '..', 'lib'),
]
sqlite_libfile = self.compiler.find_library_file(
- sqlite_dirs_to_check + lib_dirs, 'sqlite3')
+ sqlite_dirs_to_check, 'sqlite3')
if sqlite_libfile:
sqlite_libdir =
[os.path.abspath(os.path.dirname(sqlite_libfile))]
@@ -1191,7 +1189,7 @@
if self.compiler.find_library_file(lib_dirs,
'gdbm_compat'):
gdbm_libs.append('gdbm_compat')
- if find_file("gdbm/ndbm.h", inc_dirs, []) is not None:
+ if find_file("ndbm.h", inc_dirs, []) is not None:
if dbm_setup_debug: print("building dbm using
gdbm")
dbmext = Extension(
'_dbm', ['_dbmmodule.c'],
@@ -1263,7 +1261,7 @@
panel_library = 'panel'
if curses_library == 'ncursesw':
curses_defines.append(('HAVE_NCURSESW', '1'))
- curses_includes.append('/usr/include/ncursesw')
+ curses_includes.append('@PREFIX@/include/ncursesw')
# Bug 1464056: If _curses.so links with ncursesw,
# _curses_panel.so must link with panelw.
panel_library = 'panelw'
@@ -1624,16 +1622,12 @@
# Rather than complicate the code below, detecting and building
# AquaTk is a separate method. Only one Tkinter will be built on
# Darwin - either AquaTk, if it is found, or X11 based Tk.
- if (host_platform == 'darwin' and
- self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
- return
# Assume we haven't found any of the libraries or include files
# The versions with dots are used on Unix, and the versions without
# dots on Windows, for detection by cygwin.
tcllib = tklib = tcl_includes = tk_includes = None
- for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3', '83',
- '8.2', '82', '8.1', '81', '8.0', '80']:
+ for version in ['8.4']:
tklib = self.compiler.find_library_file(lib_dirs,
'tk' + version)
tcllib = self.compiler.find_library_file(lib_dirs,
------------------------------------------------------------------------------
How fast is your code?
3 out of 4 devs don\\\'t know how their code performs in production.
Find out how slow your code is with AppDynamics Lite.
http://ad.doubleclick.net/clk;262219672;13503038;z?
http://info.appdynamics.com/FreeJavaPerformanceDownload.html
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
