Print this page
Some packages need to specify -std=gnu89 to compile, and gcc51 defaults to
gnu11 now.
Also, updated mozilla-nss-nspr to 3.19 and 4.10.8, respectively.
Other packages up to gcc51 runtime
| Split |
Close |
| Expand all |
| Collapse all |
--- old/build/mozilla-nss-nspr/build.sh
+++ new/build/mozilla-nss-nspr/build.sh
1 1 #!/usr/bin/bash
2 2 #
3 3 # CDDL HEADER START
4 4 #
5 5 # The contents of this file are subject to the terms of the
6 6 # Common Development and Distribution License, Version 1.0 only
7 7 # (the "License"). You may not use this file except in compliance
8 8 # with the License.
9 9 #
10 10 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
11 11 # or http://www.opensolaris.org/os/licensing.
12 12 # See the License for the specific language governing permissions
13 13 # and limitations under the License.
14 14 #
15 15 # When distributing Covered Code, include this CDDL HEADER in each
16 16 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
17 17 # If applicable, add the following below this CDDL HEADER, with the
18 18 # fields enclosed by brackets "[]" replaced with your own identifying
19 19 # information: Portions Copyright [yyyy] [name of copyright owner]
20 20 #
|
↓ open down ↓ |
20 lines elided |
↑ open up ↑ |
21 21 # CDDL HEADER END
22 22 #
23 23 #
24 24 # Copyright 2014 OmniTI Computer Consulting, Inc. All rights reserved.
25 25 # Use is subject to license terms.
26 26 #
27 27 # Load support functions
28 28 . ../../lib/functions.sh
29 29
30 30 PROG=nss
31 -VER=3.17.4
31 +VER=3.19
32 32 # Include NSPR version since we're downloading a combined tarball.
33 -NSPRVER=4.10.7
33 +NSPRVER=4.10.8
34 34 # But set BUILDDIR to just be the NSS version.
35 35 BUILDDIR=$PROG-$VER
36 36 VERHUMAN=$VER
37 37 PKG=$PROG ##IGNORE##
38 38 SUMMARY="Not the real summary"
39 39 DESC="$SUMMARY"
40 40
41 41 # NOTE: These are generated by uname and build variables.
42 42 # CHECK THESE WHEN THINGS CHANGE!
43 43 DIST32=SunOS5.11_i86pc_gcc_OPT.OBJ
44 44 DIST64=SunOS5.11_i86pc_gcc_64_OPT.OBJ
45 45
|
↓ open down ↓ |
2 lines elided |
↑ open up ↑ |
46 46 BUILD_DEPENDS_IPS="library/nspr/header-nspr"
47 47
48 48 MAKE_OPTS="BUILD_OPT=1 NS_USE_GCC=1 NO_MDUPDATE=1 NSDISTMODE=copy"
49 49
50 50 NSS_LIBS="libfreebl3.so libnss3.so
51 51 libnssckbi.so libnssdbm3.so
52 52 libnssutil3.so libsmime3.so
53 53 libsoftokn3.so libssl3.so"
54 54 NSPR_LIBS="libnspr4.so libplc4.so libplds4.so"
55 55
56 +# Use old gcc4 standards level for this.
57 +export OS_CFLAGS="-std=gnu89"
58 +
56 59 # Variables that switch between NSS and NSPR
57 60 TGT_LIBS=$NSS_LIBS
58 61 PC_FILE=nss.pc
59 62 LOCAL_MOG_FILE=nss-local.mog
60 63
61 64 make_clean() {
62 65 # Assume PWD == top-level with nss & nspr subdirs.
63 66 /bin/rm -rf dist
64 67 cd nss
65 68 logcmd gmake $MAKE_OPTS nss_clean_all || logerr "Can't make clean"
66 69 cd ..
67 70 }
68 71
69 72 configure32() {
70 73 # Get the install/prototype path out of the way now.
71 74 logcmd mkdir -p $DESTDIR/usr/lib/mps || \
72 75 logerr "Failed to create NSS install directory."
73 76 }
74 77
75 78 make_prog32() {
76 79 logmsg "Making libraries (32)"
77 80 # Assume PWD == top-level with nss & nspr subdirs.
78 81 cd nss
79 82 logcmd gmake $MAKE_OPTS nss_build_all || logerr "build failed"
80 83 cd ..
81 84 }
82 85 make_install32() {
83 86 logmsg "Installing libraries (32)"
84 87 for lib in $TGT_LIBS
85 88 do
86 89 logcmd cp $TMPDIR/$BUILDDIR/dist/$DIST32/lib/$lib \
87 90 $DESTDIR/usr/lib/mps/$lib
88 91 done
89 92 logmsg "Installing headers"
90 93 logcmd mkdir -p $DESTDIR/usr/include/mps || \
91 94 logerr "Failed to create NSS header install directory."
92 95 logcmd cp $TMPDIR/$BUILDDIR/dist/public/nss/* $DESTDIR/usr/include/mps/
93 96 logcmd cp $TMPDIR/$BUILDDIR/dist/public/dbm/* $DESTDIR/usr/include/mps/
94 97
95 98 # Save 32-bit NSPR dist off for NSPR build.
96 99 mkdir /tmp/nspr-save.$$
97 100 for lib in $NSPR_LIBS
98 101 do
99 102 logcmd cp $TMPDIR/$BUILDDIR/dist/$DIST32/lib/$lib /tmp/nspr-save.$$
100 103 done
101 104 cp $TMPDIR/$BUILDDIR/nspr/$DIST32/config/nspr.pc /tmp/nspr-save.$$
102 105 }
103 106
104 107 configure64() {
105 108 # Get the install/prototype path out of the way now.
106 109 logcmd mkdir -p $DESTDIR/usr/lib/mps/amd64 || \
107 110 logerr "Failed to create NSS install directory."
108 111 }
109 112
110 113 make_prog64() {
111 114 logmsg "Making libraries (64)"
112 115 # Assume PWD == top-level with nss & nspr subdirs.
113 116 cd nss
114 117 logcmd gmake $MAKE_OPTS USE_64=1 nss_build_all || logerr "build failed"
115 118 cd ..
116 119 }
117 120 make_install64() {
118 121 logmsg "Installing libraries (64)"
119 122 for lib in $TGT_LIBS
120 123 do
121 124 logcmd cp $TMPDIR/$BUILDDIR/dist/$DIST64/lib/$lib \
122 125 $DESTDIR/usr/lib/mps/amd64/$lib
123 126 done
124 127 }
125 128 secv1_links() {
126 129 logcmd ln -s amd64 $DESTDIR/usr/lib/mps/64
127 130 logcmd mkdir -p $DESTDIR/usr/lib/mps/secv1/amd64
128 131 logcmd ln -s amd64 $DESTDIR/usr/lib/mps/secv1/64
129 132 logcmd mkdir -p $DESTDIR/usr/lib/pkgconfig
130 133 logcmd cp $SRCDIR/files/$PC_FILE $DESTDIR/usr/lib/pkgconfig
131 134 for lib in $TGT_LIBS
132 135 do
133 136 ln -s ../../amd64/$lib $DESTDIR/usr/lib/mps/secv1/amd64/$lib
134 137 ln -s ../$lib $DESTDIR/usr/lib/mps/secv1/$lib
135 138 done
136 139 }
137 140
138 141 init
139 142 # Download combined NSS & NSPR tarball.
140 143 download_source $PROG $PROG "$VER-with-nspr-$NSPRVER"
|
↓ open down ↓ |
75 lines elided |
↑ open up ↑ |
141 144 patch_source
142 145 prep_build
143 146 build
144 147 secv1_links
145 148
146 149 PKG=system/library/mozilla-nss/header-nss
147 150 SUMMARY="Network Security Services Headers"
148 151 DESC="$SUMMARY"
149 152 make_package header-nss.mog
150 153
151 -DEPENDS_IPS="SUNWcs system/library/gcc-4-runtime system/library
154 +DEPENDS_IPS="SUNWcs system/library/gcc-5-runtime system/library
152 155 library/nspr database/sqlite-3"
153 156 PKG=system/library/mozilla-nss
154 157 SUMMARY="Network Security Services Libraries"
155 158 DESC="$SUMMARY"
156 159 make_package nss.mog
157 160
158 161 # This cleans up NSS.
159 162 clean_up
160 163
161 164 # Switch variables & populate other proto area.
162 165 VER=$NSPRVER
163 166 TGT_LIBS=$NSPR_LIBS
164 167 PC_FILE=nspr.pc
165 168 LOCAL_MOG_FILE=nspr-local.mog
166 169 DESTDIR=`echo $DESTDIR | sed 's/nss/nspr/g'`
167 170 prep_build
168 171 logcmd mkdir -p $DESTDIR/usr/include/mps/md || \
169 172 logerr "Failed to create NSPR header install directory."
170 173 logcmd mkdir -p $DESTDIR/usr/include/mps/obsolete || \
171 174 logerr "Failed to create NSPR header install directory."
172 175 logcmd mkdir -p $DESTDIR/usr/include/mps/private || \
173 176 logerr "Failed to create NSPR header install directory."
174 177 logcmd mkdir -p $DESTDIR/usr/lib/mps/amd64 || \
175 178 logerr "Failed to create NSPR install directory."
176 179 logcmd mkdir -p $DESTDIR/usr/lib/mps/pkgconfig || \
177 180 logerr "Failed to create NSPR install directory."
178 181 logcmd mkdir -p $DESTDIR/usr/lib/mps/amd64/pkgconfig || \
179 182 logerr "Failed to create NSPR install directory."
180 183 logcmd mkdir -p $DESTDIR/usr/include/mps/pkgconfig || \
181 184 logerr "Failed to create NSPR header install directory."
182 185
183 186 make_install64
184 187 logcmd cp $TMPDIR/$BUILDDIR/dist/$DIST64/include/*.h $DESTDIR/usr/include/mps
185 188 logcmd cp $TMPDIR/$BUILDDIR/dist/$DIST64/include/obsolete/*.h \
186 189 $DESTDIR/usr/include/mps/obsolete
187 190 logcmd cp $TMPDIR/$BUILDDIR/dist/$DIST64/include/private/*.h \
188 191 $DESTDIR/usr/include/mps/private
189 192 logcmd cp $TMPDIR/$BUILDDIR/dist/$DIST64/include/md/* \
190 193 $DESTDIR/usr/include/mps/md
191 194 logcmd cp $TMPDIR/$BUILDDIR/nspr/$DIST64/config/nspr.pc \
192 195 $DESTDIR/usr/lib/mps/amd64/pkgconfig
193 196 # Restore 32-bit NSPR libraries.
194 197 logcmd cp /tmp/nspr-save.$$/nspr.pc $DESTDIR/usr/lib/mps/pkgconfig/nspr.pc
|
↓ open down ↓ |
33 lines elided |
↑ open up ↑ |
195 198 logcmd cp /tmp/nspr-save.$$/*.so $DESTDIR/usr/lib/mps || \
196 199 logerr "32-bit NSPR library installation failure"
197 200 logcmd rm -rf /tmp/nspr-save.$$
198 201 secv1_links
199 202
200 203 PKG=library/nspr/header-nspr
201 204 SUMMARY="Netscape Portable Runtime Headers"
202 205 DESC="$SUMMARY"
203 206 make_package header-nspr.mog
204 207
205 -DEPENDS_IPS="SUNWcs system/library/gcc-4-runtime system/library"
208 +DEPENDS_IPS="SUNWcs system/library/gcc-5-runtime system/library"
206 209 PKG=library/nspr
207 210 SUMMARY="Netscape Portable Runtime"
208 211 DESC="$SUMMARY"
209 212 make_package nspr.mog
210 213
211 214 # This cleans up NSPR.
212 215 clean_up
213 216
214 217 # Vim hints
215 218 # vim:ts=4:sw=4:et:
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX