On Wed, 30 Jul 2008 15:43:24 +0200 Adriaan de Groot <groot at kde.org> wrote:
> On Wednesday 30 July 2008 15:06:35 Mark Wright wrote: > > (2) I could remove the $KBE_PREFIX/bin and just use sed instead, > > and assume the build environment has that in the path first. Hello Ade, I committed that change. Hopefully xstuff builds now. > >?Note > > though that in this script I need to alter the path so > > that /usr/ccs/bin/make is used, but then I guess that is being done > > just for the X-Windows consolidation build environment. > > The PATH ought to be set up by the SPEC file before calling build.sh > (or any other script in Solaris/) so that the tools in the CBE / KBE > come first; if you need to tweak which make is used, couldn't you use > MAKE=/usr/ccs/bin/make ? When I tried that earlier, it would hang in jade during the build. It works when I unset MAKE and change make to /usr/ccs/bin/make in the buildit script. I wonder about altering the Makefile to turn on building xstuff on sol10 and libcaptury, something like the following. This Makefile suggestion is not yet tested, I am not sure if the build-libcaptury : build-xstuff line would have the desired affect of making xstuff build before libcaptury on sol10. Thanks, Mark Index: Dude/SPECS/Makefile =================================================================== --- Dude/SPECS/Makefile (revision 2391) +++ Dude/SPECS/Makefile (working copy) @@ -28,7 +28,6 @@ # Temporary disable, Under construction on S10U5 ifeq (5.10,$(shell uname -r)) -PSPC_FILES := $(filter-out libcaptury.pspc,$(PSPC_FILES)) PSPC_FILES := $(filter-out avahi.pspc,$(PSPC_FILES)) endif @@ -54,6 +53,7 @@ # perl Respect.pl --with-all --without-upload --without-build hal.pspc # cp -p FOSShal.spec SUNWhal.spec # sed -i -e "s/FOSShal/SUNWhal/g" SUNWhal.spec +# sed -i -e "s/BuildConflicts:.SUNWhal//" SUNWhal.spec # pkgtool build SUNWhal.spec # And then as root: # svcadm enable hal @@ -73,7 +73,6 @@ PSPC_FILES := $(filter-out avifile.pspc ffmpeg.pspc,$(PSPC_FILES)) PSPC_FILES := $(filter-out openexr-viewers.pspc,$(PSPC_FILES)) PSPC_FILES := $(filter-out portaudio.pspc,$(PSPC_FILES)) -PSPC_FILES := $(filter-out xstuff.pspc,$(PSPC_FILES)) # Get just the names (without .pspc) of the resulting file list PSPCS = $(basename $(PSPC_FILES)) @@ -85,7 +84,13 @@ ifeq (5.10dbus.pspc,$(shell uname -r)$(findstring dbus.pspc,$(PSPC_FILES))) build-qt : build-dbus build-cups : build-dbus +endif +# On S10, build xstuff before libcaptury. +ifeq (5.10,$(shell uname -r)) +build-libcaptury : build-xstuff +else +PSPC_FILES := $(filter-out xstuff.pspc,$(PSPC_FILES)) endif # You can place settings in Makefile.config.local --
