[packages/compat-ncurses5.git] / ncurses-linking.patch

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
@@ -210,9 +210,9 @@
 					print "\t-@rm -f $@";
 				}
 				if ( subset == "termlib" || subset == "termlib+ext_tinfo" ) {
-					printf "\t$(MK_SHARED_LIB) $(%s_OBJS) $(TINFO_LIST) $(LDFLAGS)\n", OBJS
+					printf "\t$(MK_SHARED_LIB) $(LDFLAGS) $(%s_OBJS) $(TINFO_LIST)\n", OBJS
 				} else {
-					printf "\t$(MK_SHARED_LIB) $(%s_OBJS) $(SHLIB_LIST) $(LDFLAGS)\n", OBJS
+					printf "\t$(MK_SHARED_LIB) $(LDFLAGS) $(%s_OBJS) $(SHLIB_LIST)\n", OBJS
 				}
 				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
@@ -96,7 +96,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)
@@ -207,40 +208,40 @@
 	$(MODEL)/dump_entry$o
 
 tic$x: $(DEPS_TIC) $(DEPS_CURSES) transform.h
-	@ECHO_LINK@ $(LINK) $(DEPS_TIC) $(LDFLAGS_DEFAULT) -o $@
+	@ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_TIC) $(LIBS) -o $@
 
 DEPS_TOE = \
 	$(MODEL)/toe$o \
 	$(MODEL)/dump_entry$o
 
 toe$x: $(DEPS_TOE) $(DEPS_CURSES)
-	@ECHO_LINK@ $(LINK) $(DEPS_TOE) $(LDFLAGS_DEFAULT) -o $@
+	@ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_TOE) $(LIBS) -o $@
 
 DEPS_CLEAR = \
 	$(MODEL)/clear$o
 
 clear$x: $(DEPS_CLEAR) $(DEPS_CURSES)
-	@ECHO_LINK@ $(LINK) $(DEPS_CLEAR) $(LDFLAGS_DEFAULT) -o $@
+	@ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_CLEAR) $(LIBS) -o $@
 
 DEPS_TPUT = \
 	$(MODEL)/tput$o
 
 tput$x: $(DEPS_TPUT) $(DEPS_CURSES) transform.h
-	@ECHO_LINK@ $(LINK) $(DEPS_TPUT) $(LDFLAGS_DEFAULT) -o $@
+	@ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_TPUT) $(LIBS) -o $@
 
 DEPS_INFOCMP = \
 	$(MODEL)/infocmp$o \
 	$(MODEL)/dump_entry$o
 
 infocmp$x: $(DEPS_INFOCMP) $(DEPS_CURSES)
-	@ECHO_LINK@ $(LINK) $(DEPS_INFOCMP) $(LDFLAGS_DEFAULT) -o $@
+	@ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_INFOCMP) $(LIBS) -o $@
 
 DEPS_TSET = \
 	$(MODEL)/tset$o \
 	$(MODEL)/dump_entry$o
 
 tset$x: $(DEPS_TSET) $(DEPS_CURSES) transform.h
-	@ECHO_LINK@ $(LINK) $(DEPS_TSET) $(LDFLAGS_DEFAULT) -o $@
+	@ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_TSET) $(LIBS) -o $@
 
 termsort.c: $(srcdir)/MKtermsort.sh
 	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 @@
 LD		= @LD@
 LINK		= @LINK_PROGS@ $(LIBTOOL_LINK) $(CC)
 LDFLAGS		= @EXTRA_LDFLAGS@ \
-		@TINFO_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@
+		@LDFLAGS@ @LD_MODEL@
 
 LDFLAGS_LIBTOOL	= $(LDFLAGS) $(CFLAGS_LIBTOOL)
 LDFLAGS_NORMAL	= $(LDFLAGS) $(CFLAGS_NORMAL)
@@ -76,7 +76,7 @@
 
 LINT		= @LINT@
 LINT_OPTS	= @LINT_OPTS@
-LINT_LIBS	= -lncurses@LIB_SUFFIX@ @LIBS@
+LINT_LIBS	= -lncurses@LIB_SUFFIX@ @TINFO_ARGS@ @LIBS@
 
 PROGS = tack$x
 
@@ -135,7 +135,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 $@
 
 #
 # Utility productions start here
Commit	Line	Data
6f227c9a	1	diff -Nur ncurses-5.5.orig/mk-1st.awk ncurses-5.5.linking/mk-1st.awk
6f227c9a	2	--- ncurses-5.5.orig/mk-1st.awk 2005-06-18 21:15:57.000000000 +0200
f6ba453e	3	+++ ncurses-5.5.linking/mk-1st.awk 2006-08-05 18:39:24.000000000 +0200
6f227c9a	4	@@ -210,9 +210,9 @@
	5	print "\t-@rm -f $@";
	6	}
	7	if ( subset == "termlib" \|\| subset == "termlib+ext_tinfo" ) {
	8	- printf "\t$(MK_SHARED_LIB) $(%s_OBJS) $(TINFO_LIST) $(LDFLAGS)\n", OBJS
	9	+ printf "\t$(MK_SHARED_LIB) $(LDFLAGS) $(%s_OBJS) $(TINFO_LIST)\n", OBJS
	10	} else {
	11	- printf "\t$(MK_SHARED_LIB) $(%s_OBJS) $(SHLIB_LIST) $(LDFLAGS)\n", OBJS
	12	+ printf "\t$(MK_SHARED_LIB) $(LDFLAGS) $(%s_OBJS) $(SHLIB_LIST)\n", OBJS
	13	}
	14	sharedlinks("../lib")
	15
a1a1cfd0	16	diff -Nur ncurses-5.5.orig/progs/Makefile.in ncurses-5.5.linking/progs/Makefile.in
f6ba453e	17	--- ncurses-5.5.orig/progs/Makefile.in 2006-08-05 18:39:19.000000000 +0200
f6ba453e	18	+++ ncurses-5.5.linking/progs/Makefile.in 2006-08-05 18:42:00.000000000 +0200
a1a1cfd0	19	@@ -96,7 +96,8 @@
	20	LD = @LD@
	21	LINK = @LINK_PROGS@ $(LIBTOOL_LINK) $(CC)
	22	LDFLAGS = @EXTRA_LDFLAGS@ \
	23	- @TINFO_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@
f6ba453e	24	+ @LDFLAGS@ @LD_MODEL@
f6ba453e	25	+LIBS = @TINFO_ARGS@ @LIBS@
a1a1cfd0	26
	27	LDFLAGS_LIBTOOL = $(LDFLAGS) $(CFLAGS_LIBTOOL)
	28	LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL)
	29	@@ -207,40 +208,40 @@
	30	$(MODEL)/dump_entry$o
	31
	32	tic$x: $(DEPS_TIC) $(DEPS_CURSES) transform.h
	33	- @ECHO_LINK@ $(LINK) $(DEPS_TIC) $(LDFLAGS_DEFAULT) -o $@
	34	+ @ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_TIC) $(LIBS) -o $@
	35
	36	DEPS_TOE = \
	37	$(MODEL)/toe$o \
	38	$(MODEL)/dump_entry$o
	39
	40	toe$x: $(DEPS_TOE) $(DEPS_CURSES)
	41	- @ECHO_LINK@ $(LINK) $(DEPS_TOE) $(LDFLAGS_DEFAULT) -o $@
	42	+ @ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_TOE) $(LIBS) -o $@
	43
	44	DEPS_CLEAR = \
	45	$(MODEL)/clear$o
	46
	47	clear$x: $(DEPS_CLEAR) $(DEPS_CURSES)
	48	- @ECHO_LINK@ $(LINK) $(DEPS_CLEAR) $(LDFLAGS_DEFAULT) -o $@
	49	+ @ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_CLEAR) $(LIBS) -o $@
	50
	51	DEPS_TPUT = \
	52	$(MODEL)/tput$o
	53
	54	tput$x: $(DEPS_TPUT) $(DEPS_CURSES) transform.h
	55	- @ECHO_LINK@ $(LINK) $(DEPS_TPUT) $(LDFLAGS_DEFAULT) -o $@
	56	+ @ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_TPUT) $(LIBS) -o $@
	57
	58	DEPS_INFOCMP = \
	59	$(MODEL)/infocmp$o \
	60	$(MODEL)/dump_entry$o
	61
	62	infocmp$x: $(DEPS_INFOCMP) $(DEPS_CURSES)
	63	- @ECHO_LINK@ $(LINK) $(DEPS_INFOCMP) $(LDFLAGS_DEFAULT) -o $@
	64	+ @ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_INFOCMP) $(LIBS) -o $@
	65
	66	DEPS_TSET = \
	67	$(MODEL)/tset$o \
	68	$(MODEL)/dump_entry$o
	69
	70	tset$x: $(DEPS_TSET) $(DEPS_CURSES) transform.h
	71	- @ECHO_LINK@ $(LINK) $(DEPS_TSET) $(LDFLAGS_DEFAULT) -o $@
	72	+ @ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_TSET) $(LIBS) -o $@
	73
	74	termsort.c: $(srcdir)/MKtermsort.sh
	75	sh $(srcdir)/MKtermsort.sh $(AWK) $(srcdir)/../include/@TERMINFO_CAPS@ >$@
	76	diff -Nur ncurses-5.5.orig/tack/Makefile.in ncurses-5.5.linking/tack/Makefile.in
	77	--- ncurses-5.5.orig/tack/Makefile.in 2005-06-19 01:01:59.000000000 +0200
f6ba453e	78	+++ ncurses-5.5.linking/tack/Makefile.in 2006-08-05 18:41:40.000000000 +0200
a1a1cfd0	79	@@ -64,7 +64,7 @@
	80	LD = @LD@
	81	LINK = @LINK_PROGS@ $(LIBTOOL_LINK) $(CC)
	82	LDFLAGS = @EXTRA_LDFLAGS@ \
	83	- @TINFO_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@
f6ba453e	84	+ @LDFLAGS@ @LD_MODEL@
a1a1cfd0	85
	86	LDFLAGS_LIBTOOL = $(LDFLAGS) $(CFLAGS_LIBTOOL)
	87	LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL)
f6ba453e	88	@@ -76,7 +76,7 @@
	89
	90	LINT = @LINT@
	91	LINT_OPTS = @LINT_OPTS@
	92	-LINT_LIBS = -lncurses@LIB_SUFFIX@ @LIBS@
	93	+LINT_LIBS = -lncurses@LIB_SUFFIX@ @TINFO_ARGS@ @LIBS@
	94
	95	PROGS = tack$x
	96
a1a1cfd0	97	@@ -135,7 +135,7 @@
	98	$(MODEL)/tack$o
	99
	100	tack$x: $(DEPS_TACK) $(DEPS_CURSES)
	101	- @ECHO_LINK@ $(LINK) $(DEPS_TACK) $(LDFLAGS_DEFAULT) -o $@
994764fd	102	+ @ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_TACK) -o $@
a1a1cfd0	103
	104	#
	105	# Utility productions start here