amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gcj: Add $libdir to RUNPATH.

Browse source 
* gnu/packages/gcc.scm (gcj)[arguments]: Add build phase to add library output
  directory to RUNPATH.
This commit is contained in:
Ricardo Wurmus 2015-05-08 12:36:58 +02:00
parent aa2e989e1e
commit ad12c43e97
1 changed files with 39 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

18
gnu/packages/gcc.scm
View file

@ -416,7 +416,16 @@ Go. It also includes runtime support libraries for these languages.")
,@(remove (cut string-match "--enable-languages.*" <>) ,@(remove (cut string-match "--enable-languages.*" <>)
,flags)))) ,flags))))
((#:phases phases) ((#:phases phases)
`(alist-cons-after `(modify-phases ,phases
(add-after
'unpack 'add-lib-output-to-rpath
(lambda _
(substitute* "libjava/Makefile.in"
(("libgcj_bc_dummy_LINK = .* -shared" line)
(string-append line " -Wl,-rpath=$(libdir)"))
(("libgcj(_bc)?_la_LDFLAGS =" ldflags _)
(string-append ldflags " -Wl,-rpath=$(libdir)")))))
(add-after
'install 'install-javac-and-javap-wrappers 'install 'install-javac-and-javap-wrappers
(lambda _ (lambda _
(let* ((javac (assoc-ref %build-inputs "javac.in")) (let* ((javac (assoc-ref %build-inputs "javac.in"))
@ -445,8 +454,8 @@ Go. It also includes runtime support libraries for these languages.")
(("@TOOLS_JAR@") (("@TOOLS_JAR@")
(string-append jvm "/lib/tools.jar"))) (string-append jvm "/lib/tools.jar")))
(chmod target #o755) (chmod target #o755)
#t)) #t)))
(alist-cons-after (add-after
'install 'remove-broken-or-conflicting-files 'install 'remove-broken-or-conflicting-files
(lambda _ (lambda _
(let ((out (assoc-ref %outputs "out"))) (let ((out (assoc-ref %outputs "out")))
@ -456,8 +465,7 @@ Go. It also includes runtime support libraries for these languages.")
"libjawt.so") "libjawt.so")
(find-files (string-append out "/bin") (find-files (string-append out "/bin")
".*(c\\+\\+|cpp|g\\+\\+|gcc.*)")))) ".*(c\\+\\+|cpp|g\\+\\+|gcc.*)"))))
#t) #t))))))))
,phases)))))))
(define ecj-bootstrap-4.8 (define ecj-bootstrap-4.8
(origin (origin