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/smp_utils/patches/smp_utils-solaris-build.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Fri, 26 Sep 2014 09:52:08 -0700
changeset 2117 cc1dde1e0b0a
parent 1344 48d2ae15d995
permissions -rw-r--r--
19682154 smp_utils fails to build on 57
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1344
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
     1
 
#Use -v to switch to standard error output. This patch is deemed
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
     2
 
#Solaris-centric and thus not worthy of being submitted upstream.
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
     3
 
diff -urN smp_utils-0.97/lib/Makefile.am smp_utils-0.97.new/lib/Makefile.am
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
     4
 
--- smp_utils-0.97/lib/Makefile.am	2011-08-06 20:47:17.000000000 -0700
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
     5
 
+++ smp_utils-0.97.new/lib/Makefile.am	2012-10-29 23:22:01.250489177 -0700
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
     6
 
@@ -38,7 +38,7 @@
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
     7
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
     8
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
     9
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    10
 
-AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    11
 
+AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -v
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    12
 
 # AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W -pedantic -std=c99
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    13
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    14
 
 lib_LTLIBRARIES = libsmputils1.la
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    15
 
diff -urN smp_utils-0.97/lib/Makefile.in smp_utils-0.97.new/lib/Makefile.in
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    16
 
--- smp_utils-0.97/lib/Makefile.in	2011-11-16 16:48:55.000000000 -0800
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    17
 
+++ smp_utils-0.97.new/lib/Makefile.in	2012-10-29 23:22:01.251160763 -0700
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    18
 
@@ -243,7 +243,7 @@
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    19
 
 @[email protected]_libsmputils1_la_SOURCES = \
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    20
 
 @OS_SOLARIS_TRUE@	smp_dummy.c
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    21
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    22
 
-AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    23
 
+AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -v
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    24
 
 # AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W -pedantic -std=c99
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    25
 
 lib_LTLIBRARIES = libsmputils1.la
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    26
 
 libsmputils1_la_LDFLAGS = -version-info 1:0:0
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    27
 
diff -urN smp_utils-0.97/src/Makefile.am smp_utils-0.97.new/src/Makefile.am
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    28
 
--- smp_utils-0.97/src/Makefile.am	2011-11-29 12:11:36.000000000 -0800
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    29
 
+++ smp_utils-0.97.new/src/Makefile.am	2012-10-29 23:22:36.457726462 -0700
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    30
 
@@ -28,7 +28,7 @@
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    31
 
 ## endif
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    32
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    33
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    34
 
-AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    35
 
+AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -v
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    36
 
 # AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W -pedantic -std=c99
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    37
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    38
 
 smp_conf_general_SOURCES =	smp_conf_general.c
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    39
 
diff -urN smp_utils-0.97/src/Makefile.in smp_utils-0.97.new/src/Makefile.in
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    40
 
--- smp_utils-0.97/src/Makefile.in	2011-11-29 12:11:36.000000000 -0800
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    41
 
+++ smp_utils-0.97.new/src/Makefile.in	2012-10-29 23:22:36.458435498 -0700
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    42
 
@@ -319,7 +319,7 @@
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    43
 
 top_build_prefix = @top_build_prefix@
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    44
 
 top_builddir = @top_builddir@
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    45
 
 top_srcdir = @top_srcdir@
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    46
 
-AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    47
 
+AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -v
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    48
 
 # AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W -pedantic -std=c99
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    49
 
 smp_conf_general_SOURCES = smp_conf_general.c
48d2ae15d995 PSARC/2012/329 smp_utils_0.97
Wenbo Li<Wenbo.Li@Oracle.COM>
parents:
diff changeset 
    50
 
 smp_conf_general_LDADD = ../lib/libsmputils1.la @os_libs@
2117
cc1dde1e0b0a 19682154 smp_utils fails to build on 57
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1344
diff changeset 
    51
 












cc1dde1e0b0a
19682154 smp_utils fails to build on 57



Mike Sullivan <Mike.Sullivan@Oracle.COM>


parents: 
1344

diff
changeset




    52


--- smp_utils-0.97/lib/smp_sol_usmp.c.orig	Wed Sep 24 16:55:09 2014













cc1dde1e0b0a
19682154 smp_utils fails to build on 57



Mike Sullivan <Mike.Sullivan@Oracle.COM>


parents: 
1344

diff
changeset




    53


+++ smp_utils-0.97/lib/smp_sol_usmp.c	Wed Sep 24 16:55:58 2014













cc1dde1e0b0a
19682154 smp_utils fails to build on 57



Mike Sullivan <Mike.Sullivan@Oracle.COM>


parents: 
1344

diff
changeset




    54


@@ -37,7 +37,7 @@













cc1dde1e0b0a
19682154 smp_utils fails to build on 57



Mike Sullivan <Mike.Sullivan@Oracle.COM>


parents: 
1344

diff
changeset




    55


 #include <unistd.h>













cc1dde1e0b0a
19682154 smp_utils fails to build on 57



Mike Sullivan <Mike.Sullivan@Oracle.COM>


parents: 
1344

diff
changeset




    56


 #include <stropts.h>













cc1dde1e0b0a
19682154 smp_utils fails to build on 57



Mike Sullivan <Mike.Sullivan@Oracle.COM>


parents: 
1344

diff
changeset




    57


 













cc1dde1e0b0a
19682154 smp_utils fails to build on 57



Mike Sullivan <Mike.Sullivan@Oracle.COM>


parents: 
1344

diff
changeset




    58


-#include <sys/scsi/impl/usmp.h>













cc1dde1e0b0a
19682154 smp_utils fails to build on 57



Mike Sullivan <Mike.Sullivan@Oracle.COM>


parents: 
1344

diff
changeset




    59


+#include <sys/sas/impl/usmp.h>













cc1dde1e0b0a
19682154 smp_utils fails to build on 57



Mike Sullivan <Mike.Sullivan@Oracle.COM>


parents: 
1344

diff
changeset




    60


 













cc1dde1e0b0a
19682154 smp_utils fails to build on 57



Mike Sullivan <Mike.Sullivan@Oracle.COM>


parents: 
1344

diff
changeset




    61


 #ifdef HAVE_CONFIG_H













cc1dde1e0b0a
19682154 smp_utils fails to build on 57



Mike Sullivan <Mike.Sullivan@Oracle.COM>


parents: 
1344

diff
changeset




    62


 #include "config.h"















upstream/oracle/userland-gate