2 files changed, 6 insertions(+), 9 deletions(-)

M gnu/packages/libffi.scm
M gnu/packages/pypy.scm

@@ 278,11 278,3 @@ from Ruby code.  Moreover, a Ruby-FFI extension works without changes on Ruby
 and JRuby.")
     (home-page "https://wiki.github.com/ffi/ffi")
     (license bsd-3)))
-
-;; pypy needs libffi compiled with -fPIC for some reason
-(define-public libffi-pic
-  (hidden-package
-    (package/inherit libffi
-      (arguments
-       `(#:configure-flags '("--enable-portable-binary"
-                             "--without-gcc-arch" "--with-pic"))))))

@@ 119,6 119,11 @@
               (substitute* "lib-python/2.7/distutils/sysconfig_pypy.py"
                 (("\"cc ")
                  (string-append "\"" #$(cc-for-target) " ")))))
+          (add-after 'unpack 'use-libffi.so
+            (lambda _
+              (substitute* "rpython/rlib/clibffi.py"
+                (("\"libffi\\.a\"")
+                 "\"libffi.so\""))))
           (add-after 'unpack 'set-source-file-times-to-1980
             ;; copied from python package, required by zip testcase
             (lambda _


@@ 177,7 182,7 @@
      (list bzip2
            expat
            gdbm
-           libffi-pic
+           libffi
            ncurses
            openssl
            sqlite