Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv30899/stable/main/finkinfo/languages
Added Files: python26.info python26.patch Log Message: Add python26 to stable --- NEW FILE: python26.patch --- diff -Nurd -x'*~' Python-2.6.2.orig/Makefile.pre.in Python-2.6.2/Makefile.pre.in --- Python-2.6.2.orig/Makefile.pre.in 2009-02-24 06:07:44.000000000 -0500 +++ Python-2.6.2/Makefile.pre.in 2009-04-24 02:47:01.000000000 -0400 @@ -419,8 +419,7 @@ fi libpython$(VERSION).dylib: $(LIBRARY_OBJS) - $(CC) -dynamiclib -Wl,-single_module $(LDFLAGS) -undefined dynamic_lookup -Wl,-install_name,$(prefix)/lib/libpython$(VERSION).dylib -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ - + $(CC) -dynamiclib -Wl,-single_module @LIBTOOL_CRUFT@ -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LDLAST) libpython$(VERSION).sl: $(LIBRARY_OBJS) $(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST) @@ -760,14 +759,14 @@ then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \ else true; \ fi - (cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON)) + (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) $(PYTHON)) -rm -f $(DESTDIR)$(BINDIR)/python-config (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python-config) # 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"; \ @@ -780,9 +779,9 @@ 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; \ else true; \ diff -Nurd -x'*~' Python-2.6.2.orig/Misc/python-config.in Python-2.6.2/Misc/python-config.in --- Python-2.6.2.orig/Misc/python-config.in 2007-03-31 14:56:11.000000000 -0400 +++ Python-2.6.2/Misc/python-config.in 2009-04-23 22:25:42.000000000 -0400 @@ -45,9 +45,9 @@ elif opt in ('--libs', '--ldflags'): libs = getvar('LIBS').split() + getvar('SYSLIBS').split() libs.append('-lpython'+pyver) - # add the prefix/lib/pythonX.Y/config dir, but only if there is no - # shared library in prefix/lib/. - if opt == '--ldflags' and not getvar('Py_ENABLE_SHARED'): + # add the prefix/lib/pythonX.Y/config dir (fink keeps shared + # library there too) + if opt == '--ldflags': libs.insert(0, '-L' + getvar('LIBPL')) print ' '.join(libs) diff -Nurd -x'*~' Python-2.6.2.orig/Modules/posixmodule.c Python-2.6.2/Modules/posixmodule.c --- Python-2.6.2.orig/Modules/posixmodule.c 2009-04-06 02:47:37.000000000 -0400 +++ Python-2.6.2/Modules/posixmodule.c 2009-04-23 22:25:42.000000000 -0400 @@ -344,7 +344,7 @@ #endif /* 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(). */ @@ -362,7 +362,7 @@ d = PyDict_New(); if (d == NULL) return NULL; -#ifdef WITH_NEXT_FRAMEWORK +#ifdef __APPLE__ if (environ == NULL) environ = *_NSGetEnviron(); #endif diff -Nurd -x'*~' Python-2.6.2.orig/configure Python-2.6.2/configure --- Python-2.6.2.orig/configure 2009-03-30 13:56:14.000000000 -0400 +++ Python-2.6.2/configure 2009-04-25 13:30:08.000000000 -0400 @@ -4143,7 +4143,7 @@ ;; Darwin*) LDLIBRARY='libpython$(VERSION).dylib' - BLDLIBRARY='-L. -lpython$(VERSION)' + BLDLIBRARY="$LDLIBRARY" RUNSHARED='DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}' ;; @@ -12933,7 +12933,7 @@ LIBTOOL_CRUFT="" fi LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only `arch`" - LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' + LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(BINLIBDEST)/config/$(INSTSONAME)' LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';; esac @@ -13071,14 +13071,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) $(LDFLAGS) -bundle -undefined dynamic_lookup' - BLDSHARED="$LDSHARED" - else LDSHARED='$(CC) $(LDFLAGS) -bundle' if test "$enable_framework" ; then # Link against the framework. All externals should be defined. @@ -13086,10 +13078,9 @@ LDSHARED="$LDSHARED "'$(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)' + BLDSHARED="$LDSHARED "'$(BLDLIBRARY)' + LDSHARED="$LDSHARED "'-L$(BINLIBDEST)/config -lpython$(VERSION)' fi - fi ;; Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';; BSD/OS*/4*) LDSHARED="gcc -shared";; diff -Nurd -x'*~' Python-2.6.2.orig/setup.py Python-2.6.2/setup.py --- Python-2.6.2.orig/setup.py 2009-03-31 14:20:48.000000000 -0400 +++ Python-2.6.2/setup.py 2009-04-23 22:25:43.000000000 -0400 @@ -214,12 +214,16 @@ longest, g) if missing: + num_missing=len(missing) print print "Failed to find the necessary bits to build these modules:" 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 5 missing)") print + if num_missing != 5: + sys.exit(1) if self.failed: failed = self.failed[:] @@ -227,6 +231,7 @@ print "Failed to build these modules:" print_three_column(failed) print + sys.exit(1) def build_extension(self, ext): @@ -309,9 +314,8 @@ return sys.platform def detect_modules(self): - # Ensure that /usr/local is always used - 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') # Add paths specified in the environment variables LDFLAGS and # CPPFLAGS for header and library files. @@ -614,10 +618,9 @@ depends = ['socketmodule.h']) ) # Detect SSL support for the socket module (via _ssl) search_for_ssl_incs_in = [ - '/usr/local/ssl/include', - '/usr/contrib/ssl/include/' + '@PREFIX@/lib/system-openssl/include' ] - ssl_incs = find_file('openssl/ssl.h', inc_dirs, + ssl_incs = find_file('openssl/ssl.h', [], search_for_ssl_incs_in ) if ssl_incs is not None: @@ -625,9 +628,8 @@ ['/usr/kerberos/include']) if krb5_h: ssl_incs += krb5_h - ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, - ['/usr/local/ssl/lib', - '/usr/contrib/ssl/lib/' + ssl_libs = find_library_file(self.compiler, 'ssl', [], + ['@PREFIX@/lib/system-openssl/lib' ] ) if (ssl_incs is not None and @@ -644,7 +646,7 @@ openssl_ver = 0 openssl_ver_re = re.compile( '^\s*#\s*define\s+OPENSSL_VERSION_NUMBER\s+(0x[0-9a-fA-F]+)' ) - for ssl_inc_dir in inc_dirs + search_for_ssl_incs_in: + for ssl_inc_dir in search_for_ssl_incs_in: name = os.path.join(ssl_inc_dir, 'openssl', 'opensslv.h') if os.path.isfile(name): try: @@ -741,50 +743,9 @@ # construct a list of paths to look for the header file in on # top of the normal inc_dirs. db_inc_paths = [ - '/usr/include/db4', - '/usr/local/include/db4', - '/opt/sfw/include/db4', - '/usr/include/db3', - '/usr/local/include/db3', - '/opt/sfw/include/db3', - # Fink defaults (http://fink.sourceforge.net/) - '/sw/include/db4', - '/sw/include/db3', + '@PREFIX@/include/db4' ] - # 4.x minor number specific paths - for x in gen_db_minor_ver_nums(4): - db_inc_paths.append('/usr/include/db4%d' % x) - db_inc_paths.append('/usr/include/db4.%d' % x) - db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x) - db_inc_paths.append('/usr/local/include/db4%d' % x) - db_inc_paths.append('/pkg/db-4.%d/include' % x) - db_inc_paths.append('/opt/db-4.%d/include' % x) - # MacPorts default (http://www.macports.org/) - db_inc_paths.append('/opt/local/include/db4%d' % x) - # 3.x minor number specific paths - for x in gen_db_minor_ver_nums(3): - db_inc_paths.append('/usr/include/db3%d' % x) - db_inc_paths.append('/usr/local/BerkeleyDB.3.%d/include' % x) - db_inc_paths.append('/usr/local/include/db3%d' % x) - db_inc_paths.append('/pkg/db-3.%d/include' % x) - db_inc_paths.append('/opt/db-3.%d/include' % x) - - # Add some common subdirectories for Sleepycat DB to the list, - # based on the standard include directories. This way DB3/4 gets - # picked up when it is installed in a non-standard prefix and - # the user has added that prefix into inc_dirs. - std_variants = [] - for dn in inc_dirs: - std_variants.append(os.path.join(dn, 'db3')) - std_variants.append(os.path.join(dn, 'db4')) - for x in gen_db_minor_ver_nums(4): - std_variants.append(os.path.join(dn, "db4%d"%x)) - std_variants.append(os.path.join(dn, "db4.%d"%x)) - for x in gen_db_minor_ver_nums(3): - std_variants.append(os.path.join(dn, "db3%d"%x)) - std_variants.append(os.path.join(dn, "db3.%d"%x)) - db_inc_paths = std_variants + db_inc_paths db_inc_paths = [p for p in db_inc_paths if os.path.exists(p)] db_ver_inc_map = {} @@ -889,12 +850,7 @@ # 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' ] MIN_SQLITE_VERSION_NUMBER = (3, 0, 8) MIN_SQLITE_VERSION = ".".join([str(x) @@ -903,7 +859,7 @@ # Scan the default include directories before the SQLite specific # ones. This allows one to override the copy of sqlite on OSX, # where /usr/include contains an old version of sqlite. - for d in inc_dirs + sqlite_inc_paths: + for d in sqlite_inc_paths: f = os.path.join(d, "sqlite3.h") if os.path.exists(f): if sqlite_setup_debug: print "sqlite: found %s"%f @@ -931,11 +887,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))] @@ -1533,16 +1487,12 @@ # AquaTk is a separate method. Only one Tkinter will be built on # Darwin - either AquaTk, if it is found, or X11 based Tk. platform = self.get_platform() - if (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.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, 'tcl' + version) if tklib and tcllib: --- NEW FILE: python26.info --- Package: python26 Version: 2.6.2 Revision: 1 Epoch: 1 Maintainer: Daniel Macks <dma...@netspace.org> Depends: << %N-shlibs (= %e:%v-%r), blt-shlibs, bzip2-shlibs, db47-aes-shlibs | db47-shlibs, gdbm3-shlibs, libgettext3-shlibs, libncursesw5-shlibs, readline5-shlibs, sqlite3-shlibs (>= 3.2.8-1001), tcltk (>= 8.4.1-1), x11 << BuildConflicts: libquicktime0 BuildDepends: << blt-dev (>= 2.4z-15), bzip2-dev, db47-aes | db47, fink (>= 0.24.12-1), gdbm3, gettext-bin, gettext-tools, libgettext3-dev, libncurses5 (>= 5.4-20041023-1006), libncursesw5, readline5, sqlite3-dev (>= 3.2.8-1001), system-openssl-dev, tcltk-dev (>= 8.4.1-1), x11-dev << Source: http://python.org/ftp/python/%v/Python-%v.tgz Source-MD5: 60e64fe55eb4e23abdd4d77fdad08c3d Source2: http://www.python.org/ftp/python/doc/%v/python-%v-docs-html.tar.bz2 Source2-MD5: 15a2dac727692e4ff8fe92958d4e633c PatchFile: %n.patch PatchFile-MD5: 5c499e655b585709d04be1979c081ba9 PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1 SetLDFLAGS: -L%p/lib/system-openssl/lib ConfigureParams: --enable-shared #GCC: 4.0 CompileScript: << #!/bin/sh -ex if [ "%m" = "x86_64" ]; then perl -pi.bak -e 's|num_missing != 5:|num_missing != 7:|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 # Architecture:x86_64 can't build with toolbox-glue ./configure %c --disable-toolbox-glue else ./configure %c fi make << InstallScript: << #!/bin/sh -ex make install DESTDIR=%d # don't propagate our hackery perl -pi -e 's|-L%p/lib/system-openssl/lib||' %i/lib/python2.6/config/Makefile # fix all main things to be python-versioned filenames with # unversioned symlinks to them pushd %i/bin for f in 2to3 idle pydoc smtpd.py; do mv ${f} ${f}2.6 ln -s ${f}2.6 %i/bin/${f} done popd /bin/mv %i/share/man/man1/python.1 %i/share/man/man1/python26.1 ln -s python26.1 %i/share/man/man1/python.1 # install some docs and other useful tidbits rm -rf Misc/RPM /bin/cp -R Misc Tools %i/lib/python2.6 mkdir -p %i/share/doc/%n /bin/cp -R Demo Doc %i/share/doc/%n mkdir -p %i/share/doc/%n/html /bin/cp -R ../python-%v-docs-html/ %i/share/doc/%n/html << SplitOff: << Package: %N-shlibs Files: lib/python2.6/config/libpython2.6.dylib Shlibs: %p/lib/python2.6/config/libpython2.6.dylib 2.6.0 %n (>= 1:2.6-1) DocFiles: README LICENSE << SplitOff2: << Package: python Depends: %N (>= %e:%v-%r) Files: << bin/2to3 bin/idle bin/pydoc bin/python bin/python-config bin/smtpd.py share/man/man1/python.1 << DocFiles: README LICENSE Description: Generic "python" command that invokes python26 << 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 "python2.6", and all associated commands are similarly named with the python-version in them. To get the simple "python" command, install the fink package "python" (note: the "python" command there is not guaranteed to be python2.6!). << DescUsage: << python2.6 changes the compiler options used to compile third-party python modules. Please do not add 2.6 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/ 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 libpython2.6 (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. Should use --with-pth (fink's pth package)? Play lots of games to make sure we get expected support libraries. Also make sure -L/sw/lib/system-openssl is passed before -L/sw (build system seems to confuse standard meanings and uses of CFLAGS vs CPPFLAGS vs LDFLAGS) but avoid propagating into modules that compile using distutils. Adjust "python" unversioned link to be a symlink not a hard link. Must remain Epoch'ed so that this "python" pkg to be newer than the one from lower %v pkgs. 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). Cannot use higher than db47 << License: OSI-Approved Homepage: http://www.python.org ------------------------------------------------------------------------------ The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your production scanning environment may not be a perfect world - but thanks to Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700 Series Scanner you'll get full speed at 300 dpi even with all image processing features enabled. http://p.sf.net/sfu/kodak-com _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs