Hallo, not to worry, I was sidetracked as well. I am busy working on a more general patch for debian, that hopefully will not break ubuntu or any other. I will be back shortly.
Regards Jan de Kruyf. On Mon, May 3, 2010 at 3:57 AM, Jeff Epler <jep...@unpythonic.net> wrote: > I'm sorry I haven't had the time to reply before now. > > I see two choices for you. First, enhance debian/configure and the > associated .in files so that they can work for both the Ubuntu platforms > we wish to build on, and the Debian platforms you are interested in. > > Second, carry these changes for yourself. git is much better at this > than cvs was, and debian/rules doesn't change all that often. > > As long as they don't damage building on Ubuntu 8.04 or 10.04 I'd be > pleased to consider patches of the first type for inclusion on master. > > Based on your description, maybe a patch like the following can be > adapted to fit your needs and ours both: > > From: Jeff Epler <jep...@unpythonic.net> > Date: Sun, 2 May 2010 20:52:17 -0500 > Subject: [PATCH] WIP: make debian/configure more flexible > > this is a sketch of how to make debian/configure supply extra configure > arguments and also look for realtime configuration scripts in the right > location. It's untested, but may be helpful to you. > --- > debian/configure | 15 +++++++++++++++ > 1 files changed, 15 insertions(+), 0 deletions(-) > > diff --git a/debian/configure b/debian/configure > index ded813e..ad36da2 100755 > --- a/debian/configure > +++ b/debian/configure > @@ -62,10 +62,18 @@ MODULE_EXT=.ko > KERNEL_DEPENDS=linux-image-$1,rtai-modules-$1 > KERNEL_HEADERS=linux-headers-$1 > EXTRA_FILES="usr/bin/emc_module_helper usr/bin/bfload" > +EXTRA_CONFIGURE= > KERNEL_VERSION=$1 > DRIVERS=drivers.files.in > PYTHON_VERSION=$(python -c 'import sys; print sys.version[:3]') > PYTHON_VERSION_NEXT=$(python -c 'import sys; print sys.version[:2] + > str(1+int(sys.version[2]))') > +if [ -x /usr/realtime-$KERNEL_VERSION/bin/rtai-config ]; then > + REALTIME_CONFIGURE="--with-realtime=/usr/realtime-$KERNEL_VERSION" > +elif [ -x /usr/realtime/bin/rtai-config ]; then > + REALTIME_CONFIGURE="--with-realtime=/usr/realtime" > +else > + REALTIME_CONFIGURE="--with-realtime=/usr" > +fi > > # hope this works on other systems too > DISTRIB_NAME= > @@ -89,6 +97,10 @@ Ubuntu-8.04) > > > EXTRA_BUILD=lyx,texlive-extra-utils,texlive-latex-recommended,texlive-fonts-recommended,ghostscript,imagemagick,texlive-lang-french > TCLTK_VERSION=8.4 > ;; > +Debian-????) > + > EXTRA_BUILD=lyx,texlive-extra-utils,texlive-latex-recommended,texlive-fonts-recommended,ghostscript,imagemagick,texlive-lang-french > + TCLTK_VERSION=8.4 > + EXTRA_CONFIGURE="--with-tclConfig=/usr/lib/tcl8.4/tclConfig.sh > --with-tkconfig=/usr/lib/tk8.4/tkConfig.sh" > *) > EXTRA_BUILD=lyx-qt > TCLTK_VERSION=8.4 > @@ -100,6 +112,7 @@ EMC2_PACKAGE_NAME=emc2 > EXTRA_RECOMMENDS=hostmot2-firmware > case $TARGET in > sim) > + REALTIME_CONFIGURE=--enable-simulator > MODULE_PATH=usr/lib/emc2/modules > MODULE_EXT=.so > KERNEL_DEPENDS= > @@ -134,6 +147,8 @@ sed -e "s|@MODULE_PATH@|$MODULE_PATH|g" \ > -e "s|@KERNEL_HEADERS@|$KERNEL_HEADERS|g" \ > -e "s|@EXTRA_BUILD@|$EXTRA_BUILD|g" \ > -e "s|@EXTRA_RECOMMENDS@|$EXTRA_RECOMMENDS|g" \ > + -e "s|@EXTRA_CONFIGURE@|$EXTRA_CONFIGURE|g" \ > + -e "s|@REALTIME_CONFIGURE@|$REALTIME_CONFIGURE|g" \ > -e "s|@EMC2_PACKAGE_NAME@|$EMC2_PACKAGE_NAME|g" \ > -e "s|@EXTRAS@|$EXTRAS|g" \ > -e "s|@EXTRA_FILES@|$EXTRA_FILES|g" \ > -- > 1.7.0.4 > > > ------------------------------------------------------------------------------ > _______________________________________________ > Emc-users mailing list > Emc-users@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/emc-users > ------------------------------------------------------------------------------ _______________________________________________ Emc-users mailing list Emc-users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-users
