diff options
| -rw-r--r-- | source.local/l/gtk+2/update-gtk-immodules-2.0 | 13 | ||||
| -rw-r--r-- | source.local/l/gtk+3/update-gtk-immodules-3.0 | 13 | ||||
| -rw-r--r-- | source.local/l/pango/update-pango-querymodules | 13 |
3 files changed, 24 insertions, 15 deletions
diff --git a/source.local/l/gtk+2/update-gtk-immodules-2.0 b/source.local/l/gtk+2/update-gtk-immodules-2.0 index 404cb0e..0fd4d08 100644 --- a/source.local/l/gtk+2/update-gtk-immodules-2.0 +++ b/source.local/l/gtk+2/update-gtk-immodules-2.0 @@ -4,22 +4,25 @@ 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/gtk-2.0/$host location diff --git a/source.local/l/gtk+3/update-gtk-immodules-3.0 b/source.local/l/gtk+3/update-gtk-immodules-3.0 index c4ce5a6..f4f5f97 100644 --- a/source.local/l/gtk+3/update-gtk-immodules-3.0 +++ b/source.local/l/gtk+3/update-gtk-immodules-3.0 @@ -4,22 +4,25 @@ 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/gtk-3.0/$host location 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 |