Ronald Oussoren | 0e5b70d | 2006-06-07 18:58:42 +0000 | [diff] [blame] | 1 | diff -r -u ncurses-5.5-orig/test/Makefile.in ncurses-5.5/test/Makefile.in |
| 2 | --- ncurses-5.5-orig/test/Makefile.in 2006-03-24 12:47:40.000000000 +0100 |
| 3 | +++ ncurses-5.5/test/Makefile.in 2006-03-24 12:47:50.000000000 +0100 |
| 4 | @@ -75,7 +75,7 @@ |
| 5 | MATH_LIB = @MATH_LIB@ |
| 6 | |
| 7 | LD = @LD@ |
| 8 | -LINK = @LINK_TESTS@ $(LIBTOOL_LINK) $(CC) $(CFLAGS) |
| 9 | +LINK = @LINK_TESTS@ $(LIBTOOL_LINK) $(CC) |
| 10 | |
| 11 | usFLAGS = @LD_MODEL@ @LOCAL_LDFLAGS@ @LDFLAGS@ |
| 12 | |
| 13 | diff -ru ncurses-5.5-orig/ncurses/tinfo/read_entry.c ncurses-5.5/ncurses/tinfo/read_entry.c |
| 14 | --- ncurses-5.5-orig/ncurses/tinfo/read_entry.c 2004-01-11 02:57:05.000000000 +0100 |
| 15 | +++ ncurses-5.5/ncurses/tinfo/read_entry.c 2006-03-25 22:49:39.000000000 +0100 |
| 16 | @@ -474,7 +474,7 @@ |
| 17 | } |
| 18 | |
| 19 | /* truncate the terminal name to prevent buffer overflow */ |
| 20 | - (void) sprintf(ttn, "%c/%.*s", *tn, (int) sizeof(ttn) - 3, tn); |
| 21 | + (void) sprintf(ttn, "%x/%.*s", *tn, (int) sizeof(ttn) - 3, tn); |
| 22 | |
| 23 | /* This is System V behavior, in conjunction with our requirements for |
| 24 | * writing terminfo entries. |
| 25 | diff -ru ncurses-5.5-orig/configure ncurses-5.5/configure |
| 26 | --- ncurses-5.5-orig/configure 2005-09-24 23:50:50.000000000 +0200 |
| 27 | +++ ncurses-5.5/configure 2006-03-26 22:24:59.000000000 +0200 |
| 28 | @@ -5027,7 +5027,7 @@ |
| 29 | darwin*) |
| 30 | EXTRA_CFLAGS="-no-cpp-precomp" |
| 31 | CC_SHARED_OPTS="-dynamic" |
| 32 | - MK_SHARED_LIB='$(CC) -dynamiclib -install_name $(DESTDIR)$(libdir)/`basename $@` -compatibility_version $(ABI_VERSION) -current_version $(ABI_VERSION) -o $@' |
| 33 | + MK_SHARED_LIB='$(CC) $(CFLAGS) -dynamiclib -install_name $(DESTDIR)$(libdir)/`basename $@` -compatibility_version $(ABI_VERSION) -current_version $(ABI_VERSION) -o $@' |
| 34 | test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi |
| 35 | cf_cv_shlib_version_infix=yes |
| 36 | ;; |