Skip to content

Commit

Permalink
Add ability to compile with -DMAIKO_ENABLE_NETHUB
Browse files Browse the repository at this point in the history
  • Loading branch information
fghalasz committed Nov 27, 2023
1 parent 56e7591 commit 4d58923
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/Dockerfile_maiko
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ COPY . ${INSTALL_LOCATION}
# Build maiko
RUN cd ${INSTALL_LOCATION}/bin \
&& ./makeright x cleanup \
&& ./makeright x
&& ./makeright x nethub
RUN cd ${INSTALL_LOCATION}/bin \
&& if [ "$(./machinetype)" = "x86_64" ]; then \
./makeright init; \
Expand Down
31 changes: 25 additions & 6 deletions bin/makeright
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# Nov 20 2001 JDS: Convert to use BASH, not CSH, for open-source...
#
# usage: makeright [display-option] [other-option]
#
#
# example: makeright single ; make lde for mmaped displayFB
# makeright multi ; make lde for cg3,cg6
# makeright x ; make lde for X-windows
Expand All @@ -33,27 +33,41 @@
#
# makeright init requires directory "maiko/init.${architecture}
#
# Note: X11R4 environment link shared libraries.
# lde need X library. If lde links shared libraries,
# Note: X11R4 environment link shared libraries.
# lde need X library. If lde links shared libraries,
# X shared libraries are needed at run time.
#
# Hide X shared libraries from link libraries search path.
LD_LIBRARY_PATH=/usr/local/lib
LD_LIBRARY_PATH=/usr/local/lib

export PATH=".:$PATH"

noshift="false"
if test "$1" = ""
then
display="single"
noshift="true"
elif test "$1" = "nethub"
then
display="single"
noshift="true"
else
display="$1"
noshift="false"
fi

if test $# -gt 0
if test "$noshift" = "false"
then
shift
fi

nethub="false"
if test "$1" = "nethub"
then
nethub="true"
shift
fi

architecture=`machinetype`
osversion=`osversion`
echo "making so far for ${osversion} on ${architecture}."
Expand Down Expand Up @@ -101,7 +115,12 @@ echo start making lde for ${releasename}.
# then finally do the make, including the right stuff
# With makefile-tail merged, this should only take ONE make command....

cp -p makefile-${releasename} /tmp/makefile-${releasename}-$$
if test "$nethub" = "true"
then
sed -e "/^DFLAGS = /s/$/ -DMAIKO_ENABLE_NETHUB/" -i /tmp/makefile-${releasename}-$$
fi
make RELEASENAME=${releasename} LDENAME=${ldename} \
OSARCHNAME=${osversion}.${architecture} \
-f makefile-header -f makefile-${releasename} \
-f makefile-header -f /tmp/makefile-${releasename}-$$ \
-f makefile-tail $*

0 comments on commit 4d58923

Please sign in to comment.