Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/bash/patches/solaris-002.Makefile.in.3.patch
author Patrick Einheber <patrick.einheber@oracle.com>
Wed, 12 Oct 2016 08:38:46 -0700
changeset 7093 a50590d00730
parent 5518 c47fe0edc204
child 7485 89b2d849f322
permissions -rw-r--r--
24710648 puppet resource LDAP lookup fails when querying users
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5518
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1082
diff changeset 
     1
 
# We need $(CFLAGS) appended to SYSTEM_FLAGS. Otherwise things
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1082
diff changeset 
     2
 
# end up being built with different CFLAGS.
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1082
diff changeset 
     3
 
# Solaris-specific patch. Not for upstream.
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1082
diff changeset 
     4
 
--- Makefile.in	2014-01-25 13:27:30.000000000 -0800
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1082
diff changeset 
     5
 
+++ Makefile.in	2015-04-02 11:18:58.143893640 -0700
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1082
diff changeset 
     6
 
@@ -135,13 +135,14 @@
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1082
diff changeset 
     7
 
 LOCALE_DEFS = -DLOCALEDIR='"$(localedir)"' -DPACKAGE='"$(PACKAGE)"'
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1082
diff changeset 
     8
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1082
diff changeset 
     9
 
 LOCAL_LIBS = @LOCAL_LIBS@
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1082
diff changeset 
    10
 
-LIBS = $(BUILTINS_LIB) $(LIBRARIES) @LIBS@
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1082
diff changeset 
    11
 
+LOCAL_LIBS += -lncurses
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1082
diff changeset 
    12
 
+LIBS = $(BUILTINS_LIB) $(LIBRARIES) @LIBS@ @LOCAL_LIBS@
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1082
diff changeset 
    13
 
 LIBS_FOR_BUILD =
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1082
diff changeset 
    14
110
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    15
 
 STATIC_LD = @STATIC_LD@
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    16
 
 LOCAL_LDFLAGS = @LOCAL_LDFLAGS@
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    17
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    18
 
-SYSTEM_FLAGS = -DPROGRAM='"$(Program)"' -DCONF_HOSTTYPE='"$(Machine)"' -DCONF_OSTYPE='"$(OS)"' -DCONF_MACHTYPE='"$(MACHTYPE)"' -DCONF_VENDOR='"$(VENDOR)"' $(LOCALE_DEFS)
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    19
 
+SYSTEM_FLAGS = -DPROGRAM='"$(Program)"' -DCONF_HOSTTYPE='"$(Machine)"' -DCONF_OSTYPE='"$(OS)"' -DCONF_MACHTYPE='"$(MACHTYPE)"' -DCONF_VENDOR='"$(VENDOR)"' $(LOCALE_DEFS) $(CFLAGS)
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    20
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    21
 
 BASE_CCFLAGS = $(PROFILE_FLAGS) $(SYSTEM_FLAGS) $(LOCAL_DEFS) \
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    22
 
 	  $(DEFS) $(LOCAL_CFLAGS) $(INCLUDES)
5518
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1082
diff changeset 
    23
 
@@ -551,7 +552,7 @@
110
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    24
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    25
 
 $(Program):  .build $(OBJECTS) $(BUILTINS_DEP) $(LIBDEP)
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    26
 
 	$(RM) $@
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    27
 
-	$(PURIFY) $(CC) $(BUILTINS_LDFLAGS) $(LIBRARY_LDFLAGS) $(LDFLAGS) -o $(Program) $(OBJECTS) $(LIBS)
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    28
 
+	$(PURIFY) $(CC) $(CFLAGS) $(BUILTINS_LDFLAGS) $(LIBRARY_LDFLAGS) $(LDFLAGS) -o $(Program) $(OBJECTS) $(LIBS) $(LD_OPTIONS) -s
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    29
 
 	ls -l $(Program)
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    30
 
 	-$(SIZE) $(Program)
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    31
5518
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1082
diff changeset 
    32
 
@@ -565,10 +566,10 @@
110
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    33
 
 	@echo
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    34
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    35
 
 bashbug: $(SUPPORT_SRC)bashbug.sh config.h Makefile $(VERSPROG)
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    36
 
-	@sed -e "s%!MACHINE!%$(Machine)%" -e "s%!OS!%$(OS)%" \
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    37
 
-	     -e "s%!CFLAGS!%$(CCFLAGS)%" -e "s%!CC!%$(CC)%" \
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    38
 
-	     -e "s%!RELEASE!%$(Version)%" -e "s%!PATCHLEVEL!%$(PatchLevel)%" \
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    39
 
-	     -e "s%!MACHTYPE!%$(MACHTYPE)%" -e "s%!RELSTATUS!%$(RELSTATUS)%" \
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    40
 
+	@sed -e "s^!MACHINE!^$(Machine)^" -e "s^!OS!^$(OS)^" \
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    41
 
+	    -e "s^!CFLAGS!^$(CCFLAGS)^" -e "s^!CC!^$(CC)^" \
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    42
 
+	    -e "s^!RELEASE!^$(Version)^" -e "s^!PATCHLEVEL!^$(PatchLevel)^" \
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    43
 
+	    -e "s^!MACHTYPE!^$(MACHTYPE)^" -e "s^!RELSTATUS!^$(RELSTATUS)^" \
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    44
 
 	     $(SUPPORT_SRC)bashbug.sh > $@
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    45
 
 	@chmod a+rx bashbug
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    46
5518
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1082
diff changeset 
    47
 
@@ -863,7 +864,7 @@
1082
6d49548fa9da 15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents: 115
diff changeset 
    48
 
 	@-test -d tests || mkdir tests
6d49548fa9da 15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents: 115
diff changeset 
    49
 
 	@cp $(TESTS_SUPPORT) tests
6d49548fa9da 15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents: 115
diff changeset 
    50
 
 	@( cd $(srcdir)/tests && \
6d49548fa9da 15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents: 115
diff changeset 
    51
 
-		PATH=$(BUILD_DIR)/tests:$$PATH THIS_SH=$(THIS_SH) $(SHELL) ${TESTSCRIPT} )
6d49548fa9da 15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents: 115
diff changeset 
    52
 
+	    PATH=/usr/gnu/bin:$(BUILD_DIR)/tests:$$PATH THIS_SH=$(THIS_SH) $(SHELL) ${TESTSCRIPT} )
6d49548fa9da 15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents: 115
diff changeset 
    53
6d49548fa9da 15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents: 115
diff changeset 
    54
 
 symlinks:
6d49548fa9da 15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents: 115
diff changeset 
    55
 
 	$(SHELL) $(SUPPORT_SRC)fixlinks -s $(srcdir)
upstream/oracle/userland-gate