abuild: apply initial fixes
* Use bash instead of 'ash'. * Use clang instead of gcc. * Don't use sudo wrapper for 'apk' package manager.
This commit is contained in:
parent
046c92e2ae
commit
98d0c10e9d
|
@ -0,0 +1,27 @@
|
||||||
|
diff -uNr abuild-3.2.0/abuild.in abuild-3.2.0.mod/abuild.in
|
||||||
|
--- abuild-3.2.0/abuild.in 2018-06-22 10:24:10.000000000 +0300
|
||||||
|
+++ abuild-3.2.0.mod/abuild.in 2018-11-18 14:02:51.382830979 +0200
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-#!/bin/ash -e
|
||||||
|
+#!/bin/bash -e
|
||||||
|
|
||||||
|
# abuild - build apk packages (light version of makepkg)
|
||||||
|
# Copyright (c) 2008-2015 Natanael Copa <ncopa@alpinelinux.org>
|
||||||
|
@@ -22,7 +22,7 @@
|
||||||
|
|
||||||
|
# defaults
|
||||||
|
: ${FAKEROOT:="fakeroot"}
|
||||||
|
-: ${SUDO_APK:="abuild-apk"}
|
||||||
|
+: ${SUDO_APK:="apk"}
|
||||||
|
: ${APK:="apk"}
|
||||||
|
: ${ADDUSER:="abuild-adduser"}
|
||||||
|
: ${ADDGROUP:="abuild-addgroup"}
|
||||||
|
@@ -2563,7 +2563,7 @@
|
||||||
|
if [ -z "$REPODEST" ]; then
|
||||||
|
warning "REPODEST is not set and is now required. Defaulting to ~/packages"
|
||||||
|
[ -n "$PKGDEST" ] && die "PKGDEST is no longer supported."
|
||||||
|
- REPODEST="~/packages"
|
||||||
|
+ REPODEST="$HOME/packages"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# for recursive action
|
|
@ -0,0 +1,23 @@
|
||||||
|
diff -uNr abuild-3.2.0/functions.sh.in abuild-3.2.0.mod/functions.sh.in
|
||||||
|
--- abuild-3.2.0/functions.sh.in 2018-06-22 10:24:10.000000000 +0300
|
||||||
|
+++ abuild-3.2.0.mod/functions.sh.in 2018-11-18 15:43:21.526170573 +0200
|
||||||
|
@@ -114,7 +114,7 @@
|
||||||
|
PACKAGER=${_PACKAGER-$PACKAGER}
|
||||||
|
USE_COLORS=${_USE_COLORS-$USE_COLORS}
|
||||||
|
|
||||||
|
- [ -z "$CBUILD" ] && CBUILD="$(gcc -dumpmachine)"
|
||||||
|
+ [ -z "$CBUILD" ] && CBUILD="$(clang -dumpmachine)"
|
||||||
|
[ -z "$CHOST" ] && CHOST="$CBUILD"
|
||||||
|
[ -z "$CTARGET" ] && CTARGET="$CHOST"
|
||||||
|
[ "$(arch_to_hostspec $CBUILD)" != "unknown" ] && CBUILD="$(arch_to_hostspec $CBUILD)"
|
||||||
|
@@ -149,8 +149,8 @@
|
||||||
|
export HOSTCXXFLAGS="$CXXFLAGS"
|
||||||
|
export HOSTCFLAGS="$CFLAGS"
|
||||||
|
export HOSTLDFLAGS="$LDFLAGS"
|
||||||
|
- export CC=${CROSS_COMPILE}gcc
|
||||||
|
- export CXX=${CROSS_COMPILE}g++
|
||||||
|
+ export CC=${CROSS_COMPILE}clang
|
||||||
|
+ export CXX=${CROSS_COMPILE}clang++
|
||||||
|
export LD=${CROSS_COMPILE}ld
|
||||||
|
export CPPFLAGS="--sysroot=${CBUILDROOT} $CPPFLAGS"
|
||||||
|
export CXXFLAGS="--sysroot=${CBUILDROOT} $CXXFLAGS"
|
Loading…
Reference in New Issue