SOURCES: ncurses-linking.patch - now it must work !

sparky sparky at pld-linux.org
Sat Aug 5 18:52:32 CEST 2006


Author: sparky                       Date: Sat Aug  5 16:52:32 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- now it must work !

---- Files affected:
SOURCES:
   ncurses-linking.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/ncurses-linking.patch
diff -u SOURCES/ncurses-linking.patch:1.4 SOURCES/ncurses-linking.patch:1.5
--- SOURCES/ncurses-linking.patch:1.4	Sat Aug  5 18:42:49 2006
+++ SOURCES/ncurses-linking.patch	Sat Aug  5 18:52:26 2006
@@ -1,6 +1,6 @@
 diff -Nur ncurses-5.5.orig/mk-1st.awk ncurses-5.5.linking/mk-1st.awk
 --- ncurses-5.5.orig/mk-1st.awk	2005-06-18 21:15:57.000000000 +0200
-+++ ncurses-5.5.linking/mk-1st.awk	2006-08-05 18:39:24.000000000 +0200
++++ ncurses-5.5.linking/mk-1st.awk	2006-08-05 18:50:18.000000000 +0200
 @@ -210,9 +210,9 @@
  					print "\t- at rm -f $@";
  				}
@@ -14,8 +14,8 @@
  				sharedlinks("../lib")
  
 diff -Nur ncurses-5.5.orig/progs/Makefile.in ncurses-5.5.linking/progs/Makefile.in
---- ncurses-5.5.orig/progs/Makefile.in	2006-08-05 18:39:19.000000000 +0200
-+++ ncurses-5.5.linking/progs/Makefile.in	2006-08-05 18:42:00.000000000 +0200
+--- ncurses-5.5.orig/progs/Makefile.in	2006-08-05 18:50:12.000000000 +0200
++++ ncurses-5.5.linking/progs/Makefile.in	2006-08-05 18:50:21.000000000 +0200
 @@ -96,7 +96,8 @@
  LD		= @LD@
  LINK		= @LINK_PROGS@ $(LIBTOOL_LINK) $(CC)
@@ -75,31 +75,23 @@
  	sh $(srcdir)/MKtermsort.sh $(AWK) $(srcdir)/../include/@TERMINFO_CAPS@ >$@
 diff -Nur ncurses-5.5.orig/tack/Makefile.in ncurses-5.5.linking/tack/Makefile.in
 --- ncurses-5.5.orig/tack/Makefile.in	2005-06-19 01:01:59.000000000 +0200
-+++ ncurses-5.5.linking/tack/Makefile.in	2006-08-05 18:41:40.000000000 +0200
-@@ -64,7 +64,7 @@
++++ ncurses-5.5.linking/tack/Makefile.in	2006-08-05 18:51:31.000000000 +0200
+@@ -64,7 +64,8 @@
  LD		= @LD@
  LINK		= @LINK_PROGS@ $(LIBTOOL_LINK) $(CC)
  LDFLAGS		= @EXTRA_LDFLAGS@ \
 -		@TINFO_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@
 +		@LDFLAGS@ @LD_MODEL@
++LIBS		= @TINFO_ARGS@ @LIBS@
  
  LDFLAGS_LIBTOOL	= $(LDFLAGS) $(CFLAGS_LIBTOOL)
  LDFLAGS_NORMAL	= $(LDFLAGS) $(CFLAGS_NORMAL)
-@@ -76,7 +76,7 @@
- 
- LINT		= @LINT@
- LINT_OPTS	= @LINT_OPTS@
--LINT_LIBS	= -lncurses at LIB_SUFFIX@ @LIBS@
-+LINT_LIBS	= -lncurses at LIB_SUFFIX@ @TINFO_ARGS@ @LIBS@
- 
- PROGS = tack$x
- 
-@@ -135,7 +135,7 @@
+@@ -135,7 +136,7 @@
  	$(MODEL)/tack$o
  
  tack$x: $(DEPS_TACK) $(DEPS_CURSES)
 -	@ECHO_LINK@ $(LINK) $(DEPS_TACK) $(LDFLAGS_DEFAULT) -o $@
-+	@ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_TACK) -o $@
++	@ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_TACK) $(LIBS) -o $@
  
  #
  # Utility productions start here
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/ncurses-linking.patch?r1=1.4&r2=1.5&f=u



More information about the pld-cvs-commit mailing list