Skip to content

Commit c5b7982

Browse files
bilambilam
committed
rasberry rpath
1 parent ae24360 commit c5b7982

6 files changed

Lines changed: 236 additions & 236 deletions

File tree

‎.github/workflows/jinstall.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474

7575
- name: Test Jinstall
7676
run: |
77-
# script/installxcb.sh raspberry arm64
77+
#script/installxcb.sh raspberry arm64
7878
script/testinstall.sh raspberry arm64
7979
8080
# rpi64arm -------------------------------------------------------------

‎script/installqt.sh‎

Lines changed: 73 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -11,94 +11,93 @@ echo "uname -m $(uname -m)"
1111
echo "RUNNER_ARCH $RUNNER_ARCH"
1212

1313
case $3 in
14-
6*) Qtver1="6" ;;
15-
5*) Qtver1="5" ;;
16-
*) Qtver1="4" ;;
14+
6*) Qtver1="6" ;;
15+
5*) Qtver1="5" ;;
16+
*) Qtver1="4" ;;
1717
esac
1818

19-
if [ "$2" = "x64" ] ; then
19+
if [ "$2" = "x64" ]; then
2020
arch=x86_64
21-
elif [ "$2" = "x86" ] ; then
21+
elif [ "$2" = "x86" ]; then
2222
arch=x86
23-
elif [ "$2" = "arm64" ] ; then
23+
elif [ "$2" = "arm64" ]; then
2424
arch=aarch64
25-
elif [ "$2" = "armv6l" ] ; then
25+
elif [ "$2" = "armv6l" ]; then
2626
arch=armv6l
2727
elif [ "$1" = "wasm" ]; then
2828
arch=wasm32
2929
else
30-
arch="`uname -m`"
30+
arch="$(uname -m)"
3131
fi
3232

3333
f() {
34-
sudo apt-get install --no-install-recommends -y "$@" || true ;
35-
if [ $arch = "armv6l" ] ; then
36-
if [ "$RUNNER_ARCH" = "ARM64" ] ; then
37-
sudo apt-get install --no-install-recommends -y "$@":armhf || true ;
38-
fi
39-
fi
34+
sudo apt-get install --no-install-recommends -y "$@" || true
35+
if [ $arch = "armv6l" ]; then
36+
if [ "$RUNNER_ARCH" = "ARM64" ]; then
37+
sudo apt-get install --no-install-recommends -y "$@":armhf || true
38+
fi
39+
fi
4040
}
4141
g() { sudo pkg_add "$@"; }
4242
h() { sudo pkg install -y "$@"; }
4343

44-
if [ "$1" = "linux" ] || [ "$1" = "raspberry" ] ; then
45-
if [ $Qtver1 = "4" ] ; then
46-
sudo apt-get update -y
47-
sudo apt-get upgrade -y
48-
f libqt4-dev
49-
f libqt4-opengl-dev
50-
f libqt4-svg
51-
elif [ $Qtver1 = "5" ] ; then
52-
sudo apt-get update -y
53-
sudo apt-get upgrade -y
54-
f libssh-gcrypt-4
55-
f libpulse-dev
56-
f qtbase5-dev
57-
f qtmultimedia5-dev
58-
f libqt5multimediawidgets5
59-
f libqt5opengl5
60-
f libqt5opengl5-dev
61-
f libqt5svg5
62-
f libqt5svg5-dev
63-
f qtwebengine5-dev
64-
f libqt5webkit5-dev
65-
f libqt5websockets5-dev
66-
elif [ $Qtver1 = "6" ] ; then
67-
sudo apt-get update -y
68-
sudo apt-get upgrade -y
69-
f libpulse-dev
70-
f qmake6
71-
f libqt6core5compat6
72-
f libqt6multimedia6
73-
f libqt6multimediawidgets6
74-
f libqt6opengl6
75-
f libqt6opengl6-dev
76-
f libqt6svg6
77-
f libqt6svgwidgets6
78-
f libqt6webenginewidgets6
79-
f libqt6websockets6
80-
f qt6-5compat-dev
81-
f qt6-base-dev
82-
f qt6-multimedia-dev
83-
f qt6-svg-dev
84-
f qt6-webengine-dev
85-
f qt6-websockets-dev
86-
f libxcb-cursor0
87-
fi
88-
elif [ "$1" = "openbsd" ] ; then
89-
if [ $Qtver1 = "5" ] ; then
90-
g qtbase qtmultimedia qtsvg qttools qtwebengine qtwebsockets
91-
else
92-
g qt6 qt6-qt5compat
93-
g qt6-qtsvg qt6-qtwebsockets qt6-qtmultimedia qt6-qtwebengine
44+
if [ "$1" = "linux" ] || [ "$1" = "raspberry" ]; then
45+
if [ $Qtver1 = "4" ]; then
46+
sudo apt-get update -y
47+
sudo apt-get upgrade -y
48+
f libqt4-dev
49+
f libqt4-opengl-dev
50+
f libqt4-svg
51+
elif [ $Qtver1 = "5" ]; then
52+
sudo apt-get update -y
53+
sudo apt-get upgrade -y
54+
f libssh-gcrypt-4
55+
f libpulse-dev
56+
f qtbase5-dev
57+
f qtmultimedia5-dev
58+
f libqt5multimediawidgets5
59+
f libqt5opengl5
60+
f libqt5opengl5-dev
61+
f libqt5svg5
62+
f libqt5svg5-dev
63+
f qtwebengine5-dev
64+
f libqt5webkit5-dev
65+
f libqt5websockets5-dev
66+
elif [ $Qtver1 = "6" ]; then
67+
sudo apt-get update -y
68+
sudo apt-get upgrade -y
69+
f libpulse-dev
70+
f qmake6
71+
f libqt6core5compat6
72+
f libqt6multimedia6
73+
f libqt6multimediawidgets6
74+
f libqt6opengl6
75+
f libqt6opengl6-dev
76+
f libqt6svg6
77+
f libqt6svgwidgets6
78+
f libqt6webenginewidgets6
79+
f libqt6websockets6
80+
f qt6-5compat-dev
81+
f qt6-base-dev
82+
f qt6-multimedia-dev
83+
f qt6-svg-dev
84+
f qt6-webengine-dev
85+
f qt6-websockets-dev
86+
f libxcb-cursor0
87+
fi
88+
elif [ "$1" = "openbsd" ]; then
89+
if [ $Qtver1 = "5" ]; then
90+
g qtbase qtmultimedia qtsvg qttools qtwebengine qtwebsockets
91+
else
92+
g qt6 qt6-qt5compat
93+
g qt6-qtsvg qt6-qtwebsockets qt6-qtmultimedia qt6-qtwebengine
94+
fi
95+
elif [ "$1" = "freebsd" ]; then
96+
if [ $Qtver1 = "5" ]; then
97+
h qt5-qmake qt5-buildtools qt5-core
98+
h qt5-gui qt5-opengl qt5-printsupport qt5-svg qt5-websockets qt5-multimedia qt5-webengine
99+
else
100+
h qt6 qt6-base qt6-5compat
101+
h qt6-svg qt6-websockets qt6-multimedia qt6-webengine
102+
fi
94103
fi
95-
elif [ "$1" = "freebsd" ] ; then
96-
if [ $Qtver1 = "5" ] ; then
97-
h qt5-qmake qt5-buildtools qt5-core
98-
h qt5-gui qt5-opengl qt5-printsupport qt5-svg qt5-websockets qt5-multimedia qt5-webengine
99-
else
100-
h qt6 qt6-base qt6-5compat
101-
h qt6-svg qt6-websockets qt6-multimedia qt6-webengine
102-
fi
103-
fi
104-

‎script/installxcb.sh‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,38 +9,37 @@ echo "parameters $1 $2"
99
echo "uname -m $(uname -m)"
1010
echo "RUNNER_ARCH $RUNNER_ARCH"
1111

12-
if [ "$2" = "x64" ] ; then
12+
if [ "$2" = "x64" ]; then
1313
arch=x86_64
14-
elif [ "$2" = "x86" ] ; then
14+
elif [ "$2" = "x86" ]; then
1515
arch=x86
16-
elif [ "$2" = "arm64" ] ; then
16+
elif [ "$2" = "arm64" ]; then
1717
arch=aarch64
18-
elif [ "$2" = "armv6l" ] ; then
18+
elif [ "$2" = "armv6l" ]; then
1919
arch=armv6l
2020
elif [ "$1" = "wasm" ]; then
2121
arch=wasm32
2222
else
23-
arch="`uname -m`"
23+
arch="$(uname -m)"
2424
fi
2525

2626
f() {
27-
sudo apt-get install --no-install-recommends -y "$@" || true ;
28-
if [ $arch = "armv6l" ] ; then
29-
if [ "$RUNNER_ARCH" = "ARM64" ] ; then
30-
sudo apt-get install --no-install-recommends -y "$@":armhf || true ;
31-
fi
32-
fi
27+
sudo apt-get install --no-install-recommends -y "$@" || true
28+
if [ $arch = "armv6l" ]; then
29+
if [ "$RUNNER_ARCH" = "ARM64" ]; then
30+
sudo apt-get install --no-install-recommends -y "$@":armhf || true
31+
fi
32+
fi
3333
}
3434
g() { sudo pkg_add "$@"; }
3535
h() { sudo pkg install -y "$@"; }
3636

37-
if [ "$1" = "linux" ] || [ "$1" = "raspberry" ] ; then
38-
f libpulse
39-
f libegl1
40-
f libxcb-cursor0
41-
elif [ "$1" = "openbsd" ] ; then
42-
g libxcb-cursor0
43-
elif [ "$1" = "freebsd" ] ; then
44-
g libxcb-cursor0
37+
if [ "$1" = "linux" ] || [ "$1" = "raspberry" ]; then
38+
f libpulse
39+
f libegl1
40+
f libxcb-cursor0
41+
elif [ "$1" = "openbsd" ]; then
42+
g libxcb-cursor0
43+
elif [ "$1" = "freebsd" ]; then
44+
g libxcb-cursor0
4545
fi
46-

0 commit comments

Comments
 (0)