Skip to content
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

add --disable-rpath when configuring xz #71

Merged
merged 3 commits into from
Jun 12, 2018
Merged

add --disable-rpath when configuring xz #71

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38157f6
add --disable-rpath when configuring xz
cosmicexplorer Jun 11, 2018
fe33c8f
rename version to 5.2.4-1, and add --disable-rpath to osx as well
cosmicexplorer Jun 12, 2018
73e001e
add back previous version 5.2.4
cosmicexplorer Jun 12, 2018
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
7 changes: 6 additions & 1 deletion ...ort/bin/xz/linux/x86_64/5.2.4/build-xz.sh → ...t/bin/xz/linux/x86_64/5.2.4-1/build-xz.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,12 @@ function fetch_extract_xz_source_release {

function build_xz {
local -r install_dir_abs="$1"
./configure --prefix="$install_dir_abs"

# --disable-rpath is necessary to make the xz package work "out of the box" -- otherwise at
# runtime it searches for a path in the filesystem of the VM that created it!
./configure \
--disable-rpath \
--prefix="$install_dir_abs"

make "-j${MAKE_JOBS}"

Expand Down
0 ...upport/bin/xz/linux/x86_64/5.2.4/build.sh → ...port/bin/xz/linux/x86_64/5.2.4-1/build.sh
View file
Open in desktop
File renamed without changes.
7 changes: 6 additions & 1 deletion ...upport/bin/xz/mac/10.13/5.2.4/build-xz.sh → ...port/bin/xz/mac/10.13/5.2.4-1/build-xz.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,12 @@ function fetch_extract_xz_source_release {

Copy link
Member

Choose a reason for hiding this comment

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

The idea is to leave copies of the scripts used to produce each binary, so that we could (attempt to) reproduce the build later. So this should either be a copy or a symlink to a shared copy, rather than a rename.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I added back version 5.2.4 -- I chose to keep the file as it was (without --disable-rpath) instead of using a symlink.

function build_xz {
local -r install_dir_abs="$1"
./configure --prefix="$install_dir_abs"

# --disable-rpath is necessary to make the xz package work "out of the box" -- otherwise at
# runtime it searches for a path in the filesystem of the VM that created it!
./configure \
--disable-rpath \
--prefix="$install_dir_abs"

make "-j${MAKE_JOBS}"

Expand Down
0 ...d-support/bin/xz/mac/10.13/5.2.4/build.sh → ...support/bin/xz/mac/10.13/5.2.4-1/build.sh
View file
Open in desktop
File renamed without changes.