diff options
Diffstat (limited to 'usr/src/cmd/perl/contrib/Sun/Solaris/Project')
6 files changed, 81 insertions, 84 deletions
diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/Project/MANIFEST b/usr/src/cmd/perl/contrib/Sun/Solaris/Project/MANIFEST deleted file mode 100644 index 3dc0b3fb7f..0000000000 --- a/usr/src/cmd/perl/contrib/Sun/Solaris/Project/MANIFEST +++ /dev/null @@ -1,9 +0,0 @@ -Changes -Makefile.PL -MANIFEST -pod/Project.pod -Project.pm -Project.xs -README -t/Project.t -typemap diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/Project/Makefile b/usr/src/cmd/perl/contrib/Sun/Solaris/Project/Makefile new file mode 100644 index 0000000000..2b5627e0b6 --- /dev/null +++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Project/Makefile @@ -0,0 +1,34 @@ +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# +# +# Copyright (c) 2014 Racktop Systems. +# + +MODULE = Project + +include $(SRC)/cmd/perl/Makefile.perl + +LDLIBS += -lproject -lgen + +CERRWARN += -_gcc=-Wno-unused-variable + +XSUBPPFLAGS = -typemap typemap + +MAPFILES = mapfile-vers + +include $(SRC)/cmd/perl/Makefile.targ + +all: $(PERLEXT) $(PERLMOD) + +install: $(ROOTPERLEXT) $(ROOTPERLMOD) + +clean clobber: + $(RM) -r $(MACH) diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/Project/Makefile.PL b/usr/src/cmd/perl/contrib/Sun/Solaris/Project/Makefile.PL deleted file mode 100644 index 54a5a5df8c..0000000000 --- a/usr/src/cmd/perl/contrib/Sun/Solaris/Project/Makefile.PL +++ /dev/null @@ -1,68 +0,0 @@ -# -# Copyright (c) 1999, 2008 Oracle and/or its affiliates. All rights reserved. -# - -# -# Makefile.PL for ::Project -# - -require 5.8.4; -use strict; -use warnings; -use ExtUtils::MakeMaker; - -# #defines. -my @defines = ( DEFINE => exists($ENV{RELEASE_BUILD}) ? '-DNDEBUG' : '' ); - -# List of POD pages to install. -my @man3pods = ( MAN3PODS => {} ); - -# -# If not building as part of ON. -# -if (! exists($ENV{CODEMGR_WS})) { - - # - # Suppress the setting of LD_RUN_PATH. The ON build environment - # contains a modified MakeMaker that does this automatically, so we - # only need to do this if we are building outside of ON. - # - package MY; - no warnings qw(once); - - # Override const_loadlibs to remove LD_RUN_PATH cruft. - *const_loadlibs = sub - { - my $self = shift(@_); - delete($self->{LD_RUN_PATH}); - return($self->SUPER::const_loadlibs(@_)); - }; - - # Override dynamic_lib to get rid of LD_RUN_PATH cruft. - *dynamic_lib = sub - { - my $self = shift(@_); - my $txt = $self->SUPER::dynamic_lib(@_); - $txt =~ s/LD_RUN_PATH=\S*\s*//; - return($txt); - }; - - # Turn off debugging. - @defines = (); - - # - # Install the POD documentation for non-ON builds. - # - my $man3pfx = '$(INST_MAN3DIR)/Sun::Solaris::Project'; - @man3pods = ( - MAN3PODS => { 'pod/Project.pod' => $man3pfx . '.$(MAN3EXT)' } - ); -} - -WriteMakefile( - NAME => 'Sun::Solaris::Project', - VERSION_FROM => 'Project.pm', - LIBS => '-lproject -lgen', - @defines, - @man3pods, -); diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/Project/Project.pm b/usr/src/cmd/perl/contrib/Sun/Solaris/Project/Project.pm index dee5ebe476..aaeff1a450 100644 --- a/usr/src/cmd/perl/contrib/Sun/Solaris/Project/Project.pm +++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Project/Project.pm @@ -1,5 +1,6 @@ # # Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014 Racktop Systems. # # @@ -8,7 +9,7 @@ # files. # ################################################################################ -require 5.8.4; +require 5.0010; use strict; use warnings; diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/Project/Project.xs b/usr/src/cmd/perl/contrib/Sun/Solaris/Project/Project.xs index 10e44e28ed..cc95012a49 100644 --- a/usr/src/cmd/perl/contrib/Sun/Solaris/Project/Project.xs +++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Project/Project.xs @@ -1,5 +1,6 @@ /* * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014 Racktop Systems. */ /* * Project.xs contains XS wrappers for the project database maniplulation @@ -160,7 +161,7 @@ PREINIT: char buf[PROJECT_BUFSZ]; PPCODE: PUTBACK; - if (projp = getprojent(&proj, buf, sizeof (buf))) { + if ((projp = getprojent(&proj, buf, sizeof (buf)))) { XSRETURN(pushret_project(projp)); } else { XSRETURN_EMPTY; @@ -180,7 +181,7 @@ PREINIT: char buf[PROJECT_BUFSZ]; PPCODE: PUTBACK; - if (projp = getprojbyname(name, &proj, buf, sizeof (buf))) { + if ((projp = getprojbyname(name, &proj, buf, sizeof (buf)))) { XSRETURN(pushret_project(projp)); } else { XSRETURN_EMPTY; @@ -194,7 +195,7 @@ PREINIT: char buf[PROJECT_BUFSZ]; PPCODE: PUTBACK; - if (projp = getprojbyid(id, &proj, buf, sizeof (buf))) { + if ((projp = getprojbyid(id, &proj, buf, sizeof (buf)))) { XSRETURN(pushret_project(projp)); } else { XSRETURN_EMPTY; @@ -208,7 +209,7 @@ PREINIT: char buf[PROJECT_BUFSZ]; PPCODE: PUTBACK; - if (projp = getdefaultproj(user, &proj, buf, sizeof (buf))) { + if ((projp = getdefaultproj(user, &proj, buf, sizeof (buf)))) { XSRETURN(pushret_project(projp)); } else { XSRETURN_EMPTY; @@ -222,7 +223,7 @@ PREINIT: char buf[PROJECT_BUFSZ]; PPCODE: PUTBACK; - if (projp = fgetprojent(fh, &proj, buf, sizeof (buf))) { + if ((projp = fgetprojent(fh, &proj, buf, sizeof (buf)))) { XSRETURN(pushret_project(projp)); } else { XSRETURN_EMPTY; @@ -236,6 +237,8 @@ PREINIT: char buf[PROJECT_BUFSZ]; CODE: RETVAL = inproj(user, proj, buf, sizeof (buf)); +OUTPUT: + RETVAL int @@ -268,7 +271,7 @@ PREINIT: rctlblk_t *tmp = NULL; rctl_priv_t priv; rctl_qty_t value; - int flags; + int flags = 0; int ret; int err = 0; char string[24]; /* 24 will always hold a uint64_t */ diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/Project/mapfile-vers b/usr/src/cmd/perl/contrib/Sun/Solaris/Project/mapfile-vers new file mode 100644 index 0000000000..647710f85d --- /dev/null +++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Project/mapfile-vers @@ -0,0 +1,36 @@ +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# +# +# Copyright (c) 2014 Racktop Systems. +# + +$mapfile_version 2 + +SYMBOL_SCOPE { + global: + boot_Sun__Solaris__Project; + XS_Sun__Solaris__Project_activeprojects; + XS_Sun__Solaris__Project_endprojent; + XS_Sun__Solaris__Project_fgetprojent; + XS_Sun__Solaris__Project_getdefaultproj; + XS_Sun__Solaris__Project_getprojbyid; + XS_Sun__Solaris__Project_getprojbyname; + XS_Sun__Solaris__Project_getprojent; + XS_Sun__Solaris__Project_getprojid; + XS_Sun__Solaris__Project_getprojidbyname; + XS_Sun__Solaris__Project_inproj; + XS_Sun__Solaris__Project_pool_exists; + XS_Sun__Solaris__Project_rctl_get_info; + XS_Sun__Solaris__Project_setproject; + XS_Sun__Solaris__Project_setprojent; + local: + *; +}; |