Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

changes for detecting and building for clang/binutils elf

Browse Source 
and minor fixes:
 . add ack/clean target to lib, 'unify' clean target
 . add includes as library dependency
 . mk: exclude warning options clang doesn't have in non-gcc
 . set -e in lib/*.sh build files
 . clang compile error circumvention (disable NOASSERTS for release builds)
This commit is contained in:
Ben Gras
2011-06-07 14:48:31 +02:00
parent ef257bcc1b
commit 230b7775fe
15 changed files with 96 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/chrootmake.sh
View File

@@ -8,7 +8,7 @@ then make $@
exit $?
fi
make NOASSERTS=yes world
make world
cd tools
rm revision
rm /boot/image/*

24
tools/release.sh
View File

@@ -18,6 +18,7 @@ secs=`expr 32 '*' 64`
export SHELL=/bin/sh
PKG_ADD=/usr/pkg/sbin/pkg_add
PKG_INFO=/usr/pkg/sbin/pkg_info
if [ ! -x $PKG_ADD ]
then echo Please install pkg_install from pkgsrc.
@@ -25,8 +26,17 @@ then echo Please install pkg_install from pkgsrc.
fi
# Packages we have to pre-install, and url to use
PREINSTALLED_PACKAGES="pkgin-0.3.3.4.tgz pkg_install-20101212 bmake-20100808"
PACKAGEURL=ftp://ftp.minix3.org/pub/minix/packages/$version_pretty/`uname -m`/All/
PREINSTALLED_PACKAGES="
pkgin-0.4.1
pkg_install-20101212
bmake-20100808
binutils-2.17nb3
clang-2.9nb2
compiler-rt-r123836nb3
"
PKG_ADD_URL=$PACKAGEURL
RELEASERC=$HOME/.releaserc
@@ -68,11 +78,11 @@ fi
FILENAMEOUT=""
while getopts "s:pmMchu?r:f:" c
while getopts "ls:pmMchu?r:f:" c
do
case "$c" in
\?)
echo "Usage: $0 [-p] [-c] [-h] [-m] [-M] [-r <tag>] [-u] [-f <filename>] [-s <username>]" >&2
echo "Usage: $0 [-l] [-p] [-c] [-h] [-m] [-M] [-r <tag>] [-u] [-f <filename>] [-s <username>]" >&2
exit 1
;;
h)
@@ -106,6 +116,8 @@ do
;;
M) MAKEMAP=1
;;
l) PKG_ADD_URL=file://$PACKAGEDIR
;;
esac
done
@@ -197,7 +209,7 @@ else
echo "Copying contents from current src dir."
( cd .. && make depend && make clean )
srcdir=/usr/$SRC
( cd $srcdir && tar cf - . ) | ( cd $RELEASEDIR/usr && mkdir $SRC && cd $SRC && tar xf - )
( cd $srcdir && tar --exclude .svn -cf - . ) | ( cd $RELEASEDIR/usr && mkdir $SRC && cd $SRC && tar xf - )
REVTAG=copy
REVISION=unknown
IMG=${IMG_BASE}_copy.iso
@@ -230,8 +242,8 @@ echo " * Make hierarchy"
chroot $RELEASEDIR "PATH=/$XBIN sh -x /usr/$SRC/tools/chrootmake.sh etcfiles" || exit 1
for p in $PREINSTALLED_PACKAGES
do echo " * Pre-installing: $p from $PACKAGEURL"
$PKG_ADD -P $RELEASEDIR $PACKAGEURL/$p
do echo " * Pre-installing: $p from $PKG_ADD_URL"
$PKG_ADD -P $RELEASEDIR $PKG_ADD_URL/$p
done
echo " * Chroot build"