r1740 - in trunk

[Stefan Sperling]

On Sun, Apr 22, 2007 at 11:05:43PM +0100, Malcolm wrote:
> On 4/22/07, Amadeus <amadeus at iksw-muees.de> wrote:
> 
> > Note that GPM build is broken anyway. Some interaction with the curses
> > lib.
> 
> gpm should be built without the curses library, as no application has ever
> used gpm's curses functionality.
>
> What we want to use is curses's gpm functionality.

I'm updating ncurses to 5.6, and making the port use configure
while at it.

Since 5.6 the configure script has a handy option by the way:
	--without-dlsym
	    Do not use dlsym() to load GPM dynamically.

Since curses.h can only be created after the ncurses configure
script has been run (not a problem with the way the current ncurses
port is done),  I'm using a hack in lib/Makefile to get around the
circular gpm/ncurses dependency:

@@ -179,7 +173,7 @@

 ##############################################################################

-make_links: clean_links
+make_links: clean_links ./libncurses/src/include/curses.h
        @echo "Making symlinks in lib/"
        @for p in $(LINKLIBS); do \
                for i in $$p; do \
@@ -190,6 +184,12 @@
                done ; \
        done

+# XXX: Create curses.h before symlinking headers to include/
+./libncurses/src/include/curses.h:
+       (cd ./libncurses/ && $(MAKE) CONFIG_LIB_GPM=no .configured)
+       (cd ./libncurses/src/include && $(MAKE) curses.h)
+       rm ./libncurses/.configured
+
 clean_links:


We can either use that until gpm is fixed or fix gpm before I commit
the new ncurses version. I still need to integrate dforsi's curses
diffs before I can commit.

-- 
stefan
http://stsp.name                                         PGP Key: 0xF59D25F0
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://mailman.dslinux.in-berlin.de/pipermail/dslinux-devel-dslinux.in-berlin.de/attachments/20070423/537bc1d6/attachment.pgp