On Tue, 27 May 2008 11:29:35 +0200
"Lukas Oboril" <oboril.lukas at gmail.com> wrote:
> Hi Mark,
>
> could you send ncurses patches again.
>
> Please, can you use gpatch -uw file-a file-b for generate patches?
> gpatch == GNU patch
>
> Thanks a lot
>
> Luc
Hi Luc,
I tried generating the 3 files:
Dude/NCURSES/5.6/Solaris/diffs/Makefile.in.1.diff
Dude/NCURSES/5.6/Solaris/diffs/Makefile.in.3.diff
Dude/NCURSES/5.6/Solaris/diffs/Makefile.in.7.diff
again with GNU diff -uw, the result was identical to the
earlier ones I did with GNU diff -Naur. I have attached
these files.
This the svn diff the ncurses diffs, which builds fine with
libtool 2.2.4:
Index: Dude/NCURSES/5.6/Solaris/diffs/Makefile.in.1.diff
===================================================================
--- Dude/NCURSES/5.6/Solaris/diffs/Makefile.in.1.diff (revision 2023)
+++ Dude/NCURSES/5.6/Solaris/diffs/Makefile.in.1.diff (working copy)
@@ -1,5 +1,25 @@
---- ncurses-5.6.orig/form/Makefile.in 2006-10-14 16:40:36.000000000 -0400
-+++ ncurses-5.6/form/Makefile.in 2008-05-10 22:14:35.982530000 -0400
+--- ncurses-5.6.orig/form/Makefile.in 2006-10-14 20:40:36.000000000 +0000
++++ ncurses-5.6/form/Makefile.in 2008-05-24 10:21:25.305378000 +0000
+@@ -59,8 +59,8 @@
+
+ LIBTOOL = @LIBTOOL@
+ LIBTOOL_CLEAN = @LIB_CLEAN@
+-LIBTOOL_COMPILE = @LIB_COMPILE@
+-LIBTOOL_LINK = @LIB_LINK@
++LIBTOOL_COMPILE = @LIB_COMPILE@ --tag=CC
++LIBTOOL_LINK = @LIB_LINK@ $(CC) $(CFLAGS) $(LDFLAGS)
+ LIBTOOL_INSTALL = @LIB_INSTALL@
+ LIBTOOL_UNINSTALL = @LIB_UNINSTALL@
+
+@@ -72,7 +72,7 @@
+ AR = @AR@
+ AR_OPTS = @AR_OPTS@
+ AWK = @AWK@
+-LD = @LD@
++LD = @CC@ @CFLAGS@ @LDFLAGS@
+ LN_S = @LN_S@
+
+ CC = @CC@
@@ -91,13 +91,13 @@
CFLAGS_DEFAULT = $(CFLAGS_ at DFT_UPR_MODEL@)
Index: Dude/NCURSES/5.6/Solaris/diffs/Makefile.in.3.diff
===================================================================
--- Dude/NCURSES/5.6/Solaris/diffs/Makefile.in.3.diff (revision 2023)
+++ Dude/NCURSES/5.6/Solaris/diffs/Makefile.in.3.diff (working copy)
@@ -1,5 +1,25 @@
---- ncurses-5.6.orig/menu/Makefile.in 2006-10-14 16:40:36.000000000 -0400
-+++ ncurses-5.6/menu/Makefile.in 2008-05-10 22:13:44.375885000 -0400
+--- ncurses-5.6.orig/menu/Makefile.in 2006-10-14 20:40:36.000000000 +0000
++++ ncurses-5.6/menu/Makefile.in 2008-05-24 10:10:01.356928000 +0000
+@@ -59,8 +59,8 @@
+
+ LIBTOOL = @LIBTOOL@
+ LIBTOOL_CLEAN = @LIB_CLEAN@
+-LIBTOOL_COMPILE = @LIB_COMPILE@
+-LIBTOOL_LINK = @LIB_LINK@
++LIBTOOL_COMPILE = @LIB_COMPILE@ --tag=CC
++LIBTOOL_LINK = @LIB_LINK@ $(CC) $(CFLAGS) $(LDFLAGS)
+ LIBTOOL_INSTALL = @LIB_INSTALL@
+ LIBTOOL_UNINSTALL = @LIB_UNINSTALL@
+
+@@ -72,7 +72,7 @@
+ AR = @AR@
+ AR_OPTS = @AR_OPTS@
+ AWK = @AWK@
+-LD = @LD@
++LD = @CC@ @CFLAGS@ @LDFLAGS@
+ LN_S = @LN_S@
+
+ CC = @CC@
@@ -91,13 +91,13 @@
CFLAGS_DEFAULT = $(CFLAGS_ at DFT_UPR_MODEL@)
Index: Dude/NCURSES/5.6/Solaris/diffs/Makefile.in.7.diff
===================================================================
--- Dude/NCURSES/5.6/Solaris/diffs/Makefile.in.7.diff (revision 2023)
+++ Dude/NCURSES/5.6/Solaris/diffs/Makefile.in.7.diff (working copy)
@@ -1,6 +1,22 @@
---- ncurses-5.6.orig/panel/Makefile.in 2006-10-14 16:40:36.000000000 -0400
-+++ ncurses-5.6/panel/Makefile.in 2008-05-10 22:11:26.468187000 -0400
-@@ -96,9 +96,9 @@
+--- ncurses-5.6.orig/panel/Makefile.in 2006-10-14 20:40:36.000000000 +0000
++++ ncurses-5.6/panel/Makefile.in 2008-05-24 09:58:02.973388653 +0000
+@@ -60,8 +60,8 @@
+
+ LIBTOOL = @LIBTOOL@
+ LIBTOOL_CLEAN = @LIB_CLEAN@
+-LIBTOOL_COMPILE = @LIB_COMPILE@
+-LIBTOOL_LINK = @LIB_LINK@
++LIBTOOL_COMPILE = @LIB_COMPILE@ --tag=CC
++LIBTOOL_LINK = @LIB_LINK@ $(CC) $(CFLAGS) $(LDFLAGS)
+ LIBTOOL_INSTALL = @LIB_INSTALL@
+ LIBTOOL_UNINSTALL = @LIB_UNINSTALL@
+
+@@ -92,13 +92,13 @@
+
+ CFLAGS_DEFAULT = $(CFLAGS_ at DFT_UPR_MODEL@)
+
+-LINK = $(LIBTOOL_LINK) $(CC)
++LINK = $(LIBTOOL_LINK) $(CC) $(CFLAGS) $(LDFLAGS)
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
SHLIB_DIRS = -L../lib
However you provided outputs where libncursesw.so does not link
with libtinfow.so when using libtool 1.5.X. Looking at that, in:
Dude/NCURSES/5.6/Solaris/configure.sh
the line:
export LD_OPTIONS="-R/opt/foss/lib -ltinfow"
I wondered if that should be something like this
(for 64 bit builds):
export LD_OPTIONS="-R${_libdir} -ltinfow"
Below is the link line on my box where I rebuilt
libncursesw.so today, it does pass libtinfow on the link
line:
pkgbuild: linking libncursesw.la
pkgbuild: cd ../lib && /bin/bash
/h/goanna/2/os_5.10/cbe/BUILD/FOSSncurses-5.6/amd64/NCURSES/5.6/libtool
--mode=link /opt/SunStudio12/SUNWspro/bin/cc -Xc -errshort=full -errfmt=error
-errwarn=%none -xcsi -xustr=ascii_utf16_ushort -xalias_level=std
-features=extinl -xF=%none -xbuiltin=%all -xinline=%auto -xprefetch=auto
-xprefetch_auto_type=indirect_array_access -xprefetch_level=3 -xsafe=mem
-xthreadvar=%all -z combreloc -z redlocsym -z nodefaultlib -z ignore -z now -z
rescan -z absexec -xipo=0 -xldscope=symbolic -xlibmil -xO3 -xregs=no%frameptr
-xjobs=2 -Kpic -xrestrict=%all -xipo=0 -xtarget=opteron -m64 -xarch=sse2
-xchip=opteron -xcache=64/64/2:1024/64/16 -lm -ldl -lc -lpthread -lposix4 -lrt
-mt -L/opt/foss/lib/amd64 -L/usr/lib/amd64 -R/opt/foss/lib/amd64
-R/usr/lib/amd64 -D_REENTRANT -D__EXTENSIONS__ -D_LARGEFILE_SOURCE
-D_FILE_OFFSET_BITS=64 -D_POSIX_PTHREAD_SEMANTICS -DSOLARIS -DSOLARIS10
-DNDEBUG -DNO_DEBUG -D_UNICODE -DUNICODE -D_XOPEN_SOURCE=600 -D_XPG6
-D_POSIX_C_SOURCE=200112L -D__XOPEN_OR_POSIX -D_STRICT_STDC -D_STRICT_STDC__
-D_STDC_C99 -I/opt/foss/include -DNCURSES_EXT_COLORS -D_XOPEN_SOURCE_EXTENDED
-g -g -xdebugformat=stabs -xtarget=opteron -xregs=no%frameptr
-L/opt/foss/lib/amd64 -L/usr/lib/amd64 -R/opt/foss/lib/amd64 -R/usr/lib/amd64
-z combreloc -z redlocsym -z nodefaultlib -z ignore -z now -z rescan -z absexec
-xipo=0 -xldscope=symbolic -xlibmil -xtarget=opteron -m64 -xarch=sse2
-xchip=opteron -xcache=64/64/2:1024/64/16 -lm -ldl -lc -lpthread -lposix4 -lrt
-mt /opt/SunStudio12/SUNWspro/bin/cc -o libncursesw.la
../obj_lo/hardscroll.lo ../obj_lo/hashmap.lo ../obj_lo/lib_addch.lo
../obj_lo/lib_addstr.lo ../obj_lo/lib_beep.lo ../obj_lo/lib_bkgd.lo
../obj_lo/lib_box.lo ../obj_lo/lib_chgat.lo ../obj_lo/lib_clear.lo
../obj_lo/lib_clearok.lo ../obj_lo/lib_clrbot.lo ../obj_lo/lib_clreol.lo
../obj_lo/lib_color.lo ../obj_lo/lib_colorset.lo ../obj_lo/lib_delch.lo
../obj_lo/lib_delwin.lo ../obj_lo/lib_echo.lo ../obj_lo/lib_endwin.lo
../obj_lo/lib_erase.lo ../obj_lo/lib_flash.lo ../obj_lo/lib_gen.lo
../obj_lo/lib_getch.lo ../obj_lo/lib_getstr.lo ../obj_lo/lib_hline.lo
../obj_lo/lib_immedok.lo ../obj_lo/lib_inchstr.lo ../obj_lo/lib_initscr.lo
../obj_lo/lib_insch.lo ../obj_lo/lib_insdel.lo ../obj_lo/lib_insnstr.lo
../obj_lo/lib_instr.lo ../obj_lo/lib_isendwin.lo ../obj_lo/lib_leaveok.lo
../obj_lo/lib_mouse.lo ../obj_lo/lib_move.lo ../obj_lo/lib_mvcur.lo
../obj_lo/lib_mvwin.lo ../obj_lo/lib_newterm.lo ../obj_lo/lib_newwin.lo
../obj_lo/lib_nl.lo ../obj_lo/lib_overlay.lo ../obj_lo/lib_pad.lo
../obj_lo/lib_printw.lo ../obj_lo/lib_redrawln.lo ../obj_lo/lib_refresh.lo
../obj_lo/lib_restart.lo ../obj_lo/lib_scanw.lo ../obj_lo/lib_screen.lo
../obj_lo/lib_scroll.lo ../obj_lo/lib_scrollok.lo ../obj_lo/lib_scrreg.lo
../obj_lo/lib_set_term.lo ../obj_lo/lib_slk.lo ../obj_lo/lib_slkatr_set.lo
../obj_lo/lib_slkatrof.lo ../obj_lo/lib_slkatron.lo ../obj_lo/lib_slkatrset.lo
../obj_lo/lib_slkattr.lo ../obj_lo/lib_slkclear.lo ../obj_lo/lib_slkcolor.lo
../obj_lo/lib_slkinit.lo ../obj_lo/lib_slklab.lo ../obj_lo/lib_slkrefr.lo
../obj_lo/lib_slkset.lo ../obj_lo/lib_slktouch.lo ../obj_lo/lib_touch.lo
../obj_lo/lib_tstp.lo ../obj_lo/lib_ungetch.lo ../obj_lo/lib_vidattr.lo
../obj_lo/lib_vline.lo ../obj_lo/lib_wattroff.lo ../obj_lo/lib_wattron.lo
../obj_lo/lib_winch.lo ../obj_lo/lib_window.lo ../obj_lo/nc_panel.lo
../obj_lo/safe_sprintf.lo ../obj_lo/tty_update.lo ../obj_lo/varargs.lo
../obj_lo/memmove.lo ../obj_lo/vsscanf.lo ../obj_lo/lib_freeall.lo
../obj_lo/charable.lo ../obj_lo/lib_add_wch.lo ../obj_lo/lib_box_set.lo
../obj_lo/lib_cchar.lo ../obj_lo/lib_get_wch.lo ../obj_lo/lib_erasewchar.lo
../obj_lo/lib_get_wstr.lo ../obj_lo/lib_hline_set.lo ../obj_lo/lib_in_wch.lo
../obj_lo/lib_in_wchnstr.lo ../obj_lo/lib_ins_wch.lo ../obj_lo/lib_inwstr.lo
../obj_lo/lib_pecho_wchar.lo ../obj_lo/lib_slk_wset.lo
../obj_lo/lib_unget_wch.lo ../obj_lo/lib_vid_attr.lo ../obj_lo/lib_vline_set.lo
../obj_lo/lib_wacs.lo ../obj_lo/lib_wunctrl.lo ../obj_lo/expanded.lo
../obj_lo/legacy_coding.lo ../obj_lo/lib_dft_fgbg.lo ../obj_lo/lib_print.lo
../obj_lo/resizeterm.lo ../obj_lo/wresize.lo -rpath
/var/tmp/pkgbuild-mwright/FOSSncurses-5.6-build/opt/foss/lib/amd64
-version-info 5:6 -L../lib ../lib/libtinfow.la
pkgbuild: libtool: link: /opt/SunStudio12/SUNWspro/bin/cc -G -h
libncursesw.so.5 -o .libs/libncursesw.so.5.0.6 ../obj_lo/.libs/hardscroll.o
../obj_lo/.libs/hashmap.o ../obj_lo/.libs/lib_addch.o
../obj_lo/.libs/lib_addstr.o ../obj_lo/.libs/lib_beep.o
../obj_lo/.libs/lib_bkgd.o ../obj_lo/.libs/lib_box.o
../obj_lo/.libs/lib_chgat.o ../obj_lo/.libs/lib_clear.o
../obj_lo/.libs/lib_clearok.o ../obj_lo/.libs/lib_clrbot.o
../obj_lo/.libs/lib_clreol.o ../obj_lo/.libs/lib_color.o
../obj_lo/.libs/lib_colorset.o ../obj_lo/.libs/lib_delch.o
../obj_lo/.libs/lib_delwin.o ../obj_lo/.libs/lib_echo.o
../obj_lo/.libs/lib_endwin.o ../obj_lo/.libs/lib_erase.o
../obj_lo/.libs/lib_flash.o ../obj_lo/.libs/lib_gen.o
../obj_lo/.libs/lib_getch.o ../obj_lo/.libs/lib_getstr.o
../obj_lo/.libs/lib_hline.o ../obj_lo/.libs/lib_immedok.o
../obj_lo/.libs/lib_inchstr.o ../obj_lo/.libs/lib_initscr.o
../obj_lo/.libs/lib_insch.o ../obj_lo/.libs/lib_insdel.o
../obj_lo/.libs/lib_insnstr.o ../obj_lo/.libs/lib_instr.o
../obj_lo/.libs/lib_isendwin.o ../obj_lo/.libs/lib_leaveok.o
../obj_lo/.libs/lib_mouse.o ../obj_lo/.libs/lib_move.o
../obj_lo/.libs/lib_mvcur.o ../obj_lo/.libs/lib_mvwin.o
../obj_lo/.libs/lib_newterm.o ../obj_lo/.libs/lib_newwin.o
../obj_lo/.libs/lib_nl.o ../obj_lo/.libs/lib_overlay.o
../obj_lo/.libs/lib_pad.o ../obj_lo/.libs/lib_printw.o
../obj_lo/.libs/lib_redrawln.o ../obj_lo/.libs/lib_refresh.o
../obj_lo/.libs/lib_restart.o ../obj_lo/.libs/lib_scanw.o
../obj_lo/.libs/lib_screen.o ../obj_lo/.libs/lib_scroll.o
../obj_lo/.libs/lib_scrollok.o ../obj_lo/.libs/lib_scrreg.o
../obj_lo/.libs/lib_set_term.o ../obj_lo/.libs/lib_slk.o
../obj_lo/.libs/lib_slkatr_set.o ../obj_lo/.libs/lib_slkatrof.o
../obj_lo/.libs/lib_slkatron.o ../obj_lo/.libs/lib_slkatrset.o
../obj_lo/.libs/lib_slkattr.o ../obj_lo/.libs/lib_slkclear.o
../obj_lo/.libs/lib_slkcolor.o ../obj_lo/.libs/lib_slkinit.o
../obj_lo/.libs/lib_slklab.o ../obj_lo/.libs/lib_slkrefr.o
../obj_lo/.libs/lib_slkset.o ../obj_lo/.libs/lib_slktouch.o
../obj_lo/.libs/lib_touch.o ../obj_lo/.libs/lib_tstp.o
../obj_lo/.libs/lib_ungetch.o ../obj_lo/.libs/lib_vidattr.o
../obj_lo/.libs/lib_vline.o ../obj_lo/.libs/lib_wattroff.o
../obj_lo/.libs/lib_wattron.o ../obj_lo/.libs/lib_winch.o
../obj_lo/.libs/lib_window.o ../obj_lo/.libs/nc_panel.o
../obj_lo/.libs/safe_sprintf.o ../obj_lo/.libs/tty_update.o
../obj_lo/.libs/varargs.o ../obj_lo/.libs/memmove.o ../obj_lo/.libs/vsscanf.o
../obj_lo/.libs/lib_freeall.o ../obj_lo/.libs/charable.o
../obj_lo/.libs/lib_add_wch.o ../obj_lo/.libs/lib_box_set.o
../obj_lo/.libs/lib_cchar.o ../obj_lo/.libs/lib_get_wch.o
../obj_lo/.libs/lib_erasewchar.o ../obj_lo/.libs/lib_get_wstr.o
../obj_lo/.libs/lib_hline_set.o ../obj_lo/.libs/lib_in_wch.o
../obj_lo/.libs/lib_in_wchnstr.o ../obj_lo/.libs/lib_ins_wch.o
../obj_lo/.libs/lib_inwstr.o ../obj_lo/.libs/lib_pecho_wchar.o
../obj_lo/.libs/lib_slk_wset.o ../obj_lo/.libs/lib_unget_wch.o
../obj_lo/.libs/lib_vid_attr.o ../obj_lo/.libs/lib_vline_set.o
../obj_lo/.libs/lib_wacs.o ../obj_lo/.libs/lib_wunctrl.o
../obj_lo/.libs/expanded.o ../obj_lo/.libs/legacy_coding.o
../obj_lo/.libs/lib_dft_fgbg.o ../obj_lo/.libs/lib_print.o
../obj_lo/.libs/resizeterm.o ../obj_lo/.libs/wresize.o
-R/h/goanna/2/os_5.10/cbe/BUILD/FOSSncurses-5.6/amd64/NCURSES/5.6/lib/.libs
-R/var/tmp/pkgbuild-mwright/FOSSncurses-5.6-build/opt/foss/lib/amd64
-R/opt/foss/lib/amd64 -R/usr/lib/amd64 -L/opt/foss/lib/amd64 -L/usr/lib/amd64
-L/h/goanna/2/os_5.10/cbe/BUILD/FOSSncurses-5.6/amd64/NCURSES/5.6/lib
../lib/.libs/libtinfow.so -lm -ldl -lc -lpthread -lposix4 -lrt -lc
-xtarget=opteron -m64 -xarch=sse2 -mt -xtarget=opteron -xtarget=opteron -m64
-xarch=sse2 -mt -mt
The differences on my box:
(1) The above diffs applied.
(2) For the amd64 build, I tweaked the options
to build debug symbols (and to not strip them).
(3) This is using libtool 2.2.4 (still experimenting
with that).
Thanks, Mark
--
-------------- next part --------------
A non-text attachment was scrubbed...
Name: Makefile.in.1.diff
Type: application/octet-stream
Size: 1340 bytes
Desc: not available
URL:
<http://mail.opensolaris.org/pipermail/kde-discuss/attachments/20080527/ef3a4cd6/attachment.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: Makefile.in.3.diff
Type: application/octet-stream
Size: 1342 bytes
Desc: not available
URL:
<http://mail.opensolaris.org/pipermail/kde-discuss/attachments/20080527/ef3a4cd6/attachment-0001.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: Makefile.in.7.diff
Type: application/octet-stream
Size: 1206 bytes
Desc: not available
URL:
<http://mail.opensolaris.org/pipermail/kde-discuss/attachments/20080527/ef3a4cd6/attachment-0002.obj>
