diff options
| author | Christopher Baines <mail@cbaines.net> | 2019-02-08 19:50:29 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2019-02-08 19:50:29 +0000 |
| commit | bd06ee2de7b0db7d0067c6d58e3e375580b92cec (patch) | |
| tree | 8c75e9bd133dfc6e1d2bbd9a2fdb48483f447b16 | |
| parent | 1407c41d0a936db9616b7346bd1a7b82bb5c304d (diff) | |
| download | guix-ruby-build-system-improvements.tar guix-ruby-build-system-improvements.tar.gz | |
guix: ruby-build-system: Fix removal of extension related files.ruby-build-system-improvements
This functionality was broken, possibly to do with the vendor related changes
in the ruby build system. These changes restore the file removal functionality
at the end of the install phase.
* guix/build/ruby-build-system.scm (install): Fix removal of files related to
native extensions.
| -rw-r--r-- | guix/build/ruby-build-system.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/guix/build/ruby-build-system.scm b/guix/build/ruby-build-system.scm index 64b4400f1a..ba0de1259e 100644 --- a/guix/build/ruby-build-system.scm +++ b/guix/build/ruby-build-system.scm @@ -139,7 +139,8 @@ GEM-FLAGS are passed to the 'gem' invokation, if present." (gem-file-basename (basename gem-file)) (gem-name (substring gem-file-basename 0 - (- (string-length gem-file-basename) 4)))) + (- (string-length gem-file-basename) 4))) + (gem-dir (string-append vendor-dir "/gems/" gem-name))) (setenv "GEM_VENDOR" vendor-dir) (or (zero? @@ -165,7 +166,7 @@ GEM-FLAGS are passed to the 'gem' invokation, if present." ;; For gems with native extensions, several Makefile-related files ;; are created that contain timestamps or other elements making ;; them not reproducible. They are unnecessary so we remove them. - (when (file-exists? (string-append vendor-dir "/ext")) + (when (file-exists? (string-append gem-dir "/ext")) (for-each (lambda (file) (log-file-deletion file) (delete-file file)) @@ -174,7 +175,7 @@ GEM-FLAGS are passed to the 'gem' invokation, if present." "page-Makefile.ri") (find-files (string-append vendor-dir "/extensions") "gem_make.out") - (find-files (string-append vendor-dir "/ext") + (find-files (string-append gem-dir "/ext") "Makefile")))) #t)) |