Skip to content

Commit

Permalink
configure.meson: stop taking prefix via env var
Browse files Browse the repository at this point in the history
One have to use --prefix now.
Although in this case (if some options are passed) the build dir
must be explicitly specified.
  • Loading branch information
stsp committed Feb 16, 2024
1 parent 6c8b6c8 commit c125732
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 14 deletions.
2 changes: 1 addition & 1 deletion ci_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ else
pipx install meson
export PATH=${HOME}/.local/bin:${PATH}

PREFIX=${INST} ./configure.meson build
./configure.meson --prefix ${INST} build
meson compile --verbose -C build
fi
20 changes: 7 additions & 13 deletions configure.meson
Original file line number Diff line number Diff line change
@@ -1,27 +1,21 @@
#!/bin/sh

# set -xv
#!/usr/bin/env bash

if [ -z "$1" ] ; then
BLD="build"
BLDH="build"
else
BLD="$1"
shift
BLDH=${!#}
fi

TOP=$(dirname "$0")

if [ -z "${PREFIX}" ] ; then
PREFIX="/usr/local"
fi

meson setup --prefix ${PREFIX} \
meson setup \
--native-file $TOP/fdpp/toolchain.ini \
--cross-file $TOP/fdpp/kernel/toolchain.ini \
$BLD $TOP $*
$* $BLD $TOP

This comment has been minimized.

Copy link
@andrewbird

andrewbird Feb 16, 2024

Member

$BLDH?

This comment has been minimized.

Copy link
@stsp

stsp Feb 16, 2024

Author Member

No, both variables are used.
However, BLD is passed to meson,
while BLDH (BLD Hint) is used in the
messages below (BLD may be empty
in that case).

This comment has been minimized.

Copy link
@andrewbird

andrewbird Feb 16, 2024

Member

Ahh sorry, it looked like an oversight.

This comment has been minimized.

Copy link
@stsp

stsp Feb 16, 2024

Author Member

NP, good that you are following.
That gives a hope that one day
you'll code up something. :)
Seems like all contributors have
went away.

This comment has been minimized.

Copy link
@andrewbird

andrewbird Feb 16, 2024

Member

I'm struggling to concentrate on any one thing at the moment, but I do like to see what's being committed so at least I can try to keep up again one day.

This comment has been minimized.

Copy link
@stsp

stsp Feb 16, 2024

Author Member

If you can't concentrate on coding, then
you can take any other activity.
Writing wiki pages (our new r200fix is
still not documented, as well as everything
else), testing games for regressions,
making a promotion videos on youtube,
and so on, whatever you can think up yourself.
There was an awesome video from @gotbletu
on youtube a few years ago, and it boosted the
visits and downloads considerably. But time
passes and maybe we need another booster. :)

This comment has been minimized.

Copy link
@andrewbird

andrewbird Feb 16, 2024

Member

r200fix

What's that, I must have missed it?

This comment has been minimized.

Copy link
@stsp

stsp Feb 16, 2024

Author Member

New command in comcom32 to
suppress "Runtime error 200".

I myself will be recovering for at
least 3 more month after a surgery,
which is the only chance to complete
dj64 project... So I can't be expected
to actively contribute to dosemu2 for
quite some time. I want to finish dj64,
now or never. :)

This comment has been minimized.

Copy link
@andrewbird

andrewbird Feb 16, 2024

Member

I'll have a play with the r200fix, thanks.

I won't ask what ailment you have as it's likely private, but it must have been / still is major. I wish you all the best and hope you have a speedy and trouble free recovery.

This comment has been minimized.

Copy link
@stsp

stsp Feb 16, 2024

Author Member

but it must have been / still is major.

The main thing about deceases is that
everything that isn't detected in time,
became a major problem. In my case,
the surgery was something like 4 years
too late, and even now the problem was
detected only when I fscked on doctors
and self-assigned a KT scan.
But its quite hard to blame anyone, because
one can't go for KT scan with barium, every
once you have some small pain somewhere...
Problems are getting undetected very frequently,
unfortunately. They inevitably become major,
and eventually avoiding the complete death
is already a good luck. :)

[ "$?" = "0" ] || exit 1

echo
echo "Done configure"
echo "Now run \"meson compile --verbose -C $BLD\" to build"
echo "After that you can do \"meson install -C $BLD\" to install"
echo "Now run \"meson compile --verbose -C $BLDH\" to build"
echo "After that you can do \"meson install -C $BLDH\" to install"

0 comments on commit c125732

Please sign in to comment.