Attachment #339798 for bug #458842

View | Details | Raw Unified | Return to bug 458842 | Differences between
Collapse All | Expand All




	epatch "${FILESDIR}/${PN}-3.14.2-x32.patch"
	epatch "${FILESDIR}/${PN}-3.14.2-sqlite.patch"
	epatch "${FILESDIR}/${PN}-3.14.3_sync_with_upstream_softokn_changes.patch"
	epatch "${FILESDIR}/nss-3.14.3-nspr-libs.patch"

	cd "${S}"/mozilla/security/coreconf || die
	# hack nspr paths


	# Take care of nspr settings #436216
	append-cppflags $(${PKG_CONFIG} nspr --cflags)
	append-ldflags $(${PKG_CONFIG} nspr --libs-only-L)
	unset NSPR_INCLUDE_DIR
	export NSPR_LIB_DIR=${T}/fake-dir
	export NSPR_LIB_DIR_FLAGS=$(${PKG_CONFIG} nspr --libs-only-L)

	# Do not let `uname` be used.
	if use kernel_linux ; then

Return to bug 458842

Lines 39-44 Link Here

(-)nss-3.14.3.ebuild.old (-1 / +2 lines)
39	epatch "${FILESDIR}/${PN}-3.14.2-x32.patch"	39	epatch "${FILESDIR}/${PN}-3.14.2-x32.patch"
40	epatch "${FILESDIR}/${PN}-3.14.2-sqlite.patch"	40	epatch "${FILESDIR}/${PN}-3.14.2-sqlite.patch"
41	epatch "${FILESDIR}/${PN}-3.14.3_sync_with_upstream_softokn_changes.patch"	41	epatch "${FILESDIR}/${PN}-3.14.3_sync_with_upstream_softokn_changes.patch"
		42	epatch "${FILESDIR}/nss-3.14.3-nspr-libs.patch"
42		43
43	cd "${S}"/mozilla/security/coreconf \|\| die	44	cd "${S}"/mozilla/security/coreconf \|\| die
44	# hack nspr paths	45	# hack nspr paths
Lines 112-120 Link Here
112		113
113	# Take care of nspr settings #436216	114	# Take care of nspr settings #436216
114	append-cppflags $(${PKG_CONFIG} nspr --cflags)	115	append-cppflags $(${PKG_CONFIG} nspr --cflags)
115	append-ldflags $(${PKG_CONFIG} nspr --libs-only-L)
116	unset NSPR_INCLUDE_DIR	116	unset NSPR_INCLUDE_DIR
117	export NSPR_LIB_DIR=${T}/fake-dir	117	export NSPR_LIB_DIR=${T}/fake-dir
		118	export NSPR_LIB_DIR_FLAGS=$(${PKG_CONFIG} nspr --libs-only-L)
118		119
119	# Do not let `uname` be used.	120	# Do not let `uname` be used.
120	if use kernel_linux ; then	121	if use kernel_linux ; then