mirror of
https://github.com/pygos/build.git
synced 2024-11-22 02:59:47 +01:00
Replace custom pkg-config with propperly set environment variables
Signed-off-by: David Oberhollenzer <goliath@infraroot.at>
This commit is contained in:
parent
60a4cf2e59
commit
0414ee80ed
5 changed files with 7 additions and 41 deletions
4
mk.sh
4
mk.sh
|
@ -95,6 +95,10 @@ cat "$PACKAGELIST"
|
|||
|
||||
echo "--- building packages ---"
|
||||
|
||||
export PKG_CONFIG_SYSROOT_DIR="$TCDIR/$TARGET"
|
||||
export PKG_CONFIG_LIBDIR="$TCDIR/$TARGET/lib/pkgconfig"
|
||||
export PKG_CONFIG_PATH="$TCDIR/$TARGET/lib/pkgconfig"
|
||||
|
||||
while read pkg; do
|
||||
include_pkg "$pkg"
|
||||
build_package
|
||||
|
|
|
@ -21,7 +21,6 @@ build() {
|
|||
ldflags="$ldflags -z noexecstack -z relro -z now"
|
||||
fi
|
||||
|
||||
PKG_CONFIG_SYSROOT_DIR="$TCDIR/$TARGET" \
|
||||
CFLAGS="-MMD -O2 $cflags" \
|
||||
LDFLAGS="$ldflags" \
|
||||
make CC=${TARGET}-gcc -C hostapd -j $NUMJOBS
|
||||
|
|
|
@ -22,14 +22,12 @@ build() {
|
|||
|
||||
CFLAGS="-O2 $cflags" \
|
||||
LDFLAGS="$ldflags" \
|
||||
PKG_CONFIG_SYSROOT_DIR="$TCDIR/$TARGET" \
|
||||
make CC="${TARGET}-gcc" PKG_CONFIG="${TARGET}-pkg-config" PREFIX= \
|
||||
make CC="${TARGET}-gcc" PREFIX= \
|
||||
SBINDIR=/bin DESTDIR="$PKGDEPLOYDIR" -j $NUMJOBS
|
||||
}
|
||||
|
||||
deploy() {
|
||||
export PKG_CONFIG_SYSROOT_DIR="$TCDIR/$TARGET"
|
||||
make CC="${TARGET}-gcc" PKG_CONFIG="${TARGET}-pkg-config" PREFIX= \
|
||||
make CC="${TARGET}-gcc" PREFIX= \
|
||||
SBINDIR=/bin DESTDIR="$PKGDEPLOYDIR" install
|
||||
|
||||
cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
|
||||
|
|
|
@ -1,35 +0,0 @@
|
|||
VERSION="0.29.2"
|
||||
SRCDIR="pkg-config-$VERSION"
|
||||
TARBALL="$SRCDIR.tar.gz"
|
||||
URL="https://pkg-config.freedesktop.org/releases/"
|
||||
SHA256SUM="6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591"
|
||||
DEPENDS="tc-pkgtool"
|
||||
|
||||
prepare() {
|
||||
return
|
||||
}
|
||||
|
||||
build() {
|
||||
$1/configure --prefix="$TCDIR" --target="$TARGET" \
|
||||
--build="$HOSTTUPLE" --host="$HOSTTUPLE" \
|
||||
--with-sysroot="$TCDIR/$TARGET" \
|
||||
--with-pc-path="$TCDIR/$TARGET/lib/pkgconfig" \
|
||||
--with-system-include-path="/include" \
|
||||
--with-system-library-path="/lib" \
|
||||
--with-internal-glib
|
||||
|
||||
make -j $NUMJOBS
|
||||
}
|
||||
|
||||
deploy() {
|
||||
make install
|
||||
|
||||
ln -s pkg-config "$TCDIR/bin/$TARGET-pkg-config"
|
||||
|
||||
touch "$PKGDEPLOYDIR/$PKGNAME.files"
|
||||
touch "$PKGDEPLOYDIR/$PKGNAME.desc"
|
||||
}
|
||||
|
||||
check_update() {
|
||||
check_update_simple "$URL" "pkg-config-" "tar.gz"
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
DEPENDS="tc-binutils crt-dev libstdc++-dev tc-pkg-config tc-file tc-pkgtool basefiles"
|
||||
DEPENDS="tc-binutils crt-dev libstdc++-dev tc-file tc-pkgtool basefiles"
|
||||
|
||||
build() {
|
||||
return
|
||||
|
|
Loading…
Reference in a new issue