diff options
| author | Theo Schlossnagle <jesus@omniti.com> | 2012-12-06 16:29:54 -0800 |
|---|---|---|
| committer | Christopher Siden <chris.siden@delphix.com> | 2012-12-10 13:18:44 -0800 |
| commit | f5c2e7ea56aaa46a9976476fb0cb1f02b9426f07 (patch) | |
| tree | 5a3b322aa6ed0ad907652c7290b13bc2f0e0a9ed /usr/src/lib | |
| parent | d583b39bfb4e2571d3e41097c5c357ffe353ad45 (diff) | |
| download | illumos-joyent-f5c2e7ea56aaa46a9976476fb0cb1f02b9426f07.tar.gz | |
3352 would like 64bit install libraries
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Reviewed by: Christopher Siden <chris.siden@delphix.com>
Approved by: Garrett D'Amore <garrett@damore.org>
Diffstat (limited to 'usr/src/lib')
32 files changed, 526 insertions, 19 deletions
diff --git a/usr/src/lib/libbe/Makefile b/usr/src/lib/libbe/Makefile index 9dd98e3b90..0e68a32954 100644 --- a/usr/src/lib/libbe/Makefile +++ b/usr/src/lib/libbe/Makefile @@ -21,6 +21,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # include ../Makefile.lib @@ -31,6 +32,7 @@ HDRS= libbe.h \ HDRDIR= common SUBDIRS= $(MACH) +$(BUILD64)SUBDIRS += $(MACH64) all := TARGET= all clean := TARGET= clean diff --git a/usr/src/lib/libbe/Makefile.com b/usr/src/lib/libbe/Makefile.com index b8349c1d1a..013d2bdc37 100644 --- a/usr/src/lib/libbe/Makefile.com +++ b/usr/src/lib/libbe/Makefile.com @@ -23,6 +23,7 @@ # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # Copyright 2011 Nexenta Systems, Inc. All rights reserved. +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # @@ -63,6 +64,4 @@ all: $(LIBS) $(LIBRARY) lint: lintcheck -install: $(ROOTLIBS) - include ../../Makefile.targ diff --git a/usr/src/lib/libbe/amd64/Makefile b/usr/src/lib/libbe/amd64/Makefile new file mode 100644 index 0000000000..5d3fa158a8 --- /dev/null +++ b/usr/src/lib/libbe/amd64/Makefile @@ -0,0 +1,30 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# +# Copyright 2011 OmniTI Computer Consulting, Inc. All rights reserved. +# Use is subject to license terms. +# + +include ../Makefile.com +include ../../Makefile.lib.64 + +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) diff --git a/usr/src/lib/libbe/sparcv9/Makefile b/usr/src/lib/libbe/sparcv9/Makefile new file mode 100644 index 0000000000..5d3fa158a8 --- /dev/null +++ b/usr/src/lib/libbe/sparcv9/Makefile @@ -0,0 +1,30 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# +# Copyright 2011 OmniTI Computer Consulting, Inc. All rights reserved. +# Use is subject to license terms. +# + +include ../Makefile.com +include ../../Makefile.lib.64 + +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) diff --git a/usr/src/lib/libdhcputil/Makefile b/usr/src/lib/libdhcputil/Makefile index f5abdf9627..d0ebae7172 100644 --- a/usr/src/lib/libdhcputil/Makefile +++ b/usr/src/lib/libdhcputil/Makefile @@ -20,10 +20,9 @@ # # # Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/Makefile.lib @@ -34,6 +33,7 @@ LOCHDRDIR = common COMHDRDIR = $(SRC)/common/net/dhcp HDRDIR = $(LOCHDRDIR) SUBDIRS = $(MACH) +$(BUILD64)SUBDIRS += $(MACH64) POFILE = libdhcputil.po MSGFILES = common/dhcpmsg.c XGETFLAGS = -a -x libdhcputil.xcl diff --git a/usr/src/lib/libdhcputil/amd64/Makefile b/usr/src/lib/libdhcputil/amd64/Makefile new file mode 100644 index 0000000000..df2bad0003 --- /dev/null +++ b/usr/src/lib/libdhcputil/amd64/Makefile @@ -0,0 +1,29 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. +# + +include ../Makefile.com +include ../../Makefile.lib.64 + +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) diff --git a/usr/src/lib/libdhcputil/sparcv9/Makefile b/usr/src/lib/libdhcputil/sparcv9/Makefile new file mode 100644 index 0000000000..df2bad0003 --- /dev/null +++ b/usr/src/lib/libdhcputil/sparcv9/Makefile @@ -0,0 +1,29 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. +# + +include ../Makefile.com +include ../../Makefile.lib.64 + +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) diff --git a/usr/src/lib/libfdisk/amd64/Makefile b/usr/src/lib/libfdisk/amd64/Makefile index 7aad038610..036c13779e 100644 --- a/usr/src/lib/libfdisk/amd64/Makefile +++ b/usr/src/lib/libfdisk/amd64/Makefile @@ -22,7 +22,6 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# include ../Makefile.com include ../../Makefile.lib.64 diff --git a/usr/src/lib/libfdisk/sparcv9/Makefile b/usr/src/lib/libfdisk/sparcv9/Makefile new file mode 100644 index 0000000000..31e1868b2d --- /dev/null +++ b/usr/src/lib/libfdisk/sparcv9/Makefile @@ -0,0 +1,28 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. +# + +include ../Makefile.com +include ../../Makefile.lib.64 + +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) diff --git a/usr/src/lib/libfstyp/Makefile b/usr/src/lib/libfstyp/Makefile index b9cf46e1eb..1878db324c 100644 --- a/usr/src/lib/libfstyp/Makefile +++ b/usr/src/lib/libfstyp/Makefile @@ -21,8 +21,7 @@ # # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # include ../Makefile.lib @@ -32,6 +31,7 @@ HDRS= libfstyp.h libfstyp_module.h HDRDIR= common SUBDIRS= $(MACH) +$(BUILD64)SUBDIRS += $(MACH64) all := TARGET= all install := TARGET= install diff --git a/usr/src/lib/libfstyp/amd64/Makefile b/usr/src/lib/libfstyp/amd64/Makefile new file mode 100644 index 0000000000..3df0cea286 --- /dev/null +++ b/usr/src/lib/libfstyp/amd64/Makefile @@ -0,0 +1,28 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. +# + +include ../Makefile.com +include ../../Makefile.lib.64 + +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libfstyp/sparcv9/Makefile b/usr/src/lib/libfstyp/sparcv9/Makefile new file mode 100644 index 0000000000..1f55b03d7c --- /dev/null +++ b/usr/src/lib/libfstyp/sparcv9/Makefile @@ -0,0 +1,27 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. +# + +include ../Makefile.com +include ../../Makefile.lib.64 + +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libinstzones/Makefile b/usr/src/lib/libinstzones/Makefile index 12deb8b6c8..85d3363ba1 100644 --- a/usr/src/lib/libinstzones/Makefile +++ b/usr/src/lib/libinstzones/Makefile @@ -20,6 +20,7 @@ # # # Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # Use is subject to license terms. # @@ -32,6 +33,7 @@ HDRDIR = hdrs SUBDIRS = $(MACH) +$(BUILD64)SUBDIRS += $(MACH64) all := TARGET = all install := TARGET = install diff --git a/usr/src/lib/libinstzones/amd64/Makefile b/usr/src/lib/libinstzones/amd64/Makefile new file mode 100644 index 0000000000..5d3fa158a8 --- /dev/null +++ b/usr/src/lib/libinstzones/amd64/Makefile @@ -0,0 +1,30 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# +# Copyright 2011 OmniTI Computer Consulting, Inc. All rights reserved. +# Use is subject to license terms. +# + +include ../Makefile.com +include ../../Makefile.lib.64 + +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) diff --git a/usr/src/lib/libinstzones/common/zones_locks.c b/usr/src/lib/libinstzones/common/zones_locks.c index 6352e496bc..5cc1d3bfeb 100644 --- a/usr/src/lib/libinstzones/common/zones_locks.c +++ b/usr/src/lib/libinstzones/common/zones_locks.c @@ -24,7 +24,9 @@ * Use is subject to license terms. */ - +/* + * Copyright (c) 2012 by Delphix. All rights reserved. + */ /* * Module: zones_locks.c @@ -208,9 +210,9 @@ _z_acquire_lock(char **r_lockKey, char *a_zoneName, char *a_lockObject, if (a_pid > 0) { (void) _z_add_arg(args, "-p"); /* lock valid process i.d. */ - (void) _z_add_arg(args, "%ld", getpid()); + (void) _z_add_arg(args, "%lld", (long long)getpid()); (void) _z_add_arg(args, "-z"); /* lock valid zone i.d. */ - (void) _z_add_arg(args, "%ld", getzoneid()); + (void) _z_add_arg(args, "%lld", (long long)getzoneid()); } /* execute command */ diff --git a/usr/src/lib/libinstzones/sparcv9/Makefile b/usr/src/lib/libinstzones/sparcv9/Makefile new file mode 100644 index 0000000000..5d3fa158a8 --- /dev/null +++ b/usr/src/lib/libinstzones/sparcv9/Makefile @@ -0,0 +1,30 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# +# Copyright 2011 OmniTI Computer Consulting, Inc. All rights reserved. +# Use is subject to license terms. +# + +include ../Makefile.com +include ../../Makefile.lib.64 + +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) diff --git a/usr/src/lib/libwanboot/Makefile b/usr/src/lib/libwanboot/Makefile index 45cf48d3d2..580716ccc2 100644 --- a/usr/src/lib/libwanboot/Makefile +++ b/usr/src/lib/libwanboot/Makefile @@ -21,13 +21,13 @@ # # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # include $(SRC)/lib/Makefile.lib SUBDIRS = $(MACH) +$(BUILD64)SUBDIRS += $(MACH64) HDRS = boot_http.h \ bootinfo.h \ diff --git a/usr/src/lib/libwanboot/Makefile.com b/usr/src/lib/libwanboot/Makefile.com index 54a5b54119..ed69ec0b8a 100644 --- a/usr/src/lib/libwanboot/Makefile.com +++ b/usr/src/lib/libwanboot/Makefile.com @@ -21,6 +21,8 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright (c) 2012 by Delphix. All rights reserved. +# LIBRARY = libwanboot.a VERS = .1 @@ -74,7 +76,8 @@ SRCDIR = $(LOC_DIR) $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) # OpenSSL requires us to turn this off -LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN +LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN +LINTFLAGS64 += -erroff=E_BAD_PTR_CAST_ALIGN CFLAGS += $(CCVERBOSE) CPPFLAGS += -I$(LOC_DIR) -I$(COM_DIR) -I$(DHCP_DIR) diff --git a/usr/src/lib/libwanboot/amd64/Makefile b/usr/src/lib/libwanboot/amd64/Makefile new file mode 100644 index 0000000000..df2bad0003 --- /dev/null +++ b/usr/src/lib/libwanboot/amd64/Makefile @@ -0,0 +1,29 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. +# + +include ../Makefile.com +include ../../Makefile.lib.64 + +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) diff --git a/usr/src/lib/libwanboot/sparcv9/Makefile b/usr/src/lib/libwanboot/sparcv9/Makefile new file mode 100644 index 0000000000..df2bad0003 --- /dev/null +++ b/usr/src/lib/libwanboot/sparcv9/Makefile @@ -0,0 +1,29 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. +# + +include ../Makefile.com +include ../../Makefile.lib.64 + +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) diff --git a/usr/src/lib/libwanbootutil/Makefile b/usr/src/lib/libwanbootutil/Makefile index 060530d0a3..235b47827d 100644 --- a/usr/src/lib/libwanbootutil/Makefile +++ b/usr/src/lib/libwanbootutil/Makefile @@ -21,13 +21,13 @@ # # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # include ../Makefile.lib SUBDIRS = $(MACH) +$(BUILD64)SUBDIRS += $(MACH64) # Library header. HDRS = wanbootutil.h diff --git a/usr/src/lib/libwanbootutil/Makefile.com b/usr/src/lib/libwanbootutil/Makefile.com index 29434247e6..4bc03836e1 100644 --- a/usr/src/lib/libwanbootutil/Makefile.com +++ b/usr/src/lib/libwanbootutil/Makefile.com @@ -22,6 +22,8 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright (c) 2012 by Delphix. All rights reserved. +# LIBRARY = libwanbootutil.a VERS = .1 @@ -60,7 +62,8 @@ $(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) # Library includes sources created via rpcgen. And rpcgen unfortunately # created unused function variables. -LINTFLAGS += -erroff=E_FUNC_VAR_UNUSED +LINTFLAGS += -erroff=E_FUNC_VAR_UNUSED +LINTFLAGS64 += -erroff=E_FUNC_VAR_UNUSED CPPFLAGS += -I$(CRYPTO_DIR) diff --git a/usr/src/lib/libwanbootutil/amd64/Makefile b/usr/src/lib/libwanbootutil/amd64/Makefile new file mode 100644 index 0000000000..df2bad0003 --- /dev/null +++ b/usr/src/lib/libwanbootutil/amd64/Makefile @@ -0,0 +1,29 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. +# + +include ../Makefile.com +include ../../Makefile.lib.64 + +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) diff --git a/usr/src/lib/libwanbootutil/sparcv9/Makefile b/usr/src/lib/libwanbootutil/sparcv9/Makefile new file mode 100644 index 0000000000..df2bad0003 --- /dev/null +++ b/usr/src/lib/libwanbootutil/sparcv9/Makefile @@ -0,0 +1,29 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. +# + +include ../Makefile.com +include ../../Makefile.lib.64 + +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) diff --git a/usr/src/lib/libzoneinfo/Makefile b/usr/src/lib/libzoneinfo/Makefile index 291a026f98..6f3f633d35 100644 --- a/usr/src/lib/libzoneinfo/Makefile +++ b/usr/src/lib/libzoneinfo/Makefile @@ -21,8 +21,7 @@ # # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # include ../Makefile.lib @@ -30,6 +29,7 @@ include ../Makefile.lib HDRS= libzoneinfo.h HDRDIR= common SUBDIRS= $(MACH) +$(BUILD64)SUBDIRS += $(MACH64) all := TARGET = all clean := TARGET = clean diff --git a/usr/src/lib/libzoneinfo/amd64/Makefile b/usr/src/lib/libzoneinfo/amd64/Makefile new file mode 100644 index 0000000000..da4f984f67 --- /dev/null +++ b/usr/src/lib/libzoneinfo/amd64/Makefile @@ -0,0 +1,28 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. +# + +include ../Makefile.com +include ../../Makefile.lib.64 + +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) diff --git a/usr/src/lib/libzoneinfo/sparcv9/Makefile b/usr/src/lib/libzoneinfo/sparcv9/Makefile new file mode 100644 index 0000000000..df2bad0003 --- /dev/null +++ b/usr/src/lib/libzoneinfo/sparcv9/Makefile @@ -0,0 +1,29 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. +# + +include ../Makefile.com +include ../../Makefile.lib.64 + +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) diff --git a/usr/src/lib/pylibbe/Makefile b/usr/src/lib/pylibbe/Makefile index 64e8106641..ee2a576b8a 100644 --- a/usr/src/lib/pylibbe/Makefile +++ b/usr/src/lib/pylibbe/Makefile @@ -21,11 +21,13 @@ # # Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # include ../Makefile.lib SUBDIRS= $(MACH) +$(BUILD64)SUBDIRS += $(MACH64) XGETTEXT= $(GNUXGETTEXT) XGETFLAGS= $(GNUXGETFLAGS) diff --git a/usr/src/lib/pylibbe/Makefile.com b/usr/src/lib/pylibbe/Makefile.com index 6fa379ddcc..aa26dec043 100644 --- a/usr/src/lib/pylibbe/Makefile.com +++ b/usr/src/lib/pylibbe/Makefile.com @@ -21,6 +21,7 @@ # # Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # LIBRARY = libbe_py.a @@ -33,6 +34,7 @@ PYTHON = $(PYTHON_26) LIBLINKS = SRCDIR = ../common ROOTLIBDIR= $(ROOT)/usr/lib/python2.6/vendor-packages +ROOTLIBDIR64= $(ROOT)/usr/lib/python2.6/vendor-packages/64 PYOBJS= $(PYSRCS:%.py=$(SRCDIR)/%.pyc) PYFILES= $(PYSRCS) $(PYSRCS:%.py=%.pyc) ROOTPYBEFILES= $(PYFILES:%=$(ROOTLIBDIR)/%) diff --git a/usr/src/lib/pylibbe/amd64/Makefile b/usr/src/lib/pylibbe/amd64/Makefile new file mode 100644 index 0000000000..32e9e54ca4 --- /dev/null +++ b/usr/src/lib/pylibbe/amd64/Makefile @@ -0,0 +1,29 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. +# + +include ../Makefile.com +include ../../Makefile.lib.64 + +install: all $(ROOTLIBS64) diff --git a/usr/src/lib/pylibbe/common/libbe_py.c b/usr/src/lib/pylibbe/common/libbe_py.c index b4f6ca0e52..f07f32b59a 100644 --- a/usr/src/lib/pylibbe/common/libbe_py.c +++ b/usr/src/lib/pylibbe/common/libbe_py.c @@ -21,6 +21,7 @@ /* * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. */ #include <Python.h> @@ -168,7 +169,7 @@ beCopy(PyObject *self, PyObject *args) char *trgtSnapName = NULL; char *rpool = NULL; char *beDescription = NULL; - int pos = 0; + Py_ssize_t pos = 0; int ret = BE_PY_SUCCESS; nvlist_t *beAttrs = NULL; nvlist_t *beProps = NULL; diff --git a/usr/src/lib/pylibbe/sparcv9/Makefile b/usr/src/lib/pylibbe/sparcv9/Makefile new file mode 100644 index 0000000000..32e9e54ca4 --- /dev/null +++ b/usr/src/lib/pylibbe/sparcv9/Makefile @@ -0,0 +1,29 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. +# + +include ../Makefile.com +include ../../Makefile.lib.64 + +install: all $(ROOTLIBS64) |