components/flex/patches/solaris-port-fixups.patch
author Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
Mon, 10 Oct 2016 13:26:21 -0700
changeset 7081 616e1d8621e7
parent 6090 32b4c33eb722
child 7960 80539200ddb3
permissions -rw-r--r--
24824653 improve gobject-introspection typelib dependency tracking
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6090
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     1
Copy the scan.l file to the build directory so that the .c file can be
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     2
successfully generated.
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     3
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     4
Run help2man on the flex file in the build directory to generate the man page.
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     5
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     6
Make sure that we always use /usr/gnu/bin/m4 rather than what is available
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     7
via the M4 environment variable or what's in the PATH environment variable.
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     8
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     9
These changes have been sent upstream. See email thread starting at:
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    10
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    11
  https://sourceforge.net/p/flex/mailman/message/35103749/
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    12
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    13
--- flex-2.6.1/src/Makefile.am.orig	2016-05-19 06:21:16.631609293 -0700
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    14
+++ flex-2.6.1/src/Makefile.am	2016-05-19 14:19:29.394717203 -0700
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    15
@@ -87,7 +87,7 @@
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    16
 	mv skel.c.tmp $(srcdir)/skel.c
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    17
 
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    18
 stage1scan.l: scan.l
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    19
-	cp $(srcdir)/scan.l $(srcdir)/stage1scan.l
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    20
+	cp $(srcdir)/scan.l $(top_builddir)/src/stage1scan.l
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    21
 
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    22
 stage1scan.c: stage1scan.l stage1flex$(EXEEXT)
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    23
 	$(top_builddir)/src/stage1flex$(EXEEXT) -o $@ $<
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    24
--- flex-2.6.1/doc/Makefile.am.orig	2016-05-19 06:45:26.670565152 -0700
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    25
+++ flex-2.6.1/doc/Makefile.am	2016-05-19 06:45:45.734263762 -0700
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    26
@@ -26,5 +26,5 @@
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    27
 	for i in $(dist_man_MANS) ; do \
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    28
 	$(help2man) --name='$(PACKAGE_NAME)' \
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    29
 	--section=`echo $$i | sed -e 's/.*\.\([^.]*\)$$/\1/'` \
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    30
-	 $(top_srcdir)/src/flex$(EXEEXT) > $$i || rm -f $$i ; \
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    31
+	 $(top_builddir)/src/flex$(EXEEXT) > $$i || rm -f $$i ; \
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    32
 	done
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    33
--- flex-2.6.1/src/main.c.orig	2016-05-19 14:36:18.569346881 -0700
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    34
+++ flex-2.6.1/src/main.c	2016-05-20 07:59:04.169569771 -0700
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    35
@@ -348,6 +348,7 @@
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    36
 
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    37
     /* Setup the filter chain. */
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    38
     output_chain = filter_create_int(NULL, filter_tee_header, headerfilename);
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    39
+#ifndef __sun
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    40
     if ( !(m4 = getenv("M4"))) {
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    41
 	    char *slash;
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    42
 		m4 = M4;
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    43
@@ -389,6 +390,9 @@
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    44
 		}
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    45
 	}
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    46
     filter_create_ext(output_chain, m4, "-P", 0);
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    47
+#else
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    48
+    filter_create_ext(output_chain, "/usr/gnu/bin/m4", "-P", 0);
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    49
+#endif
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    50
     filter_create_int(output_chain, filter_fix_linedirs, NULL);
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    51
 
32b4c33eb722 PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    52
     /* For debugging, only run the requested number of filters. */