components/shell/bash/patches/solaris-002.Makefile.in.patch

   1 --- Makefile.in.~1~     2020-12-04 15:51:19.000000000 +0000
   2 +++ Makefile.in 2020-12-08 18:38:17.576538831 +0000
   3 @@ -137,14 +137,15 @@
   4
   5  LOCALE_DEFS = -DLOCALEDIR='"$(localedir)"' -DPACKAGE='"$(PACKAGE)"'
   6
   7 -LOCAL_LIBS = @LOCAL_LIBS@
   8 -LIBS = $(BUILTINS_LIB) $(LIBRARIES) @LIBS@
   9 +LOCAL_LIBS += -lncurses
  10 +LIBS = $(BUILTINS_LIB) $(LIBRARIES) @LIBS@ @LOCAL_LIBS@
  11  LIBS_FOR_BUILD =
  12
  13  STATIC_LD = @STATIC_LD@
  14  LOCAL_LDFLAGS = @LOCAL_LDFLAGS@
  15
  16 -SYSTEM_FLAGS = -DPROGRAM='"$(Program)"' -DCONF_HOSTTYPE='"$(Machine)"' -DCONF_OSTYPE='"$(OS)"' -DCONF_MACHTYPE='"$(MACHTYPE)"' -DCONF_VENDOR='"$(VENDOR)"' $(LOCALE_DEFS)
  17 +SYSTEM_FLAGS = -DPROGRAM='"$(Program)"' -DCONF_HOSTTYPE='"$(Machine)"' -DCONF_OSTYPE='"$(OS)"' -DCONF_MACHTYPE='"$(MACHTYPE)"' -DCONF_VENDOR='"$(VENDOR)"' $(LOCALE_DEFS) $(CFLAGS)
  18 +
  19
  20  BASE_CCFLAGS = $(SYSTEM_FLAGS) $(LOCAL_DEFS) \
  21           $(DEFS) $(LOCAL_CFLAGS) $(INCLUDES)
  22 @@ -580,7 +581,7 @@
  23
  24  $(Program):  .build $(OBJECTS) $(BUILTINS_DEP) $(LIBDEP)
  25         $(RM) $@
  26 -       $(PURIFY) $(CC) $(BUILTINS_LDFLAGS) $(LIBRARY_LDFLAGS) $(LDFLAGS) -o $(Program) $(OBJECTS) $(LIBS)
  27 +       $(PURIFY) $(CC) $(CFLAGS) $(BUILTINS_LDFLAGS) $(LIBRARY_LDFLAGS) $(LDFLAGS) -o $(Program) $(OBJECTS) $(LIBS)
  28         ls -l $(Program)
  29         -$(SIZE) $(Program)
  30
  31 @@ -594,7 +595,7 @@
  32         @echo
  33
  34  bashbug: $(SDIR)/bashbug.sh $(VERSPROG)
  35 -       @sed -e "s%!PATCHLEVEL!%$(PatchLevel)%" \
  36 +       @sed -e "s^!PATCHLEVEL!^$(PatchLevel)^" \
  37              $(SDIR)/bashbug.sh > $@
  38         @chmod a+rx bashbug
  39
  40 @@ -619,7 +620,7 @@
  41         @-test -d tests || mkdir tests
  42         @cp $(TESTS_SUPPORT) tests
  43         @( cd $(srcdir)/tests && \
  44 -               BUILD_DIR=$(BUILD_DIR) PATH=$(BUILD_DIR)/tests:$$PATH THIS_SH=$(THIS_SH) $(SHELL) ${TESTSCRIPT} )
  45 +               BUILD_DIR=$(BUILD_DIR) PATH=/usr/gnu/bin:$(BUILD_DIR)/tests:$$PATH THIS_SH=$(THIS_SH) $(SHELL) ${TESTSCRIPT} )
  46
  47  profiling-tests:       ${PROGRAM}
  48         @test "X$$PROFILE_FLAGS" == "X" && { echo "profiling-tests: must be built with profiling enabled" >&2; exit 1; }
  49 @@ -958,7 +959,7 @@
  50         @-test -d tests || mkdir tests
  51         @cp $(TESTS_SUPPORT) tests
  52         @( cd $(srcdir)/tests && \
  53 -               BUILD_DIR=$(BUILD_DIR) PATH=$(BUILD_DIR)/tests:$$PATH THIS_SH=$(THIS_SH) $(SHELL) ${TESTSCRIPT} )
  54 +               BUILD_DIR=$(BUILD_DIR) PATH=/usr/gnu/bin:$(BUILD_DIR)/tests:$$PATH THIS_SH=$(THIS_SH) $(SHELL) ${TESTSCRIPT} )
  55
  56  symlinks:
  57         $(SHELL) $(SUPPORT_SRC)fixlinks -s $(srcdir)