| 1 |
ago 12/01/10 10:21:28 |
| 2 |
|
| 3 |
Modified: nss-3.13.1-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Add zlib as RDEPEND and 'die' where missing |
| 6 |
|
| 7 |
(Portage version: 2.1.10.41/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 dev-libs/nss/nss-3.13.1-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nss/nss-3.13.1-r1.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nss/nss-3.13.1-r1.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nss/nss-3.13.1-r1.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: nss-3.13.1-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.13.1-r1.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- nss-3.13.1-r1.ebuild 19 Dec 2011 14:13:10 -0000 1.1 |
| 23 |
+++ nss-3.13.1-r1.ebuild 10 Jan 2012 10:21:27 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
-# Copyright 1999-2011 Gentoo Foundation |
| 26 |
+# Copyright 1999-2012 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.13.1-r1.ebuild,v 1.1 2011/12/19 14:13:10 anarchy Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.13.1-r1.ebuild,v 1.2 2012/01/10 10:21:27 ago Exp $ |
| 30 |
|
| 31 |
EAPI=3 |
| 32 |
inherit eutils flag-o-matic multilib toolchain-funcs |
| 33 |
@@ -18,7 +18,8 @@ |
| 34 |
|
| 35 |
DEPEND="dev-util/pkgconfig" |
| 36 |
RDEPEND=">=dev-libs/nspr-${NSPR_VER} |
| 37 |
- >=dev-db/sqlite-3.5" |
| 38 |
+ >=dev-db/sqlite-3.5 |
| 39 |
+ sys-libs/zlib" |
| 40 |
|
| 41 |
src_prepare() { |
| 42 |
# Custom changes for gentoo |
| 43 |
@@ -26,29 +27,29 @@ |
| 44 |
epatch "${FILESDIR}/${PN}-3.12.6-gentoo-fixup-warnings.patch" |
| 45 |
epatch "${FILESDIR}/nss-3.13.1-pkcs11n-header-fix.patch" |
| 46 |
|
| 47 |
- cd "${S}"/mozilla/security/coreconf |
| 48 |
+ cd "${S}"/mozilla/security/coreconf || die |
| 49 |
# hack nspr paths |
| 50 |
echo 'INCLUDES += -I'"${EPREFIX}"'/usr/include/nspr -I$(DIST)/include/dbm' \ |
| 51 |
>> headers.mk || die "failed to append include" |
| 52 |
|
| 53 |
# modify install path |
| 54 |
sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \ |
| 55 |
- -i source.mk |
| 56 |
+ -i source.mk || die |
| 57 |
|
| 58 |
# Respect LDFLAGS |
| 59 |
- sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk |
| 60 |
+ sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk || die |
| 61 |
|
| 62 |
# Ensure we stay multilib aware |
| 63 |
sed -i -e "s:gentoo\/nss:$(get_libdir):" "${S}"/mozilla/security/nss/config/Makefile || die "Failed to fix for multilib" |
| 64 |
|
| 65 |
# Fix pkgconfig file for Prefix |
| 66 |
sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \ |
| 67 |
- "${S}"/mozilla/security/nss/config/Makefile |
| 68 |
+ "${S}"/mozilla/security/nss/config/Makefile || die |
| 69 |
|
| 70 |
epatch "${FILESDIR}/nss-3.13.1-solaris-gcc.patch" |
| 71 |
|
| 72 |
# dirty hack |
| 73 |
- cd "${S}"/mozilla/security/nss |
| 74 |
+ cd "${S}"/mozilla/security/nss || die |
| 75 |
sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \ |
| 76 |
lib/ssl/config.mk || die |
| 77 |
sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \ |
| 78 |
@@ -58,8 +59,8 @@ |
| 79 |
src_compile() { |
| 80 |
strip-flags |
| 81 |
|
| 82 |
- echo > "${T}"/test.c |
| 83 |
- $(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o |
| 84 |
+ echo > "${T}"/test.c || die |
| 85 |
+ $(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die |
| 86 |
case $(file "${T}"/test.o) in |
| 87 |
*64-bit*|*ppc64*|*x86_64*) export USE_64=1;; |
| 88 |
*32-bit*|*ppc*|*i386*) ;; |
| 89 |
@@ -76,11 +77,11 @@ |
| 90 |
export FREEBL_NO_DEPEND=1 |
| 91 |
export ASFLAGS="" |
| 92 |
|
| 93 |
- cd "${S}"/mozilla/security/coreconf |
| 94 |
+ cd "${S}"/mozilla/security/coreconf || die |
| 95 |
emake -j1 CC="$(tc-getCC)" || die "coreconf make failed" |
| 96 |
- cd "${S}"/mozilla/security/dbm |
| 97 |
+ cd "${S}"/mozilla/security/dbm || die |
| 98 |
emake -j1 CC="$(tc-getCC)" || die "dbm make failed" |
| 99 |
- cd "${S}"/mozilla/security/nss |
| 100 |
+ cd "${S}"/mozilla/security/nss || die |
| 101 |
emake -j1 CC="$(tc-getCC)" || die "nss make failed" |
| 102 |
} |
| 103 |
|
| 104 |
@@ -131,29 +132,29 @@ |
| 105 |
|
| 106 |
src_install () { |
| 107 |
MINOR_VERSION=12 |
| 108 |
- cd "${S}"/mozilla/security/dist |
| 109 |
+ cd "${S}"/mozilla/security/dist || die |
| 110 |
|
| 111 |
- dodir /usr/$(get_libdir) |
| 112 |
+ dodir /usr/$(get_libdir) || die |
| 113 |
cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed" |
| 114 |
# We generate these after stripping the libraries, else they don't match. |
| 115 |
#cp -L */lib/*.chk "${ED}"/usr/$(get_libdir) || die "copying chk files failed" |
| 116 |
cp -L */lib/libcrmf.a "${ED}"/usr/$(get_libdir) || die "copying libs failed" |
| 117 |
|
| 118 |
# Install nss-config and pkgconfig file |
| 119 |
- dodir /usr/bin |
| 120 |
- cp -L */bin/nss-config "${ED}"/usr/bin |
| 121 |
- dodir /usr/$(get_libdir)/pkgconfig |
| 122 |
- cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig |
| 123 |
+ dodir /usr/bin || die |
| 124 |
+ cp -L */bin/nss-config "${ED}"/usr/bin || die |
| 125 |
+ dodir /usr/$(get_libdir)/pkgconfig || die |
| 126 |
+ cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die |
| 127 |
|
| 128 |
# all the include files |
| 129 |
insinto /usr/include/nss |
| 130 |
- doins public/nss/*.h |
| 131 |
- cd "${ED}"/usr/$(get_libdir) |
| 132 |
+ doins public/nss/*.h || die |
| 133 |
+ cd "${ED}"/usr/$(get_libdir) || die |
| 134 |
local n= |
| 135 |
for file in *$(get_libname); do |
| 136 |
n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION}) |
| 137 |
- mv ${file} ${n} |
| 138 |
- ln -s ${n} ${file} |
| 139 |
+ mv ${file} ${n} || die |
| 140 |
+ ln -s ${n} ${file} || die |
| 141 |
if [[ ${CHOST} == *-darwin* ]]; then |
| 142 |
install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die |
| 143 |
fi |
| 144 |
@@ -172,9 +173,9 @@ |
| 145 |
pk12util pp rsaperf selfserv shlibsign signtool signver ssltap strsclnt |
| 146 |
symkeyutil tstclnt vfychain vfyserv" |
| 147 |
fi |
| 148 |
- cd "${S}"/mozilla/security/dist/*/bin/ |
| 149 |
+ cd "${S}"/mozilla/security/dist/*/bin/ || die |
| 150 |
for f in $nssutils; do |
| 151 |
- dobin ${f} |
| 152 |
+ dobin ${f} || die |
| 153 |
done |
| 154 |
|
| 155 |
# Prelink breaks the CHK files. We don't have any reliable way to run |
| 156 |
@@ -184,9 +185,9 @@ |
| 157 |
libs+=("${EPREFIX}/usr/$(get_libdir)/lib${l}.so") |
| 158 |
done |
| 159 |
OLD_IFS="${IFS}" IFS=":" ; liblist="${libs[*]}" ; IFS="${OLD_IFS}" |
| 160 |
- echo -e "PRELINK_PATH_MASK=${liblist}" >"${T}/90nss" |
| 161 |
+ echo -e "PRELINK_PATH_MASK=${liblist}" >"${T}/90nss" || die |
| 162 |
unset libs liblist |
| 163 |
- doenvd "${T}/90nss" |
| 164 |
+ doenvd "${T}/90nss" || die |
| 165 |
} |
| 166 |
|
| 167 |
pkg_postinst() { |
| 168 |
|
| 169 |
|
| 170 |
|
| 171 |
1.231 dev-libs/nss/ChangeLog |
| 172 |
|
| 173 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nss/ChangeLog?rev=1.231&view=markup |
| 174 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nss/ChangeLog?rev=1.231&content-type=text/plain |
| 175 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nss/ChangeLog?r1=1.230&r2=1.231 |
| 176 |
|
| 177 |
Index: ChangeLog |
| 178 |
=================================================================== |
| 179 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v |
| 180 |
retrieving revision 1.230 |
| 181 |
retrieving revision 1.231 |
| 182 |
diff -u -r1.230 -r1.231 |
| 183 |
--- ChangeLog 19 Dec 2011 14:13:10 -0000 1.230 |
| 184 |
+++ ChangeLog 10 Jan 2012 10:21:27 -0000 1.231 |
| 185 |
@@ -1,6 +1,9 @@ |
| 186 |
# ChangeLog for dev-libs/nss |
| 187 |
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 188 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.230 2011/12/19 14:13:10 anarchy Exp $ |
| 189 |
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 190 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.231 2012/01/10 10:21:27 ago Exp $ |
| 191 |
+ |
| 192 |
+ 10 Jan 2012; Agostino Sarubbo <ago@g.o> nss-3.13.1-r1.ebuild: |
| 193 |
+ Add zlib as RDEPEND and 'die' where missing |
| 194 |
|
| 195 |
*nss-3.13.1-r1 (19 Dec 2011) |
Archives