Removed unnecessary code in bldpkg
Added sha512 checksums in extra/wxwidgets build file
This commit is contained in:
parent
90770531a8
commit
d4ffa5e1ac
2 changed files with 4 additions and 25 deletions
26
bldpkg
26
bldpkg
|
@ -364,16 +364,6 @@ if [ "$usetmpfs" = "1" ] && [ -n "$tmpfsdir" ] && [ -z "$tmpfscheckfailed" ] ; t
|
|||
tmp="$tmpfsdir/$app.src"
|
||||
pkg="${pkg:-$tmpfsdir/package-$app}"
|
||||
|
||||
# If number of directories exceeds 0, further check if the build directory and staging directory belonging to the
|
||||
# current build exists. If it doesn't, it means there were remnants of previous incomplete compilations belonging to other
|
||||
# package builds inside tmpfs. Warn the user that they are eating up precious RAM.
|
||||
if [ "$(ls $tmpfsdir | wc -l)" -gt 0 ] ; then
|
||||
if [ ! -d "$tmpfdir/app.src" ] && [ ! -d "$tmpfsdir/package-$app" ] ; then
|
||||
echo "[WARNING] Directories from previous potentially incomplete compiles exist in your tmpfs directory"
|
||||
echo "Kindly consider deleting them to prevent current package or any future package from running out of RAM."
|
||||
sleep 5
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
else
|
||||
# If usetmpfs is disabled, we compile in the non-TMPFS directory
|
||||
|
@ -949,9 +939,7 @@ mkfinalpkg() {
|
|||
|
||||
buildfilecleanup() {
|
||||
# Discard all temporary files
|
||||
rm -f "$parenttmp/BUILDING"
|
||||
|
||||
rm -f "$tempfile"
|
||||
rm -f "$parenttmp/BUILDING" "$tempfile"
|
||||
|
||||
if [ -z "$autobuild" ] ; then
|
||||
rm -f "$parenttmp/$app.{app,build,version}"
|
||||
|
@ -1066,18 +1054,6 @@ prepbuildoutput() {
|
|||
makeflags="$MAKEFLAGS, auto-detected"
|
||||
fi
|
||||
|
||||
|
||||
# If compiletimea is set, then do a sum total of compiletimea and packagetimea variables to get the
|
||||
# total time in seconds and use that as an argument for the runtime function. If compiletimea is not set,
|
||||
# invoke the runtime function alone on new reset $SECONDS
|
||||
#if [ -n "$compiletimea" ] && [ "$pkgstatus" = "0" ] ; then
|
||||
# finalcompiletime="$(( $compiletimea + $packagetimea ))"
|
||||
# totaltime="$( runtime $finalcompiletime )"
|
||||
#else
|
||||
# totaltime="$( runtime $SECONDS )"
|
||||
#fi
|
||||
|
||||
|
||||
# Determine if the build was successful or not
|
||||
if [ "$pkgstatus" = "0" ] ; then
|
||||
bldstatus="$(echo -e "$colourg"'Successful! :-D' "$colourd")"
|
||||
|
|
|
@ -33,3 +33,6 @@ build() {
|
|||
mkfinalpkg
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
0a789fc5e71d414e43f75b5c16076fe8b1bcd7671be0770e4269dcef66d830c1bc74e183f49db270b928862f13472666c283fe2aa98b9006681722e06100725d wxWidgets-3.0.5.1.tar.bz2
|
||||
"
|
Loading…
Reference in a new issue