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.

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

Update thirdparty/configure-native-deps.sh #16329

Merged
merged 1 commit into from Mar 31, 2019

Conversation

@diddledan
Copy link
Contributor

commented Mar 19, 2019

Add aarch64 and ppc64le architecture library to search paths.

This should allow the snap package that I maintain to be buildable on those platforms.

Update thirdparty/configure-native-deps.sh
Add aarch64 and ppc64le architecture library to search paths.
@pchote
pchote approved these changes Mar 23, 2019

@pchote pchote added the PR: Needs +2 label Mar 23, 2019

@@ -6,7 +6,7 @@
# Copy-paste the entire script into http://shellcheck.net to check.
####

locations="/lib /lib64 /usr/lib /usr/lib64 /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu /usr/lib/arm-linux-gnueabihf/ /usr/lib/mipsel-linux-gnu /usr/local/lib /opt/lib /opt/local/lib /app/lib"
locations="/lib /lib64 /usr/lib /usr/lib64 /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu /usr/lib/arm-linux-gnueabihf /usr/lib/aarch64-linux-gnu /usr/lib/powerpc64le-linux-gnu /usr/lib/mipsel-linux-gnu /usr/local/lib /opt/lib /opt/local/lib /app/lib"

This comment has been minimized.

Copy link
@obrakmann

obrakmann Mar 23, 2019

Contributor

This is becoming a bit silly now. How about this to cut down on the variants:

target_triplet="$(make -v | sed -n '2s/.* //p')"
locations="/lib /lib64 /usr/lib /usr/lib64 /usr/lib/${target_triplet} /usr/local/lib /opt/lib /opt/local/lib /app/lib"

This comment has been minimized.

Copy link
@diddledan

diddledan Mar 24, 2019

Author Contributor

there's no guarantee that they will match-up. For example on my Ubuntu machine the triplet is x86_64-linux-gnu but the above will extract x86_64-pc-linux-gnu from make -v which isn't correct.

This comment has been minimized.

Copy link
@diddledan

diddledan Mar 24, 2019

Author Contributor

we could try gcc -v which appears to show correctly in the Target field for my system. Could someone with other architectures, notably an arm and non-Ubuntus, check whether that fits their boxes, too?

This comment has been minimized.

Copy link
@pchote

pchote Mar 24, 2019

Member

The current setup will take the first thing it finds without prioritizing based on the current arch, so what if we just loop over something like $(ls /usr/lib*/*/liblua*.so*) instead? It will need to be slightly smarter than this to make sure it gets lua 5.1 and not 5.2/3.

This comment has been minimized.

Copy link
@obrakmann

obrakmann Mar 26, 2019

Contributor

Relying on gcc isn't such a good idea, we don't require gcc for anything else and so can't be sure it's even installed. But pchote's wildcard approach is ok with me.

This comment has been minimized.

Copy link
@pchote

pchote Mar 26, 2019

Member

Ideally, shouldn't we be using pkg-config to solve this? We could provide a makefile variable or environment variable override for any other cases.

This comment has been minimized.

Copy link
@obrakmann

obrakmann Mar 26, 2019

Contributor

At least on Debian/Ubuntu, the .pc file is part of the -dev package, not the regular lib package.

This comment has been minimized.

Copy link
@pchote

pchote Mar 31, 2019

Member

IMO we'd be best merging this so @diddledan can get on with packaging, and then we can find a solution in our own time.

This comment has been minimized.

Copy link
@obrakmann

obrakmann Mar 31, 2019

Contributor

yes, let's.

@obrakmann obrakmann merged commit 6289816 into OpenRA:bleed Mar 31, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@obrakmann

This comment has been minimized.

Copy link
Contributor

commented Mar 31, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.