Explorar el Código

correct dependencies in Makefiles to allow less smart link editors to work (avoids dependency to binutils)

Michael Schloh von Bennewitz hace 21 años
padre
commit
18c7c3b85e
Se han modificado 2 ficheros con 58 adiciones y 1 borrados
  1. 57 0
      ncurses/ncurses.patch
  2. 1 1
      ncurses/ncurses.spec

+ 57 - 0
ncurses/ncurses.patch

@@ -23,3 +23,60 @@ Index: include/curses.h.in
  #endif
  
  /*
+Index: ncurses/Makefile.in
+--- ncurses/Makefile.in.orig	Wed Dec 22 13:02:27 2004
++++ ncurses/Makefile.in	Wed Dec 22 13:02:30 2004
+@@ -273,7 +273,8 @@
+ 	@ECHO_LINK@ $(CC) -o $@ $(CFLAGS_DEFAULT) -DHASHDEBUG $(serial)/hashmap.c $(TEST_LDFLAGS)
+ 
+ lib_mvcur$x : $(serial)/lib_mvcur.c $(TEST_DEPS) \
+-		../@DFT_OBJ_SUBDIR@/dump_entry$o
++		../@DFT_OBJ_SUBDIR@/dump_entry$o \
++		../@DFT_OBJ_SUBDIR@/comp_parse$o
+ 	@ECHO_LINK@ $(CC) -o $@ $(CFLAGS_DEFAULT) -DNCURSES_TEST -I$(serial)/../../progs $(serial)/lib_mvcur.c ../@DFT_OBJ_SUBDIR@/dump_entry$o $(TEST_LDFLAGS)
+ 
+ link_test$x : link_test.c $(TEST_DEPS) \
+Index: progs/Makefile.in
+--- progs/Makefile.in.orig	Sat Nov  1 23:45:57 2003
++++ progs/Makefile.in	Wed Dec 22 13:04:07 2004
+@@ -192,7 +192,8 @@
+ 
+ DEPS_TIC = \
+ 	$(MODEL)/tic$o \
+-	$(MODEL)/dump_entry$o
++	$(MODEL)/dump_entry$o \
++	$(MODEL)/comp_parse$o
+ 
+ tic$x: $(DEPS_TIC) $(DEPS_CURSES) transform.h
+ 	@ECHO_LINK@ $(LINK) $(DEPS_TIC) $(LDFLAGS_DEFAULT) -o $@
+@@ -211,14 +212,16 @@
+ 	@ECHO_LINK@ $(LINK) $(DEPS_CLEAR) $(LDFLAGS_DEFAULT) -o $@
+ 
+ DEPS_TPUT = \
+-	$(MODEL)/tput$o
++	$(MODEL)/tput$o \
++	$(MODEL)/lib_tparm$o
+ 
+ tput$x: $(DEPS_TPUT) $(DEPS_CURSES) transform.h
+ 	@ECHO_LINK@ $(LINK) $(DEPS_TPUT) $(LDFLAGS_DEFAULT) -o $@
+ 
+ DEPS_INFOCMP = \
+ 	$(MODEL)/infocmp$o \
+-	$(MODEL)/dump_entry$o
++	$(MODEL)/dump_entry$o \
++	$(MODEL)/comp_parse$o
+ 
+ infocmp$x: $(DEPS_INFOCMP) $(DEPS_CURSES)
+ 	@ECHO_LINK@ $(LINK) $(DEPS_INFOCMP) $(LDFLAGS_DEFAULT) -o $@
+Index: test/Makefile.in
+--- test/Makefile.in.orig	Sun Dec  7 02:36:16 2003
++++ test/Makefile.in	Wed Dec 22 13:04:47 2004
+@@ -147,7 +147,7 @@
+ 	@ECHO_LINK@ $(LINK) -o $@ $(MODEL)/color_set$o $(LDFLAGS_DEFAULT)
+ 
+ demo_defkey$x: $(MODEL)/demo_defkey$o $(LOCAL_LIBS)
+-	@ECHO_LINK@ $(LINK) -o $@ $(MODEL)/demo_defkey$o $(LDFLAGS_DEFAULT)
++	@ECHO_LINK@ $(LINK) -o $@ $(MODEL)/demo_defkey$o $(MODEL)/key_defined$o $(LDFLAGS_DEFAULT)
+ 
+ demo_forms$x: $(MODEL)/demo_forms$o $(MODEL)/edit_field$o $(LOCAL_LIBS)
+ 	@ECHO_LINK@ $(LINK) -o $@ $(MODEL)/demo_forms$o $(MODEL)/edit_field$o $(LDFLAGS_DEFAULT)

+ 1 - 1
ncurses/ncurses.spec

@@ -82,7 +82,7 @@ Class:        BASE
 Group:        Terminal
 License:      GPL
 Version:      %{V_base}.%{V_patchL}
-Release:      20041219
+Release:      20041222
 
 #   list of sources
 Source0:      ftp://invisible-island.net/ncurses/ncurses-%{V_base}.tar.gz