minix/pkgsrc-ng
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git synced 2025-08-03 09:48:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes pbulk on developer ISO, activate X11

Browse Source 
* Fixes a few cross-build vs developer ISO issues
   - clang and binutils part of the base system, or only available
     through packages.
   - Default path to the strip utility.

 * Fixed two issues in pbulk-ng.sh
   - set -e being activated while a few commands are expected to fail,
     preventing a succesful build.
   - Fixed a shell test not supposed to be on two lines.

 * Activated build and install of X11.
   - The X11 sources proper are expected to be available in /usr/xsrc.
   - Added X11 to PATH and LD_LIBRARY_PATH for the jails.
   - Specified the X11 type to be "native"
   - Removed options disabling the build of X11 related features.
This commit is contained in:
Lionel Sambuc 2014-11-24 14:07:58 +01:00
parent f43378af87
commit 7cb8e5b41b
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
minix/mk.conf.minix
View File

@ -31,6 +31,7 @@ PS?= /usr/bin/ps
NROFF?= mandoc
PREFER_NATIVE_PTHREADS= no
X11_TYPE= native
# In some cases, MACHINE_GNU_PLATFORM get set back to i386--netbsdelf,
# make sure the correct triple is set.
@ -71,7 +72,12 @@ PACKAGES?= ${PKGSRCDIR}/packages/${OS_VERSION}/${MACHINE_ARCH}
PKGSRC_COMPILER?= clang
.if ${PKGSRC_COMPILER} == "clang"
# Check if the clang package is available
.if exists(/usr/pkg/bin/clang)
CLANGBASE?= /usr/pkg
.else
CLANGBASE?= /usr
.endif
HAVE_LLVM?= 34
CC?= clang
@ -83,6 +89,10 @@ CC?= gcc
CXX?= g++
.endif
.if exists(/usr/pkg/bin/strip)
TOOLS_PLATFORM.strip?= /usr/pkg/bin/strip
.endif
#######################################################################
# Compilation Flags for all packages
CFLAGS+= -march=i586
@ -108,7 +118,6 @@ RCD_SCRIPTS_DIR?= ${LOCALBASE}/etc/rc.d
#LSC: the following packages are not yet part of the base system, as expected
# on NetBSD
PREFER_PKGSRC+= groff
#PREFER_PKGSRC?= MesaLib Xft2 Xrandr Xrender glu fontconfig freetype2
PYTHON_VERSION_DEFAULT?= 27
PYPACKAGE?= python27
@ -119,7 +128,5 @@ ZSH_STATIC?= yes
#######################################################################
# Package-specific default options
PKG_OPTIONS.gcc45?= -gcc-java -gcc-fortran
PKG_OPTIONS.groff?= -x11
PKG_OPTIONS.ghostscript?= -x11
.endif # BSD_PKG_MK

11
minix/pbulk-ng.sh
View File

@ -77,11 +77,12 @@ NO="no"
# Generate a clean PATH for the jails.
CHROOT_PATH=""
for d in ${BOOTSTRAP_PREFIX} /usr/pkg /usr ''
for d in ${BOOTSTRAP_PREFIX} /usr/pkg /usr/X11R7 /usr ''
do
CHROOT_PATH=${CHROOT_PATH}:${d}/bin:${d}/sbin
done
LD_CHROOT_PATH=/usr/pkg/lib:/usr/lib:/lib
CHROOT_PATH=${CHROOT_PATH}:/usr/games
LD_CHROOT_PATH=/usr/pkg/lib:/usr/X11R7/lib:/usr/lib:/lib
if [ ! -d $MINIXSRCDIR ]
then
@ -155,7 +156,7 @@ build_minix() {
echo ":-> Building minix chroot in ${ROOT_MINIX}"
(
exec 2>&1
set -e
set +e
echo ":--> Building minix sources [${BUILD_START}]"
@ -177,8 +178,7 @@ build_minix() {
exit 1
fi
if [ ${_cc} = 0 -a ${_clang} = 0 -a
! $(cc --version | grep -q clang) ]
if [ ${_cc} = 0 -a ${_clang} = 0 -a ! $(cc --version | grep -q clang) ]
then
echo "It is unsupported to have cc set to someting else than clang,"
echo "while clang is also installed on the system."
@ -214,6 +214,7 @@ build_minix() {
TOOLDIR=${TOOLDIR} \
DESTDIR=${ROOT_MINIX} \
SLOPPY_FLIST=yes \
MKX11=yes \
MKUPDATE=yes \
${toolchain} \
MKKYUA=no \