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/bison/patches/shared-ly.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Thu, 14 Jan 2016 10:17:27 -0800
changeset 5272 28045eab1400
parent 459 c7579764bc73
permissions -rw-r--r--
PSARC/2015/549 bison version 3.0.4 15623772 SUNBT6927713 upgrade bison to 3.0.4 18111679 perl 5.12 and newer bisons don't get along 21468061 libpcap doesn't like bison3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5272
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
     1
 
--- bison-3.0.4/Makefile.in.orig	Tue Oct 27 10:12:31 2015
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
     2
 
+++ bison-3.0.4/Makefile.in	Tue Oct 27 10:13:12 2015
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
     3
 
@@ -473,6 +473,12 @@
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
     4
 
 @ENABLE_YACC_TRUE@am_lib_liby_a_OBJECTS = lib/main.$(OBJEXT) \
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
     5
 
 @ENABLE_YACC_TRUE@	lib/yyerror.$(OBJEXT)
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
     6
 
 lib_liby_a_OBJECTS = $(am_lib_liby_a_OBJECTS)
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
     7
 
+
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
     8
 
+# doing this for just the OBJECTS macros doesn't seeem to work
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
     9
 
+# and we rely on the approprate xregs/no-app-regs flag already
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
    10
 
+# being in our CFLAGS from shared-macros.mk
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
    11
 
+lib/yyerror.o lib/main.o: CFLAGS += $(CC_PIC)
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
    12
 
+
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
    13
 
 @FLEX_CXX_WORKS_TRUE@am__EXEEXT_1 = examples/calc++/calc++$(EXEEXT)
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
    14
 
 PROGRAMS = $(bin_PROGRAMS)
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
    15
 
 am__objects_2 = examples/calc++/examples_calc___calc__-calc++-driver.$(OBJEXT) \
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
    16
 
@@ -2501,6 +2507,9 @@
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
    17
 
 @ENABLE_YACC_TRUE@EXTRA_LIBRARIES = lib/liby.a
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
    18
 
 @ENABLE_YACC_TRUE@lib_liby_a_SOURCES = lib/main.c lib/yyerror.c
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
    19
 
 LDADD = lib/libbison.a $(LIBINTL)
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
    20
 
+
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
    21
 
+lib_LIBRARIES += lib/liby.so.1
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
    22
 
+
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
    23
 
 # Prettify Automake-computed names of compiled objects.
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
    24
 
 src_bison_SHORTNAME = bison
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
    25
 
 src_bison_CFLAGS = $(AM_CFLAGS) $(WERROR_CFLAGS)
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
    26
 
@@ -2624,6 +2633,10 @@
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
    27
 
 all: $(BUILT_SOURCES)
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
    28
 
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
    29
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
    30
 
+lib/liby.so.1:    $(lib_liby_a_OBJECTS) $(lib_liby_a_DEPENDENCIES)
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
    31
 
+	-rm -f lib/liby.so.1
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
    32
 
+	$(CC) $(CFLAGS) -G -h liby.so.1 -o lib/liby.so.1 $(lib_liby_a_OBJECTS) $(lib_liby_a_LIBADD)
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
    33
 
+
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
    34
 
 .SUFFIXES:
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
    35
 
 .SUFFIXES: .gv .eps .pdf .png .yy .stamp .c .cc .dvi .l .ll .log .o .obj .ps .sed .sin .test .test$(EXEEXT) .trs .y
28045eab1400 PSARC/2015/549 bison version 3.0.4
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 459
diff changeset 
    36
 
 am--refresh: Makefile
upstream/oracle/userland-gate