Overview
| Comment: | tweak build infrastructure: global install script now respects prefix in all cases; update PKGBUILD to use install script correctly |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
b6c435e95a5804b025268fde7ec83b88 |
| User & Date: | lexi on 2020-03-04 12:47:31 |
| Other Links: | manifest | tags |
Context
|
2020-05-20
| ||
| 14:27 | add libk-config check-in: cfbfa7fcca user: lexi tags: trunk | |
|
2020-03-04
| ||
| 12:47 | tweak build infrastructure: global install script now respects prefix in all cases; update PKGBUILD to use install script correctly check-in: b6c435e95a user: lexi tags: trunk | |
| 06:59 | update install script check-in: 0a42ee4e26 user: lexi tags: trunk | |
Changes
Modified dist/PKGBUILD from [35af299ffd] to [fbbd050911].
32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 |
fi
cd "$srcdir/libk"
arch=$kind ./build.sh
}
package() {
export fakeroot=yes prefix="$pkgdir" build="$srcdir/$pkgname/out"
"$srcdir/$pkgname/install.sh"
# if test "$doc" = yes; then
# install -D "$srcdir/$pkgname/out/doc/html/"* -t "$pkgdir/usr/share/doc/libk/pdf/"
# install -D "$srcdir/$pkgname/out/doc/pdf/"* -t "$pkgdir/usr/share/doc/libk/html/"
# install -D "$srcdir/$pkgname/out/doc/man/"* -t "$pkgdir/usr/share/man/man3/"
# fi
#
# install -D "$srcdir/$pkgname"/out/{libk.{so,a},kboot.o} -t "$pkgdir/usr/lib/"
# install -D "$srcdir/$pkgname/out/k/"* -t "$pkgdir/usr/include/k/"
}
|
| | < < < < < < < < |
32 33 34 35 36 37 38 39 40 41 |
fi
cd "$srcdir/libk"
arch=$kind ./build.sh
}
package() {
export prefix="$pkgdir/usr" build="$srcdir/$pkgname/out"
cd "$srcdir/$pkgname" && install.sh
}
|
Modified install.sh from [e3ee508d22] to [bca498cfb3].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 |
#!/usr/bin/env bash source global/common.sh # TODO: provide "modular" install option to avoid the traditional # linux directory hierarchy on systems where this doesn't make sense. check "prefix" "a directory to install to" build="${build:-out}" bindir="${bindir:-$prefix/bin}" libdir="${libdir:-$prefix/lib}" if test "$prefix" = "/" -o "$fakeroot" = yes; then say "installing docs and headers into usr instad of /" sharedir="${sharedir:-$prefix/usr/share}" incdir="${incdir:-$prefix/usr/include}" else incdir="${incdir:-$prefix/include}" sharedir="${sharedir:-$prefix/share}" fi say "commencing install" say " - prefix: $prefix" say " - destinations:" say " * binaries: $bindir" say " * libraries: $libdir" say " * headers: $incdir" say " * shared files: $sharedir" mkdir -p "$bindir" "$libdir" "$incdir" "$sharedir" # Libraries # These may or may not exist, depending on what library build is done, so check say "installing libraries" test -e "$build/libk.a" && install -Dm644 -t "$libdir" "$build/libk.a" |
| < < < < < < | | < | | | | |
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 |
#!/usr/bin/env bash source global/common.sh # TODO: provide "modular" install option to avoid the traditional # linux directory hierarchy on systems where this doesn't make sense. check prefix 'a directory to install to' build="${build:-out}" bindir="${bindir:-$prefix/bin}" libdir="${libdir:-$prefix/lib}" incdir="${incdir:-$prefix/include}" sharedir="${sharedir:-$prefix/share}" say "commencing install" say " - prefix: $prefix" say " - destinations:" say " - binaries → $bindir" say " - libraries → $libdir" say " - headers → $incdir" say " - shared files → $sharedir" mkdir -p "$bindir" "$libdir" "$incdir" "$sharedir" # Libraries # These may or may not exist, depending on what library build is done, so check say "installing libraries" test -e "$build/libk.a" && install -Dm644 -t "$libdir" "$build/libk.a" |