Skip to content

Make gcc embed rpath automatically #646

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
certik merged 3 commits into from
Feb 19, 2015
Merged

Make gcc embed rpath automatically #646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62551b2
Add rpath patch
certik Feb 19, 2015
0452d39
Merge the two bash blocks
certik Feb 19, 2015
25130a3
Add a comment explaining what the patch does
certik Feb 19, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions pkgs/gcc/gcc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,16 @@ sources:
url: http://ftpmirror.gnu.org/gcc/gcc-4.9.2/gcc-4.9.2.tar.bz2

build_stages:
# Make gcc automatically embed RPATH to the proper libstdc++, libgfortran,
# libgcc and libquadmath libraries:
- name: rpath_patch
before: configure
files: [rpath.patch]
handler: bash
bash: |
patch -up1 < _hashdist/rpath.patch
sed -i "s|@@ARTIFACT@@|${ARTIFACT}|g" gcc/config/i386/gnu-user.h gcc/config/i386/gnu-user64.h
Copy link
Copy Markdown
Member Author

@certik certik Feb 19, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think these two blobs can just be merged into one. I'll do it after my gcc build finishes.

Copy link
Copy Markdown
Member Author

@certik certik Feb 19, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line assumes that ${ARTIFACT} does not contain the | character. If it does, then the sed command will break.

Copy link
Copy Markdown
Member Author

@certik certik Feb 19, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ahmadia I've searched the web and there doesn't seem to be any solution really to this, except to manually escape the variable to be substituted. I think it will also fail if the variable contains []. I am inclined to just leave this be (it should work for most paths), unless we can figure out a better solution.

Copy link
Copy Markdown

@kiwifb kiwifb Feb 19, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can use other separator but I would assume that "|" is fairly safe for a path. It is safer than ":" which we could use if there was more than one path.

Copy link
Copy Markdown
Member Author

@certik certik Feb 19, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right. The ${ARTIFACT} path can contain both : and |, so to be completely safe, one would need to escape it, but it just makes the code really messy.


- name: link_lib64_to_lib
after: install
handler: bash
Expand Down
24 changes: 24 additions & 0 deletions pkgs/gcc/rpath.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
diff --git a/gcc/config/i386/gnu-user.h b/gcc/config/i386/gnu-user.h
index e1163c9..dc09728 100644
--- a/gcc/config/i386/gnu-user.h
+++ b/gcc/config/i386/gnu-user.h
@@ -79,6 +79,7 @@ along with GCC; see the file COPYING3. If not see
%{!static: \
%{rdynamic:-export-dynamic} \
-dynamic-linker %(dynamic_linker)} \
+ -rpath @@ARTIFACT@@/lib \
%{static:-static}}"

#undef LINK_SPEC
diff --git a/gcc/config/i386/gnu-user64.h b/gcc/config/i386/gnu-user64.h
index 1c72b41..457639b 100644
--- a/gcc/config/i386/gnu-user64.h
+++ b/gcc/config/i386/gnu-user64.h
@@ -63,6 +63,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
%{" SPEC_32 ":-dynamic-linker " GNU_USER_DYNAMIC_LINKER32 "} \
%{" SPEC_64 ":-dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "} \
%{" SPEC_X32 ":-dynamic-linker " GNU_USER_DYNAMIC_LINKERX32 "}} \
+ -rpath @@ARTIFACT@@/lib \
%{static:-static}}"

#undef LINK_SPEC