Skip to content

Commit b5cf71c

Browse files
asppsaasppsa
committed
Update other pkgbuild files to match rk3399 one
1 parent 8d663f8 commit b5cf71c

7 files changed

Lines changed: 22 additions & 126 deletions

File tree

‎pkgbuilds/PKGBUILD-arm‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,11 @@ pkgver() {
1919
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
2020
}
2121

22-
prepare() {
23-
cd "${srcdir}/${pkgname%-arm-git}"
24-
if [[ ! -d ./build ]]; then
25-
mkdir build && cd build
26-
cmake .. -DARM_DYNAREC=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo
27-
fi
28-
}
29-
3022
build() {
31-
cd "$srcdir/${pkgname%-arm-git}/build"
32-
make -j$(nproc)
23+
cmake -B build -S "${pkgname%-arm-git}" -DARM_DYNAREC=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
24+
make -C build
3325
}
3426

3527
package() {
36-
cd "$srcdir/${pkgname%-arm-git}/build"
37-
make DESTDIR="${pkgdir}/" install
38-
# /usr/local/bin isn't in PATH by the default,
39-
# we should move it to /usr/bin
40-
cd ${pkgdir}
41-
mv usr/local/bin/ usr/bin/
42-
# cleanup when dir is empty
43-
rmdir usr/local || exit 0
28+
make -C build DESTDIR="${pkgdir}/" install
4429
}

‎pkgbuilds/PKGBUILD-gameshell‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,11 @@ pkgver() {
1919
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
2020
}
2121

22-
prepare() {
23-
cd "${srcdir}/${pkgname%-gameshell-git}"
24-
if [[ ! -d ./build ]]; then
25-
mkdir build && cd build
26-
cmake .. -DGAMESHELL=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
27-
fi
28-
}
29-
3022
build() {
31-
cd "$srcdir/${pkgname%-gameshell-git}/build"
32-
make -j$(nproc)
23+
cmake -B build -S "${pkgname%-gameshell-git}" -DGAMESHELL=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
24+
make -C build
3325
}
3426

3527
package() {
36-
cd "$srcdir/${pkgname%-gameshell-git}/build"
37-
make DESTDIR="${pkgdir}/" install
38-
# /usr/local/bin isn't in PATH by the default,
39-
# we should move it to /usr/bin
40-
cd ${pkgdir}
41-
mv usr/local/bin/ usr/bin/
42-
# cleanup when dir is empty
43-
rmdir usr/local || exit 0
28+
make -C build DESTDIR="${pkgdir}/" install
4429
}

‎pkgbuilds/PKGBUILD-odroid‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,11 @@ pkgver() {
1919
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
2020
}
2121

22-
prepare() {
23-
cd "${srcdir}/${pkgname%-odroid-git}"
24-
if [[ ! -d ./build ]]; then
25-
mkdir build && cd build
26-
cmake .. -DODROID=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
27-
fi
28-
}
29-
3022
build() {
31-
cd "$srcdir/${pkgname%-odroid-git}/build"
32-
make -j$(nproc)
23+
cmake -B build -S "${pkgname%-odroid-git}" -DODROID=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
24+
make -C build
3325
}
3426

3527
package() {
36-
cd "$srcdir/${pkgname%-odroid-git}/build"
37-
make DESTDIR="${pkgdir}/" install
38-
# /usr/local/bin isn't in PATH by the default,
39-
# we should move it to /usr/bin
40-
cd ${pkgdir}
41-
mv usr/local/bin/ usr/bin/
42-
# cleanup when dir is empty
43-
rmdir usr/local || exit 0
28+
make -C build DESTDIR="${pkgdir}/" install
4429
}

‎pkgbuilds/PKGBUILD-pandora‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,11 @@ pkgver() {
1919
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
2020
}
2121

22-
prepare() {
23-
cd "${srcdir}/${pkgname%-pandora-git}"
24-
if [[ ! -d ./build ]]; then
25-
mkdir build && cd build
26-
cmake .. -DPANDORA=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
27-
fi
28-
}
29-
3022
build() {
31-
cd "$srcdir/${pkgname%-pandora-git}/build"
32-
make -j$(nproc)
23+
cmake -B build -S "${pkgname%-pandora-git}" -DPANDORA=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
24+
make -C build
3325
}
3426

3527
package() {
36-
cd "$srcdir/${pkgname%-git}/build"
37-
make DESTDIR="${pkgdir}/" install
38-
# /usr/local/bin isn't in PATH by the default,
39-
# we should move it to /usr/bin
40-
cd ${pkgdir}
41-
mv usr/local/bin/ usr/bin/
42-
# cleanup when dir is empty
43-
rmdir usr/local || exit 0
28+
make -C build DESTDIR="${pkgdir}/" install
4429
}

‎pkgbuilds/PKGBUILD-pyra‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,11 @@ pkgver() {
1919
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
2020
}
2121

22-
prepare() {
23-
cd "${srcdir}/${pkgname%-pyra-git}"
24-
if [[ ! -d ./build ]]; then
25-
mkdir build && cd build
26-
cmake .. -DPYRA=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
27-
fi
28-
}
29-
3022
build() {
31-
cd "$srcdir/${pkgname%-pyra-git}/build"
32-
make -j$(nproc)
23+
cmake -B build -S "${pkgname%-pyra-git}" -DPYRA=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
24+
make -C build
3325
}
3426

3527
package() {
36-
cd "$srcdir/${pkgname%-pyra-git}/build"
37-
make DESTDIR="${pkgdir}/" install
38-
# /usr/local/bin isn't in PATH by the default,
39-
# we should move it to /usr/bin
40-
cd ${pkgdir}
41-
mv usr/local/bin/ usr/bin/
42-
# cleanup when dir is empty
43-
rmdir usr/local || exit 0
28+
make -C build DESTDIR="${pkgdir}/" install
4429
}

‎pkgbuilds/PKGBUILD-raspberrypi‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ pkgver() {
2020
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
2121
}
2222

23-
prepare() {
24-
cd "${srcdir}/${pkgname%-rpi-git}"
23+
build() {
2524
# Check for Pi version number
2625
if [[ ${_pimodel} =~ "Raspberry Pi 4" ]]; then
2726
_piversion=4
@@ -36,24 +35,11 @@ prepare() {
3635
exit 1
3736
fi
3837
echo -e "\033[01m\033[01;34m==> INFO:\033[00;01m Your detected Pi verion number is: \033[01;31m${_piversion}\033[01m.\033[00m"
39-
if [[ ! -d ./build ]]; then
40-
mkdir build && cd build
41-
cmake .. -DRPI${_piversion}=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
42-
fi
43-
}
4438

45-
build() {
46-
cd "$srcdir/${pkgname%-rpi-git}/build"
47-
make -j$(nproc)
39+
cmake -B build -S "${pkgname%-rpi-git}" -DRPI${_piversion}=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
40+
make -C build
4841
}
4942

5043
package() {
51-
cd "$srcdir/${pkgname%-rpi-git}/build"
52-
make DESTDIR="${pkgdir}/" install
53-
# /usr/local/bin isn't in PATH by the default,
54-
# we should move it to /usr/bin
55-
cd ${pkgdir}
56-
mv usr/local/bin/ usr/bin/
57-
# cleanup when dir is empty
58-
rmdir usr/local || exit 0
44+
make -C build DESTDIR="${pkgdir}/" install
5945
}

‎pkgbuilds/PKGBUILD-x86‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,11 @@ pkgver() {
1818
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
1919
}
2020

21-
prepare() {
22-
cd "${srcdir}/${pkgname%-x86-git}"
23-
if [[ ! -d ./build ]]; then
24-
mkdir build && cd build
25-
cmake .. -DLD80BITS=1 -DNOALIGN=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
26-
fi
27-
}
28-
2921
build() {
30-
cd "$srcdir/${pkgname%-x86-git}/build"
31-
make -j$(nproc)
22+
cmake -B build -S "${pkgname%-x86-git}" -DLD80BITS=1 -DNOALIGN=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
23+
make -C build
3224
}
3325

3426
package() {
35-
cd "$srcdir/${pkgname%-x86-git}/build"
36-
make DESTDIR="${pkgdir}/" install
37-
# /usr/local/bin isn't in PATH by the default,
38-
# we should move it to /usr/bin
39-
cd ${pkgdir}
40-
mv usr/local/bin/ usr/bin/
41-
# cleanup when dir is empty
42-
rmdir usr/local || exit 0
27+
make -C build DESTDIR="${pkgdir}/" install
4328
}

0 commit comments

Comments
 (0)