diff options
| author |   Eric Hameleers <alien@slackware.com> | 2013-04-19 13:49:23 +0200 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2013-04-19 13:49:23 +0200 |
| commit | de6c6f2c80fd22ac0367045616658e64ca336bf5 (patch) | |
| tree | 7ade648a6e377f6577f2425269cc5ee875368294 /source.local/l/pango/update-pango-querymodules | |
| parent | 71f1fe9ea5bcc0b4ddf66afe2b1c7a8b9c64d27c (diff) | |
| download | alienarm-de6c6f2c80fd22ac0367045616658e64ca336bf5.tar.gz alienarm-de6c6f2c80fd22ac0367045616658e64ca336bf5.tar.xz | |
GTK+2, GTK+3, PANGO: fix update-pango-querymodules/update-gtk-immodules-?.0
When trying to determine the host triplet for the various ARM architectures,
I made a logical error which I fixed now.
The host triplet should be properly detected. Thanks to Ahau for spotting this.
Diffstat (limited to 'source.local/l/pango/update-pango-querymodules')
| -rw-r--r-- | source.local/l/pango/update-pango-querymodules | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/source.local/l/pango/update-pango-querymodules b/source.local/l/pango/update-pango-querymodules index 1cada91..be6446d 100644 --- a/source.local/l/pango/update-pango-querymodules +++ b/source.local/l/pango/update-pango-querymodules @@ -4,24 +4,27 @@ umask 022 # Get the machine type from uname: -host=$(uname -m)-slackware-linux +mtype=$(uname -m) # Fix $host for arm arch: -case "$host" in +case "$mtype" in 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/')" + mtype="$(echo $mtype | sed -e 's/\(armv.\)/\1h/')" fi - host=$host-slackware-linux-gnueabi + host=$mtype-slackware-linux-gnueabi ;; arm*) # Softfloat: host=arm-slackware-linux-gnueabi ;; + *) + host=${mtype}-slackware-linux + ;; esac - + # Deriving /etc/pango/$host location # # We have had problems in the past with build systems |