Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/nspr: ChangeLog nspr-4.9.4.ebuild
Date: Mon, 28 Jan 2013 04:37:39
Message-Id: 20130128043736.68B812171D@flycatcher.gentoo.org
1 vapier 13/01/28 04:37:36
2
3 Modified: ChangeLog nspr-4.9.4.ebuild
4 Log:
5 Clean up toolchain/cross-compiling logic.
6
7 (Portage version: 2.2.0_alpha159/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
8
9 Revision Changes Path
10 1.213 dev-libs/nspr/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/ChangeLog?rev=1.213&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/ChangeLog?rev=1.213&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/ChangeLog?r1=1.212&r2=1.213
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v
19 retrieving revision 1.212
20 retrieving revision 1.213
21 diff -u -r1.212 -r1.213
22 --- ChangeLog 21 Jan 2013 16:27:50 -0000 1.212
23 +++ ChangeLog 28 Jan 2013 04:37:36 -0000 1.213
24 @@ -1,21 +1,9 @@
25 # ChangeLog for dev-libs/nspr
26 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.212 2013/01/21 16:27:50 ago Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.213 2013/01/28 04:37:36 vapier Exp $
29
30 21 Jan 2013; Agostino Sarubbo <ago@g.o> nspr-4.9.4.ebuild:
31 - Stable for sparc, wrt bug #450940
32 -
33 - 21 Jan 2013; Agostino Sarubbo <ago@g.o> nspr-4.9.4.ebuild:
34 - Stable for ppc, wrt bug #450940
35 -
36 - 21 Jan 2013; Agostino Sarubbo <ago@g.o> nspr-4.9.4.ebuild:
37 - Stable for ppc64, wrt bug #450940
38 -
39 - 20 Jan 2013; Agostino Sarubbo <ago@g.o> nspr-4.9.4.ebuild:
40 - Stable for x86, wrt bug #450940
41 -
42 - 20 Jan 2013; Agostino Sarubbo <ago@g.o> nspr-4.9.4.ebuild:
43 - Stable for amd64, wrt bug #450940
44 + Stable for sparc/ppc/ppc64/x86/amd64, wrt bug #450940
45
46 16 Jan 2013; Lars Wendler <polynomial-c@g.o> nspr-4.9.1.ebuild,
47 nspr-4.9.2.ebuild, nspr-4.9.2-r1.ebuild, nspr-4.9.4.ebuild:
48
49
50
51 1.10 dev-libs/nspr/nspr-4.9.4.ebuild
52
53 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/nspr-4.9.4.ebuild?rev=1.10&view=markup
54 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/nspr-4.9.4.ebuild?rev=1.10&content-type=text/plain
55 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/nspr-4.9.4.ebuild?r1=1.9&r2=1.10
56
57 Index: nspr-4.9.4.ebuild
58 ===================================================================
59 RCS file: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.4.ebuild,v
60 retrieving revision 1.9
61 retrieving revision 1.10
62 diff -u -r1.9 -r1.10
63 --- nspr-4.9.4.ebuild 21 Jan 2013 16:27:50 -0000 1.9
64 +++ nspr-4.9.4.ebuild 28 Jan 2013 04:37:36 -0000 1.10
65 @@ -1,6 +1,6 @@
66 # Copyright 1999-2013 Gentoo Foundation
67 # Distributed under the terms of the GNU General Public License v2
68 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.4.ebuild,v 1.9 2013/01/21 16:27:50 ago Exp $
69 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.4.ebuild,v 1.10 2013/01/28 04:37:36 vapier Exp $
70
71 EAPI=3
72 WANT_AUTOCONF="2.1"
73 @@ -47,35 +47,36 @@
74 src_configure() {
75 cd "${S}"/build
76
77 + # We use the standard BUILD_xxx but nspr uses HOST_xxx
78 + tc-export_build_env BUILD_CC
79 + export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS}
80 + tc-export AR CC CXX RANLIB
81 + [[ ${CBUILD} != ${CHOST} ]] \
82 + && export CROSS_COMPILE=1 \
83 + || unset CROSS_COMPILE
84 +
85 + local myconf
86 echo > "${T}"/test.c
87 - $(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o
88 + ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
89 case $(file "${T}"/test.o) in
90 - *32-bit*x86-64*|*64-bit*|*ppc64*|*x86_64*) myconf="${myconf} --enable-64bit";;
91 + *32-bit*x86-64*|*64-bit*|*ppc64*|*x86_64*) myconf+=" --enable-64bit";;
92 *32-bit*|*ppc*|*i386*) ;;
93 *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
94 esac
95 - myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)"
96
97 - LC_ALL="C" ECONF_SOURCE="../mozilla/nsprpub" econf \
98 + # Ancient autoconf needs help finding the right tools.
99 + LC_ALL="C" ECONF_SOURCE="../mozilla/nsprpub" \
100 + ac_cv_path_AR="${AR}" \
101 + econf \
102 + --libdir="${EPREFIX}/usr/$(get_libdir)" \
103 $(use_enable debug) \
104 $(use_enable !debug optimize) \
105 - ${myconf} || die "econf failed"
106 + ${myconf}
107 }
108
109 src_compile() {
110 cd "${S}"/build
111 - if tc-is-cross-compiler; then
112 - $(tc-getBUILD_CC) $BUILD_CFLAGS -DXP_UNIX ../mozilla/nsprpub/config/nsinstall.c \
113 - -o config/native-nsinstall || die "failed to build nsinstall"
114 - $(tc-getBUILD_CC) $BUILD_CFLAGS -DXP_UNIX ../mozilla/nsprpub/config/now.c \
115 - -o config/native-now || die "failed to build now"
116 - sed -s 's#/nsinstall$#/native-nsinstall#' -i config/autoconf.mk
117 - for d in pr/src lib/libc/src lib/ds; do
118 - sed -s 's#/now$#/native-now#' -i ${d}/Makefile
119 - done
120 - fi
121 - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
122 - AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "failed to build"
123 + emake || die "failed to build"
124 }
125
126 src_install () {
127 @@ -85,10 +86,8 @@
128 emake DESTDIR="${D}" install || die "emake install failed"
129
130 cd "${ED}"/usr/$(get_libdir)
131 - for file in *.a; do
132 - einfo "removing static libraries as upstream has requested!"
133 - rm -f ${file} || die "failed to remove static libraries."
134 - done
135 + einfo "removing static libraries as upstream has requested!"
136 + rm -f *.a || die "failed to remove static libraries."
137
138 local n=
139 # aix-soname.patch does this already
Report Message
Find on MARC Find on Google Groups