OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Michael Schloh
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   09-Jun-2004 16:38:18
  Branch: HEAD                             Handle: 2004060915381700

  Modified files:
    openpkg-src/gdb         gdb.patch gdb.spec

  Log:
    patch for building on systems that have a S5R4 style curses library

  Summary:
    Revision    Changes     Path
    1.6         +455 -1     openpkg-src/gdb/gdb.patch
    1.29        +6  -3      openpkg-src/gdb/gdb.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/gdb/gdb.patch
  ============================================================================
  $ cvs diff -u -r1.5 -r1.6 gdb.patch
  --- openpkg-src/gdb/gdb.patch 1 Jun 2004 20:35:37 -0000       1.5
  +++ openpkg-src/gdb/gdb.patch 9 Jun 2004 14:38:17 -0000       1.6
  @@ -1,7 +1,23 @@
   Index: Makefile.in
   --- Makefile.in.orig 2004-06-01 22:30:36.837939881 +0200
   +++ Makefile.in      2004-06-01 22:30:47.314628468 +0200
  -@@ -415,10 +415,6 @@
  +@@ -217,6 +217,7 @@
  + 
  + CC = @CC@
  + CFLAGS = @CFLAGS@
  ++CPPFLAGS = @CPPFLAGS@
  + LIBCFLAGS = $(CFLAGS)
  + 
  + CXX = @CXX@
  +@@ -278,6 +279,7 @@
  + # (which we know are built with gcc) are built with optimizations so
  + # prepend -O2 when setting CFLAGS_FOR_TARGET.
  + CFLAGS_FOR_TARGET = -O2 $(CFLAGS)
  ++CPPFLAGS_FOR_TARGET = $(CPPFLAGS)
  + # If GCC_FOR_TARGET is not overriden on the command line, then this
  + # variable is passed down to the gcc Makefile, where it is used to
  + # build libgcc2.a.  We define it here so that it can itself be
  +@@ -415,10 +417,6 @@
        "CC_FOR_BUILD=$(CC_FOR_BUILD)" \
        "CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
        "EXPECT=$(EXPECT)" \
  @@ -12,3 +28,441 @@
        "LEX=$(LEX)" \
        "M4=$(M4)" \
        "MAKE=$(MAKE)" \
  +@@ -428,6 +426,7 @@
  +     "YACC=$(YACC)" \
  +     "AR_FLAGS=$(AR_FLAGS)" \
  +     "CFLAGS=$(CFLAGS)" \
  ++    "CPPFLAGS=$(CPPFLAGS)" \
  +     "CXXFLAGS=$(CXXFLAGS)" \
  +     "LDFLAGS=$(LDFLAGS)" \
  +     "LIBCFLAGS=$(LIBCFLAGS)" \
  +@@ -493,6 +492,7 @@
  +     'AS=$$(AS_FOR_TARGET)' \
  +     'CC=$$(CC_FOR_TARGET)' \
  +     'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
  ++    'CPPFLAGS=$$(CPPFLAGS_FOR_TARGET)' \
  +     'CXX=$$(CXX_FOR_TARGET)' \
  +     'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
  +     'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
  +@@ -21695,6 +21695,7 @@
  +     s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  +     CC="$(CC)"; export CC; \
  +     CFLAGS="$(CFLAGS)"; export CFLAGS; \
  ++    CPPFLAGS="$(CPPFLAGS)"; export CPPFLAGS; \
  +     CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
  +     CXX="$(CXX)"; export CXX; \
  +     CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
  +Index: gdb/configure.in
  +--- gdb/configure.in.orig    2004-06-09 11:36:45.889533600 +0200
  ++++ gdb/configure.in 2004-06-09 11:36:55.899816800 +0200
  +@@ -374,7 +374,7 @@
  +    Solaris 2.[78] when using GCC. ]])
  +     fi ;;
  + esac
  +-AC_CHECK_HEADERS(curses.h ncurses.h term.h)
  ++AC_CHECK_HEADERS(ncurses.h term.h curses.h)
  + 
  + # FIXME: kettenis/20030102: In most cases we include these
  + # unconditionally, so what's the point in checking these?
  +Index: gdb/configure
  +--- gdb/configure.orig       2004-02-26 01:41:46.000000000 +0100
  ++++ gdb/configure    2004-06-09 11:37:18.718615900 +0200
  +@@ -5569,7 +5569,7 @@
  + 
  +     fi ;;
  + esac
  +-for ac_hdr in curses.h ncurses.h term.h
  ++for ac_hdr in ncurses.h term.h curses.h
  + do
  + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  +Index: gdb/Makefile.in
  +--- gdb/Makefile.in.orig     2004-02-28 19:04:36 +0100
  ++++ gdb/Makefile.in  2004-06-09 13:04:54 +0200
  +@@ -329,6 +329,7 @@
  + # CFLAGS is specifically reserved for setting from the command line
  + # when running make.  I.E.  "make CFLAGS=-Wmissing-prototypes".
  + CFLAGS = @CFLAGS@
  ++CPPFLAGS = @CPPFLAGS@
  + 
  + # Need to pass this to testsuite for "make check".  Probably should be
  + # consistent with top-level Makefile.in and gdb/testsuite/Makefile.in
  +@@ -429,6 +430,7 @@
  +     "AR_FLAGS=$(AR_FLAGS)" \
  +     "CC=$(CC)" \
  +     "CFLAGS=$(CFLAGS)" \
  ++    "CPPFLAGS=$(CPPFLAGS)" \
  +     "CXX=$(CXX)" \
  +     "CXXFLAGS=$(CXXFLAGS)" \
  +     "DLLTOOL=$(DLLTOOL)" \
  +@@ -488,6 +490,7 @@
  +     'CC=$$(CC_FOR_TARGET)' \
  +     "CC_FOR_TARGET=$(CC_FOR_TARGET)" \
  +     "CFLAGS=$(CFLAGS)" \
  ++    "CPPFLAGS=$(CPPFLAGS)" \
  +     'CXX=$$(CXX_FOR_TARGET)' \
  +     "CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
  +     "CXXFLAGS=$(CXXFLAGS)" \
  +@@ -928,7 +931,7 @@
  + # Prevent Sun make from putting in the machine type.  Setting
  + # TARGET_ARCH to nothing works for SunOS 3, 4.0, but not for 4.1.
  + .c.o:
  +-    $(CC) -c $(INTERNAL_CFLAGS) $<
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $<
  + 
  + all: gdb$(EXEEXT) $(CONFIG_ALL)
  +     @$(MAKE) $(FLAGS_TO_PASS) DO=all "DODIRS=`echo $(SUBDIRS) | sed 
's/testsuite//'`" subdir_do
  +@@ -1371,16 +1374,16 @@
  + 
  + # Provide explicit rule/dependency - works for more makes.
  + copying.o: $(srcdir)/copying.c
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/copying.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/copying.c
  + 
  + hpux-thread.o: $(srcdir)/hpux-thread.c
  +-    $(CC) -c $(INTERNAL_CFLAGS) -I$(srcdir)/osf-share \
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) -I$(srcdir)/osf-share \
  +             -I$(srcdir)/osf-share/HP800 -I/usr/include/dce \
  +             $(srcdir)/hpux-thread.c
  + 
  + # main.o needs an explicit build rule to get TARGET_SYSTEM_ROOT and BINDIR.
  + main.o: main.c
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(TARGET_SYSTEM_ROOT_DEFINE) \
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(TARGET_SYSTEM_ROOT_DEFINE) \
  +             -DBINDIR=\"$(bindir)\" $(srcdir)/main.c
  + 
  + # FIXME: cagney/2003-08-10: "monitor.c" gets -Wformat-nonliteral
  +@@ -1411,7 +1414,7 @@
  +             $(srcdir)/thread-db.c
  + 
  + v850ice.o: $(srcdir)/v850ice.c
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) \
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) \
  +             $(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) \
  +             $(GDBTK_CFLAGS) \
  +             $(srcdir)/v850ice.c
  +@@ -2511,31 +2514,31 @@
  +     $(objfiles_h) $(source_h) $(disasm_h) $(ui_out_h) $(top_h) \
  +     $(cli_decode_h) $(cli_script_h) $(cli_setshow_h) $(cli_cmds_h) \
  +     $(tui_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/cli/cli-cmds.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/cli/cli-cmds.c
  + cli-decode.o: $(srcdir)/cli/cli-decode.c $(defs_h) $(symtab_h) \
  +     $(gdb_regex_h) $(gdb_string_h) $(ui_out_h) $(cli_cmds_h) \
  +     $(cli_decode_h) $(tui_h) $(gdb_assert_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/cli/cli-decode.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/cli/cli-decode.c
  + cli-dump.o: $(srcdir)/cli/cli-dump.c $(defs_h) $(gdb_string_h) \
  +     $(cli_decode_h) $(cli_cmds_h) $(value_h) $(completer_h) \
  +     $(cli_dump_h) $(gdb_assert_h) $(target_h) $(readline_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/cli/cli-dump.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/cli/cli-dump.c
  + cli-interp.o: $(srcdir)/cli/cli-interp.c $(defs_h) $(interps_h) $(wrapper_h) \
  +     $(event_top_h) $(ui_out_h) $(cli_out_h) $(top_h) $(gdb_string_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/cli/cli-interp.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/cli/cli-interp.c
  + cli-logging.o: $(srcdir)/cli/cli-logging.c $(defs_h) $(gdbcmd_h) $(ui_out_h) \
  +     $(gdb_string_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/cli/cli-logging.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/cli/cli-logging.c
  + cli-script.o: $(srcdir)/cli/cli-script.c $(defs_h) $(value_h) $(language_h) \
  +     $(ui_out_h) $(gdb_string_h) $(top_h) $(cli_cmds_h) $(cli_decode_h) \
  +     $(cli_script_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/cli/cli-script.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/cli/cli-script.c
  + cli-setshow.o: $(srcdir)/cli/cli-setshow.c $(defs_h) $(readline_tilde_h) \
  +     $(value_h) $(gdb_string_h) $(ui_out_h) $(cli_decode_h) $(cli_cmds_h) \
  +     $(cli_setshow_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/cli/cli-setshow.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/cli/cli-setshow.c
  + cli-utils.o: $(srcdir)/cli/cli-utils.c $(defs_h) $(cli_utils_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/cli/cli-utils.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/cli/cli-utils.c
  + 
  + #
  + # GDBTK sub-directory
  +@@ -2605,7 +2608,7 @@
  +     $(symtab_h) $(inferior_h) $(command_h) \
  +     $(bfd_h) $(symfile_h) $(objfiles_h) $(target_h) $(gdb_string_h) \
  +     $(tracepoint_h) $(top_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) \
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) \
  +         $(ITK_CFLAGS)  \
  +     $(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) $(GDBTK_CFLAGS)\
  +             $(srcdir)/gdbtk/generic/gdbtk.c \
  +@@ -2616,7 +2619,7 @@
  +             $(srcdir)/gdbtk/generic/gdbtk-cmds.h \
  +             $(defs_h) $(breakpoint_h) $(tracepoint_h) \
  +             $(symfile_h) $(symtab_h) $(gdb_string_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) \
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) \
  +      $(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS)   \
  +     $(GDBTK_CFLAGS) $(srcdir)/gdbtk/generic/gdbtk-bp.c \
  +     -DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\"
  +@@ -2627,7 +2630,7 @@
  +     $(gdbcore_h) $(demangle_h) $(linespec_h) $(tui_file_h) $(top_h) \
  +     $(annotate_h) $(block_h) $(dictionary_h) $(gdb_string_h) \
  +     $(dis_asm_h) $(gdbcmd_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS)        \
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS)    \
  +      $(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS)               \
  +     $(GDBTK_CFLAGS) $(srcdir)/gdbtk/generic/gdbtk-cmds.c            \
  +     -DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\"
  +@@ -2637,7 +2640,7 @@
  +     $(symtab_h) $(inferior_h) $(command_h) \
  +     $(bfd_h) $(symfile_h) $(objfiles_h) $(target_h) $(gdb_string_h) \
  +     $(tracepoint_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS)  \
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS)  \
  +     $(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) $(GDBTK_CFLAGS)\
  +             $(srcdir)/gdbtk/generic/gdbtk-hooks.c 
-DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\"
  + 
  +@@ -2645,13 +2648,13 @@
  +     $(defs_h) $(interps_h) $(ui_out_h) $(ui_file_h) \
  +     $(cli_out_h) $(gdb_string_h) $(cli_cmds_h) $(cli_decode_h) \
  +     $(srcdir)/gdbtk/generic/gdbtk.h
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) \
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) \
  +     $(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) $(GDBTK_CFLAGS) \
  +             $(srcdir)/gdbtk/generic/gdbtk-interp.c
  + 
  + gdbtk-main.o: $(srcdir)/gdbtk/generic/gdbtk-main.c $(defs_h) $(main_h) \
  +     $(gdb_string_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS)  \
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS)  \
  +     $(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) $(GDBTK_CFLAGS)\
  +             $(srcdir)/gdbtk/generic/gdbtk-main.c 
-DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\"
  + 
  +@@ -2659,7 +2662,7 @@
  +             $(srcdir)/gdbtk/generic/gdbtk.h \
  +             $(srcdir)/gdbtk/generic/gdbtk-cmds.h \
  +             $(defs_h) $(frame_h) $(value_h) $(gdb_string_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) \
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) \
  +      $(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS)   \
  +     $(GDBTK_CFLAGS) $(srcdir)/gdbtk/generic/gdbtk-register.c \
  +     -DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\"
  +@@ -2669,7 +2672,7 @@
  +     $(srcdir)/gdbtk/generic/gdbtk-wrapper.h \
  +     $(defs_h) $(target_h) $(breakpoint_h) $(linespec_h) \
  +     $(block_h) $(dictionary_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) \
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) \
  +      $(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS)   \
  +     $(GDBTK_CFLAGS) $(srcdir)/gdbtk/generic/gdbtk-stack.c \
  +     -DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\"
  +@@ -2677,14 +2680,14 @@
  + gdbtk-varobj.o: $(srcdir)/gdbtk/generic/gdbtk-varobj.c \
  +             $(srcdir)/gdbtk/generic/gdbtk.h \
  +             $(defs_h) $(value_h) $(varobj_h) $(gdb_string_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS)  \
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS)  \
  +     $(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) $(GDBTK_CFLAGS)\
  +             $(srcdir)/gdbtk/generic/gdbtk-varobj.c
  + 
  + gdbtk-wrapper.o: $(srcdir)/gdbtk/generic/gdbtk-wrapper.c \
  +     $(srcdir)/gdbtk/generic/gdbtk-wrapper.h \
  +     $(defs_h) $(frame_h) $(value_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(GDBTK_CFLAGS)\
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(IDE_CFLAGS) $(GDBTK_CFLAGS)\
  +             $(srcdir)/gdbtk/generic/gdbtk-wrapper.c
  + 
  + #
  +@@ -2696,52 +2699,52 @@
  + mi-cmd-break.o: $(srcdir)/mi/mi-cmd-break.c $(defs_h) $(mi_cmds_h) \
  +     $(ui_out_h) $(mi_out_h) $(breakpoint_h) $(gdb_string_h) \
  +     $(mi_getopt_h) $(gdb_events_h) $(gdb_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-cmd-break.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/mi/mi-cmd-break.c
  + mi-cmd-disas.o: $(srcdir)/mi/mi-cmd-disas.c $(defs_h) $(target_h) $(value_h) \
  +     $(mi_cmds_h) $(mi_getopt_h) $(gdb_string_h) $(ui_out_h) $(disasm_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-cmd-disas.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/mi/mi-cmd-disas.c
  + mi-cmd-env.o: $(srcdir)/mi/mi-cmd-env.c $(defs_h) $(inferior_h) $(value_h) \
  +     $(mi_out_h) $(mi_cmds_h) $(mi_getopt_h) $(symtab_h) $(target_h) \
  +     $(environ_h) $(command_h) $(ui_out_h) $(top_h) $(gdb_string_h) \
  +     $(gdb_stat_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-cmd-env.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/mi/mi-cmd-env.c
  + mi-cmd-file.o: $(srcdir)/mi/mi-cmd-file.c $(defs_h) $(mi_cmds_h) \
  +     $(mi_getopt_h) $(ui_out_h) $(symtab_h) $(source_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-cmd-file.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/mi/mi-cmd-file.c
  + mi-cmds.o: $(srcdir)/mi/mi-cmds.c $(defs_h) $(top_h) $(mi_cmds_h) \
  +     $(gdb_string_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-cmds.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/mi/mi-cmds.c
  + mi-cmd-stack.o: $(srcdir)/mi/mi-cmd-stack.c $(defs_h) $(target_h) $(frame_h) \
  +     $(value_h) $(mi_cmds_h) $(ui_out_h) $(symtab_h) $(block_h) \
  +     $(stack_h) $(dictionary_h) $(gdb_string_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-cmd-stack.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/mi/mi-cmd-stack.c
  + mi-cmd-var.o: $(srcdir)/mi/mi-cmd-var.c $(defs_h) $(mi_cmds_h) $(ui_out_h) \
  +     $(mi_out_h) $(varobj_h) $(value_h) $(gdb_string_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-cmd-var.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/mi/mi-cmd-var.c
  + mi-console.o: $(srcdir)/mi/mi-console.c $(defs_h) $(mi_console_h) \
  +     $(gdb_string_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-console.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/mi/mi-console.c
  + mi-getopt.o: $(srcdir)/mi/mi-getopt.c $(defs_h) $(mi_getopt_h) \
  +     $(gdb_string_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-getopt.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/mi/mi-getopt.c
  + mi-interp.o: $(srcdir)/mi/mi-interp.c $(defs_h) $(gdb_string_h) $(interps_h) \
  +     $(event_top_h) $(event_loop_h) $(inferior_h) $(ui_out_h) $(top_h) \
  +     $(mi_main_h) $(mi_cmds_h) $(mi_out_h) $(mi_console_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-interp.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/mi/mi-interp.c
  + mi-main.o: $(srcdir)/mi/mi-main.c $(defs_h) $(target_h) $(inferior_h) \
  +     $(gdb_string_h) $(top_h) $(gdbthread_h) $(mi_cmds_h) $(mi_parse_h) \
  +     $(mi_getopt_h) $(mi_console_h) $(ui_out_h) $(mi_out_h) $(interps_h) \
  +     $(event_loop_h) $(event_top_h) $(gdbcore_h) $(value_h) $(regcache_h) \
  +     $(gdb_h) $(frame_h) $(mi_main_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-main.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/mi/mi-main.c
  + mi-out.o: $(srcdir)/mi/mi-out.c $(defs_h) $(ui_out_h) $(mi_out_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-out.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/mi/mi-out.c
  + mi-parse.o: $(srcdir)/mi/mi-parse.c $(defs_h) $(mi_cmds_h) $(mi_parse_h) \
  +     $(gdb_string_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-parse.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/mi/mi-parse.c
  + mi-symbol-cmds.o: $(srcdir)/mi/mi-symbol-cmds.c $(defs_h) $(mi_cmds_h) \
  +     $(symtab_h) $(ui_out_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-symbol-cmds.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/mi/mi-symbol-cmds.c
  + 
  + #
  + # rdi-share sub-directory
  +@@ -2767,7 +2770,7 @@
  + 
  + signals.o: $(srcdir)/signals/signals.c $(server_h) $(defs_h) $(target_h) \
  +     $(gdb_string_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/signals/signals.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/signals/signals.c
  + 
  + #
  + # gdb/tui/ dependencies
  +@@ -2780,21 +2783,21 @@
  +     $(tui_stack_h) $(tui_win_h) $(tui_winsource_h) $(tui_windata_h) \
  +     $(target_h) $(frame_h) $(breakpoint_h) $(inferior_h) $(symtab_h) \
  +     $(source_h) $(gdb_curses_h) $(readline_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/tui/tui.c
  + tui-command.o: $(srcdir)/tui/tui-command.c $(defs_h) $(tui_h) $(tui_data_h) \
  +     $(tui_win_h) $(tui_io_h) $(gdb_curses_h) $(gdb_string_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-command.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/tui/tui-command.c
  + tui-data.o: $(srcdir)/tui/tui-data.c $(defs_h) $(symtab_h) $(tui_h) \
  +     $(tui_data_h) $(tui_wingeneral_h) $(gdb_string_h) $(gdb_curses_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-data.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/tui/tui-data.c
  + tui-disasm.o: $(srcdir)/tui/tui-disasm.c $(defs_h) $(symtab_h) \
  +     $(breakpoint_h) $(frame_h) $(value_h) $(source_h) $(disasm_h) \
  +     $(gdb_string_h) $(tui_h) $(tui_data_h) $(tui_win_h) $(tui_layout_h) \
  +     $(tui_winsource_h) $(tui_stack_h) $(tui_file_h) $(gdb_curses_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-disasm.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/tui/tui-disasm.c
  + tui-file.o: $(srcdir)/tui/tui-file.c $(defs_h) $(ui_file_h) $(tui_file_h) \
  +     $(tui_io_h) $(tui_h) $(gdb_string_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-file.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/tui/tui-file.c
  + tui-hooks.o: $(srcdir)/tui/tui-hooks.c $(defs_h) $(symtab_h) $(inferior_h) \
  +     $(command_h) $(bfd_h) $(symfile_h) $(objfiles_h) $(target_h) \
  +     $(gdbcore_h) $(event_loop_h) $(event_top_h) $(frame_h) \
  +@@ -2802,63 +2805,63 @@
  +     $(tui_h) $(tui_hooks_h) $(tui_data_h) $(tui_layout_h) $(tui_io_h) \
  +     $(tui_regs_h) $(tui_win_h) $(tui_stack_h) $(tui_windata_h) \
  +     $(tui_winsource_h) $(gdb_curses_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-hooks.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/tui/tui-hooks.c
  + tui-interp.o: $(srcdir)/tui/tui-interp.c $(defs_h) $(interps_h) $(top_h) \
  +     $(event_top_h) $(event_loop_h) $(ui_out_h) $(cli_out_h) \
  +     $(tui_data_h) $(readline_h) $(tui_win_h) $(tui_h) $(tui_io_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-interp.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/tui/tui-interp.c
  + tui-io.o: $(srcdir)/tui/tui-io.c $(defs_h) $(terminal_h) $(target_h) \
  +     $(event_loop_h) $(event_top_h) $(command_h) $(top_h) $(readline_h) \
  +     $(tui_h) $(tui_data_h) $(tui_io_h) $(tui_command_h) $(tui_win_h) \
  +     $(tui_wingeneral_h) $(tui_file_h) $(ui_out_h) $(cli_out_h) \
  +     $(gdb_curses_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-io.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/tui/tui-io.c
  + tui-layout.o: $(srcdir)/tui/tui-layout.c $(defs_h) $(command_h) $(symtab_h) \
  +     $(frame_h) $(source_h) $(tui_h) $(tui_data_h) $(tui_windata_h) \
  +     $(tui_wingeneral_h) $(tui_stack_h) $(tui_regs_h) $(tui_win_h) \
  +     $(tui_winsource_h) $(tui_disasm_h) $(gdb_string_h) $(gdb_curses_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-layout.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/tui/tui-layout.c
  + tui-main.o: $(srcdir)/tui/tui-main.c $(defs_h) $(main_h) $(gdb_string_h) \
  +     $(interps_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-main.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/tui/tui-main.c
  + tui-out.o: $(srcdir)/tui/tui-out.c $(defs_h) $(ui_out_h) $(tui_h) \
  +     $(gdb_string_h) $(gdb_assert_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-out.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/tui/tui-out.c
  + tui-regs.o: $(srcdir)/tui/tui-regs.c $(defs_h) $(tui_h) $(tui_data_h) \
  +     $(symtab_h) $(gdbtypes_h) $(gdbcmd_h) $(frame_h) $(regcache_h) \
  +     $(inferior_h) $(target_h) $(gdb_string_h) $(tui_layout_h) \
  +     $(tui_win_h) $(tui_windata_h) $(tui_wingeneral_h) $(tui_file_h) \
  +     $(gdb_curses_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-regs.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/tui/tui-regs.c
  + tui-source.o: $(srcdir)/tui/tui-source.c $(defs_h) $(symtab_h) $(frame_h) \
  +     $(breakpoint_h) $(source_h) $(symtab_h) $(tui_h) $(tui_data_h) \
  +     $(tui_stack_h) $(tui_winsource_h) $(tui_source_h) $(gdb_string_h) \
  +     $(gdb_curses_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-source.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/tui/tui-source.c
  + tui-stack.o: $(srcdir)/tui/tui-stack.c $(defs_h) $(symtab_h) $(breakpoint_h) \
  +     $(frame_h) $(command_h) $(inferior_h) $(target_h) $(top_h) \
  +     $(gdb_string_h) $(tui_h) $(tui_data_h) $(tui_stack_h) \
  +     $(tui_wingeneral_h) $(tui_source_h) $(tui_winsource_h) $(tui_file_h) \
  +     $(gdb_curses_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-stack.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/tui/tui-stack.c
  + tui-win.o: $(srcdir)/tui/tui-win.c $(defs_h) $(command_h) $(symtab_h) \
  +     $(breakpoint_h) $(frame_h) $(cli_cmds_h) $(top_h) $(source_h) \
  +     $(tui_h) $(tui_data_h) $(tui_wingeneral_h) $(tui_stack_h) \
  +     $(tui_regs_h) $(tui_disasm_h) $(tui_source_h) $(tui_winsource_h) \
  +     $(tui_windata_h) $(gdb_curses_h) $(gdb_string_h) $(readline_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-win.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/tui/tui-win.c
  + tui-windata.o: $(srcdir)/tui/tui-windata.c $(defs_h) $(tui_h) $(tui_data_h) \
  +     $(tui_wingeneral_h) $(tui_regs_h) $(gdb_string_h) $(gdb_curses_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-windata.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/tui/tui-windata.c
  + tui-wingeneral.o: $(srcdir)/tui/tui-wingeneral.c $(defs_h) $(tui_h) \
  +     $(tui_data_h) $(tui_wingeneral_h) $(tui_win_h) $(gdb_curses_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-wingeneral.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/tui/tui-wingeneral.c
  + tui-winsource.o: $(srcdir)/tui/tui-winsource.c $(defs_h) $(symtab_h) \
  +     $(frame_h) $(breakpoint_h) $(value_h) $(source_h) $(tui_h) \
  +     $(tui_data_h) $(tui_stack_h) $(tui_win_h) $(tui_wingeneral_h) \
  +     $(tui_winsource_h) $(tui_source_h) $(tui_disasm_h) $(gdb_string_h) \
  +     $(gdb_curses_h)
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-winsource.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/tui/tui-winsource.c
  + 
  + #
  + # vx-share sub-directory
  +@@ -2866,14 +2869,14 @@
  + 
  + xdr_ld.o: vx-share/xdr_ld.c $(defs_h) vx-share/vxTypes.h \
  +     vx-share/vxWorks.h vx-share/xdr_ld.h
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/vx-share/xdr_ld.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/vx-share/xdr_ld.c
  + 
  + xdr_ptrace.o: vx-share/xdr_ptrace.c $(defs_h) vx-share/vxTypes.h \
  +     vx-share/vxWorks.h vx-share/xdr_ptrace.h
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/vx-share/xdr_ptrace.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/vx-share/xdr_ptrace.c
  + 
  + xdr_rdb.o: vx-share/xdr_rdb.c $(defs_h) vx-share/vxTypes.h \
  +     vx-share/vxWorks.h vx-share/xdr_rdb.h
  +-    $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/vx-share/xdr_rdb.c
  ++    $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/vx-share/xdr_rdb.c
  + 
  + ### end of the gdb Makefile.in.
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/gdb/gdb.spec
  ============================================================================
  $ cvs diff -u -r1.28 -r1.29 gdb.spec
  --- openpkg-src/gdb/gdb.spec  2 Jun 2004 10:50:40 -0000       1.28
  +++ openpkg-src/gdb/gdb.spec  9 Jun 2004 14:38:17 -0000       1.29
  @@ -34,7 +34,7 @@
   Group:        Development
   License:      GPL
   Version:      6.1
  -Release:      20040602
  +Release:      20040609
   
   #   list of sources
   Source0:      ftp://ftp.gnu.org/gnu/gdb/gdb-%{version}.tar.gz
  @@ -43,8 +43,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130, make, ncurses
  -PreReq:       OpenPKG, openpkg >= 20040130
  +BuildPreReq:  OpenPKG, openpkg >= 20040130, make, ncurses, libiconv
  +PreReq:       OpenPKG, openpkg >= 20040130, ncurses, libiconv
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -67,6 +67,9 @@
   %build
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
  +    CPPFLAGS="%{l_cppflags ncurses}" \
  +    LDFLAGS="%{l_ldflags}" \
  +    LIBS="-liconv" \
       ./configure \
           --prefix=%{l_prefix} \
           --disable-nls
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to