solaris-002.Makefile.in.3.patch revision 5516
5516N/A# We need $(CFLAGS) appended to SYSTEM_FLAGS. Otherwise things
5516N/A# end up being built with different CFLAGS.
5516N/A# Solaris-specific patch. Not for upstream.
5516N/A--- Makefile.in 2014-01-25 13:27:30.000000000 -0800
5516N/A+++ Makefile.in 2015-04-02 11:18:58.143893640 -0700
5516N/A@@ -135,13 +135,14 @@
5516N/A LOCALE_DEFS = -DLOCALEDIR='"$(localedir)"' -DPACKAGE='"$(PACKAGE)"'
5516N/A
5516N/A LOCAL_LIBS = @LOCAL_LIBS@
5516N/A-LIBS = $(BUILTINS_LIB) $(LIBRARIES) @LIBS@
5516N/A+LOCAL_LIBS += -lncurses
5516N/A+LIBS = $(BUILTINS_LIB) $(LIBRARIES) @LIBS@ @LOCAL_LIBS@
5516N/A LIBS_FOR_BUILD =
5516N/A
110N/A STATIC_LD = @STATIC_LD@
110N/A LOCAL_LDFLAGS = @LOCAL_LDFLAGS@
110N/A
110N/A-SYSTEM_FLAGS = -DPROGRAM='"$(Program)"' -DCONF_HOSTTYPE='"$(Machine)"' -DCONF_OSTYPE='"$(OS)"' -DCONF_MACHTYPE='"$(MACHTYPE)"' -DCONF_VENDOR='"$(VENDOR)"' $(LOCALE_DEFS)
110N/A+SYSTEM_FLAGS = -DPROGRAM='"$(Program)"' -DCONF_HOSTTYPE='"$(Machine)"' -DCONF_OSTYPE='"$(OS)"' -DCONF_MACHTYPE='"$(MACHTYPE)"' -DCONF_VENDOR='"$(VENDOR)"' $(LOCALE_DEFS) $(CFLAGS)
110N/A
110N/A BASE_CCFLAGS = $(PROFILE_FLAGS) $(SYSTEM_FLAGS) $(LOCAL_DEFS) \
110N/A $(DEFS) $(LOCAL_CFLAGS) $(INCLUDES)
5516N/A@@ -551,7 +552,7 @@
110N/A
110N/A $(Program): .build $(OBJECTS) $(BUILTINS_DEP) $(LIBDEP)
110N/A $(RM) $@
110N/A- $(PURIFY) $(CC) $(BUILTINS_LDFLAGS) $(LIBRARY_LDFLAGS) $(LDFLAGS) -o $(Program) $(OBJECTS) $(LIBS)
110N/A+ $(PURIFY) $(CC) $(CFLAGS) $(BUILTINS_LDFLAGS) $(LIBRARY_LDFLAGS) $(LDFLAGS) -o $(Program) $(OBJECTS) $(LIBS) $(LD_OPTIONS) -s
110N/A ls -l $(Program)
110N/A -$(SIZE) $(Program)
110N/A
5516N/A@@ -565,10 +566,10 @@
110N/A @echo
110N/A
110N/A bashbug: $(SUPPORT_SRC)bashbug.sh config.h Makefile $(VERSPROG)
110N/A- @sed -e "s%!MACHINE!%$(Machine)%" -e "s%!OS!%$(OS)%" \
110N/A- -e "s%!CFLAGS!%$(CCFLAGS)%" -e "s%!CC!%$(CC)%" \
110N/A- -e "s%!RELEASE!%$(Version)%" -e "s%!PATCHLEVEL!%$(PatchLevel)%" \
110N/A- -e "s%!MACHTYPE!%$(MACHTYPE)%" -e "s%!RELSTATUS!%$(RELSTATUS)%" \
110N/A+ @sed -e "s^!MACHINE!^$(Machine)^" -e "s^!OS!^$(OS)^" \
110N/A+ -e "s^!CFLAGS!^$(CCFLAGS)^" -e "s^!CC!^$(CC)^" \
110N/A+ -e "s^!RELEASE!^$(Version)^" -e "s^!PATCHLEVEL!^$(PatchLevel)^" \
110N/A+ -e "s^!MACHTYPE!^$(MACHTYPE)^" -e "s^!RELSTATUS!^$(RELSTATUS)^" \
110N/A $(SUPPORT_SRC)bashbug.sh > $@
110N/A @chmod a+rx bashbug
110N/A
5516N/A@@ -863,7 +864,7 @@
1303N/A @-test -d tests || mkdir tests
1303N/A @cp $(TESTS_SUPPORT) tests
1303N/A @( cd $(srcdir)/tests && \
1303N/A- PATH=$(BUILD_DIR)/tests:$$PATH THIS_SH=$(THIS_SH) $(SHELL) ${TESTSCRIPT} )
1303N/A+ PATH=/usr/gnu/bin:$(BUILD_DIR)/tests:$$PATH THIS_SH=$(THIS_SH) $(SHELL) ${TESTSCRIPT} )
1303N/A
1303N/A symlinks:
1303N/A $(SHELL) $(SUPPORT_SRC)fixlinks -s $(srcdir)