about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--gn/packages/python24.scm28
1 files changed, 22 insertions, 6 deletions
diff --git a/gn/packages/python24.scm b/gn/packages/python24.scm
index 720694d..6a5612e 100644
--- a/gn/packages/python24.scm
+++ b/gn/packages/python24.scm
@@ -28,9 +28,29 @@
       (substitute-keyword-arguments (package-arguments python-2)
         ((#:phases phases)
          `(modify-phases ,phases
-            (add-before 'check 'delete-failing-test
+            (add-after 'unpack 'create-setup-local
+              (lambda* (#:key inputs #:allow-other-keys)
+                (let ((zlib (assoc-ref inputs "zlib"))
+                      (tcl  (assoc-ref inputs "tcl"))
+                      (tk   (assoc-ref inputs "tk"))
+                      (gdbm (assoc-ref inputs "gdbm"))
+                      (read (assoc-ref inputs "readline"))
+                      (ssl  (assoc-ref inputs "openssl")))
+                  (with-output-to-file "Modules/Setup.local"
+                    (lambda _
+                      (format #t "readline readline.c -I~a/include -L~a/lib -lreadline~@
+                              _ssl _ssl.c -DUSE_SSL -I$~a/include/openssl -L~a/lib -lssl -lcrypto~@
+                              _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT -L~a/lib -I~a/include -L~a/lib -I~a/include -ltk~a -ltcl~a~@
+                              gdbm gdbmmodule.c -I~a/include -L~a/lib -lgdbm~@
+                              zlib zlibmodule.c -I~a/include -L~a/lib -lz~%"
+read read ssl ssl tcl tcl tk tk ,(version-major+minor (package-version tcl)) ,(version-major+minor (package-version tcl)) gdbm gdbm zlib zlib))))
+                  #t))
+            (add-before 'check 'delete-failing-tests
               (lambda _
-                (delete-file "Lib/test/test_socket.py")
+                (for-each
+                  (lambda (file)
+                    (delete-file (string-append "Lib/test/" file)))
+                  '("test_socket.py" "test_anydbm.py" "test_whichdb.py" "test_zlib.py"))
                 #t))
             (add-after 'check 'find-netinet-in-h
               (lambda* (#:key inputs #:allow-other-keys)
@@ -40,10 +60,6 @@
                      (string-append glibc "/include/netinet/in.h")))
                   #t)))
             (delete 'move-tk-inter)))))
-    ;; Remove the inputs which are not found during building/testing:
-    (inputs
-     `(,@(fold alist-delete (package-inputs python-2)
-               '("bzip2" "gdbm" "tk" "openssl" "zlib"))))
     (native-search-paths
       (list (search-path-specification
               (variable "PYTHONPATH")