diff options
| author |   Eric Hameleers <alien@slackware.com> | 2013-04-13 21:23:36 +0200 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2013-04-13 21:23:36 +0200 |
| commit | 16c06bbd42b8da955ae3b25e77ffff4d3f8f853c (patch) | |
| tree | cb8290007cc101d9d5a16752ca9794860fffee85 /source.local/l/pango/update-pango-querymodules | |
| parent | 4c10c70ad1be629687d717021fc21817d929475d (diff) | |
| download | alienarm-16c06bbd42b8da955ae3b25e77ffff4d3f8f853c.tar.gz alienarm-16c06bbd42b8da955ae3b25e77ffff4d3f8f853c.tar.xz | |
Better calculation of host triplet for gtk+2, gtk+3 and pango.
The module update scripts were hard-coded for only one exception (armv7hl) to
slackwarearm, but this update will work for other arm hard-float Slackware
derivatives bootstrapped from Alien's ARM scripts.
Diffstat (limited to '')
| -rw-r--r-- | source.local/l/pango/update-pango-querymodules | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/source.local/l/pango/update-pango-querymodules b/source.local/l/pango/update-pango-querymodules index 59c747b..1cada91 100644 --- a/source.local/l/pango/update-pango-querymodules +++ b/source.local/l/pango/update-pango-querymodules @@ -8,10 +8,18 @@ host=$(uname -m)-slackware-linux # Fix $host for arm arch: case "$host" in - armv7l*) hostqq=armv7l-slackware-linux-gnueabi - readelf /usr/bin/file -A | grep -q "Tag_FP_arch" && host=armv7hl-slackware-linux-gnueabi - ;; - arm*) host=arm-slackware-linux-gnueabi ;; + armv[6,7,8]*) + if readelf /usr/bin/file -A | grep -q "Tag_ABI_VFP_args: VFP registers" + then + # Hardfloat, rewrite armv7l -> armv7hl + host="$(echo $host | sed -e 's/\(armv.\)/\1h/')" + fi + host=$host-slackware-linux-gnueabi + ;; + arm*) + # Softfloat: + host=arm-slackware-linux-gnueabi + ;; esac # Deriving /etc/pango/$host location |