Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ship certutil with mozilla-nss (r151022) #723

Merged
merged 1 commit into from
May 1, 2018
Merged

Ship certutil with mozilla-nss (r151022) #723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions build/mozilla-nss-nspr/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#
#
# Copyright 2017 OmniTI Computer Consulting, Inc. All rights reserved.
# Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
# Use is subject to license terms.
#
# Load support functions
Expand Down Expand Up @@ -58,9 +59,12 @@ NSS_LIBS="libfreebl3.so libnss3.so
libnssutil3.so libsmime3.so
libsoftokn3.so libssl3.so"
NSPR_LIBS="libnspr4.so libplc4.so libplds4.so"
NSS_BINS="certutil"
NSPR_BINS=

# Variables that switch between NSS and NSPR
TGT_LIBS=$NSS_LIBS
TGT_BINS=$NSS_BINS
PC_FILE=nss.pc
LOCAL_MOG_FILE=nss-local.mog

Expand Down Expand Up @@ -105,6 +109,15 @@ make_install32() {
logcmd cp $TMPDIR/$BUILDDIR/dist/$DIST32/lib/$lib /tmp/nspr-save.$$
done
cp $TMPDIR/$BUILDDIR/nspr/$DIST32/config/nspr.pc /tmp/nspr-save.$$

logmsg "Installing binaries (32)"
mkdir -p $DESTDIR/usr/bin/i386
for bin in $TGT_BINS; do
logcmd cp $TMPDIR/$BUILDDIR/dist/$DIST32/bin/$bin \
$DESTDIR/usr/bin/i386/$bin
logcmd elfedit -e 'dyn:runpath /usr/lib/mps' \
$DESTDIR/usr/bin/i386/$bin
done
}

configure64() {
Expand All @@ -127,6 +140,14 @@ make_install64() {
logcmd cp $TMPDIR/$BUILDDIR/dist/$DIST64/lib/$lib \
$DESTDIR/usr/lib/mps/amd64/$lib
done
logmsg "Installing binaries (64)"
mkdir -p $DESTDIR/usr/bin/amd64
for bin in $TGT_BINS; do
logcmd cp $TMPDIR/$BUILDDIR/dist/$DIST32/bin/$bin \
$DESTDIR/usr/bin/amd64/$bin
logcmd elfedit -e 'dyn:runpath /usr/lib/mps/amd64' \
$DESTDIR/usr/bin/amd64/$bin
done
}
secv1_links() {
logcmd ln -s amd64 $DESTDIR/usr/lib/mps/64
Expand All @@ -148,6 +169,7 @@ patch_source
prep_build
build
secv1_links
make_isa_stub

PKG=system/library/mozilla-nss/header-nss
SUMMARY="Network Security Services Headers"
Expand All @@ -167,6 +189,7 @@ clean_up
# Switch variables & populate other proto area.
VER=$NSPRVER
TGT_LIBS=$NSPR_LIBS
TGT_BINS=$NSPR_BINS
PC_FILE=nspr.pc
LOCAL_MOG_FILE=nspr-local.mog
DESTDIR=`echo $DESTDIR | sed 's/nss/nspr/g'`
Expand Down
4 changes: 1 addition & 3 deletions build/mozilla-nss-nspr/nss.mog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,13 @@
#
#
# Copyright 2011-2012 OmniTI Computer Consulting, Inc. All rights reserved.
# Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
# Use is subject to license terms.
#
<transform dir path=usr/bin.* -> drop>
<transform dir path=usr/include.* -> drop>
<transform dir path=usr/share.* -> drop>
<transform file path=usr/bin.* -> drop>
<transform file path=usr/include.* -> drop>
<transform file path=usr/share.* -> drop>
<transform link path=usr/bin.* -> drop>
<transform link path=usr/include.* -> drop>
<transform link path=usr/share.* -> drop>
<transform file path=usr/.*/lib.*\.a$ -> drop>
Expand Down