1 |
voyageur 13/09/27 20:09:55 |
2 |
|
3 |
Modified: metadata.xml ChangeLog libobjc2-1.7.ebuild |
4 |
Log: |
5 |
Switch to cmake build system, also fixes sandbox violation reported by José Romildo Malaquias in bug #486190 |
6 |
|
7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key C74525F2) |
8 |
|
9 |
Revision Changes Path |
10 |
1.4 gnustep-base/libobjc2/metadata.xml |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnustep-base/libobjc2/metadata.xml?rev=1.4&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnustep-base/libobjc2/metadata.xml?rev=1.4&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnustep-base/libobjc2/metadata.xml?r1=1.3&r2=1.4 |
15 |
|
16 |
Index: metadata.xml |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/gnustep-base/libobjc2/metadata.xml,v |
19 |
retrieving revision 1.3 |
20 |
retrieving revision 1.4 |
21 |
diff -u -r1.3 -r1.4 |
22 |
--- metadata.xml 17 Mar 2013 15:37:33 -0000 1.3 |
23 |
+++ metadata.xml 27 Sep 2013 20:09:55 -0000 1.4 |
24 |
@@ -27,6 +27,6 @@ |
25 |
</longdescription> |
26 |
<use> |
27 |
<flag name='boehm-gc'>Enable Hans Boehm's garbage collector |
28 |
- (<pkg>dev-libs/boehm-gc</pkg>)</flag> |
29 |
+ (<pkg>dev-libs/boehm-gc</pkg>). Not recommended by upstream</flag> |
30 |
</use> |
31 |
</pkgmetadata> |
32 |
|
33 |
|
34 |
|
35 |
1.13 gnustep-base/libobjc2/ChangeLog |
36 |
|
37 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnustep-base/libobjc2/ChangeLog?rev=1.13&view=markup |
38 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnustep-base/libobjc2/ChangeLog?rev=1.13&content-type=text/plain |
39 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnustep-base/libobjc2/ChangeLog?r1=1.12&r2=1.13 |
40 |
|
41 |
Index: ChangeLog |
42 |
=================================================================== |
43 |
RCS file: /var/cvsroot/gentoo-x86/gnustep-base/libobjc2/ChangeLog,v |
44 |
retrieving revision 1.12 |
45 |
retrieving revision 1.13 |
46 |
diff -u -r1.12 -r1.13 |
47 |
--- ChangeLog 26 Sep 2013 11:55:20 -0000 1.12 |
48 |
+++ ChangeLog 27 Sep 2013 20:09:55 -0000 1.13 |
49 |
@@ -1,6 +1,11 @@ |
50 |
# ChangeLog for gnustep-base/libobjc2 |
51 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
52 |
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/libobjc2/ChangeLog,v 1.12 2013/09/26 11:55:20 voyageur Exp $ |
53 |
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/libobjc2/ChangeLog,v 1.13 2013/09/27 20:09:55 voyageur Exp $ |
54 |
+ |
55 |
+ 27 Sep 2013; Bernard Cafarelli <voyageur@g.o> libobjc2-1.7.ebuild, |
56 |
+ metadata.xml: |
57 |
+ Switch to cmake build system, also fixes sandbox violation reported by José |
58 |
+ Romildo Malaquias in bug #486190 |
59 |
|
60 |
*libobjc2-1.7 (26 Sep 2013) |
61 |
|
62 |
|
63 |
|
64 |
|
65 |
1.2 gnustep-base/libobjc2/libobjc2-1.7.ebuild |
66 |
|
67 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnustep-base/libobjc2/libobjc2-1.7.ebuild?rev=1.2&view=markup |
68 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnustep-base/libobjc2/libobjc2-1.7.ebuild?rev=1.2&content-type=text/plain |
69 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnustep-base/libobjc2/libobjc2-1.7.ebuild?r1=1.1&r2=1.2 |
70 |
|
71 |
Index: libobjc2-1.7.ebuild |
72 |
=================================================================== |
73 |
RCS file: /var/cvsroot/gentoo-x86/gnustep-base/libobjc2/libobjc2-1.7.ebuild,v |
74 |
retrieving revision 1.1 |
75 |
retrieving revision 1.2 |
76 |
diff -u -r1.1 -r1.2 |
77 |
--- libobjc2-1.7.ebuild 26 Sep 2013 11:55:20 -0000 1.1 |
78 |
+++ libobjc2-1.7.ebuild 27 Sep 2013 20:09:55 -0000 1.2 |
79 |
@@ -1,57 +1,42 @@ |
80 |
# Copyright 1999-2013 Gentoo Foundation |
81 |
# Distributed under the terms of the GNU General Public License v2 |
82 |
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/libobjc2/libobjc2-1.7.ebuild,v 1.1 2013/09/26 11:55:20 voyageur Exp $ |
83 |
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/libobjc2/libobjc2-1.7.ebuild,v 1.2 2013/09/27 20:09:55 voyageur Exp $ |
84 |
|
85 |
EAPI=5 |
86 |
-inherit multilib |
87 |
+inherit cmake-utils |
88 |
|
89 |
-# We need gnustep-make, but gnustep-make can depend on libobjc |
90 |
-# Use a temporary setup to install in /usr/ |
91 |
-GSMAKE=gnustep-make-2.6.5 |
92 |
DESCRIPTION="GNUstep Objective-C runtime" |
93 |
HOMEPAGE="http://www.gnustep.org" |
94 |
-SRC_URI="http://download.gna.org/gnustep/${P}.tar.bz2 |
95 |
- ftp://ftp.gnustep.org/pub/gnustep/core/${GSMAKE}.tar.gz" |
96 |
+SRC_URI="http://download.gna.org/gnustep/${P}.tar.bz2" |
97 |
|
98 |
LICENSE="MIT" |
99 |
SLOT="0" |
100 |
KEYWORDS="~amd64 ~x86" |
101 |
-IUSE="+boehm-gc" |
102 |
+IUSE="boehm-gc cxx test" |
103 |
|
104 |
-RDEPEND="boehm-gc? ( dev-libs/boehm-gc )" |
105 |
+RDEPEND="boehm-gc? ( dev-libs/boehm-gc ) |
106 |
+ cxx? ( sys-libs/libcxx )" |
107 |
DEPEND="${DEPEND} |
108 |
>=sys-devel/clang-2.9" |
109 |
|
110 |
-GSMAKE_S=${WORKDIR}/${GSMAKE} |
111 |
- |
112 |
src_prepare() { |
113 |
- # Remove CFLAGS from assembly calls |
114 |
- sed -e "s/\$(ALL_CFLAGS)//" -i GNUmakefile || die "Assembly sed failed" |
115 |
- # Multilib-strict |
116 |
- cd "${GSMAKE_S}" |
117 |
- sed -e "s/lib/$(get_libdir)/g" \ |
118 |
- -i FilesystemLayouts/fhs-system || die "multilib path sed failed" |
119 |
+ if ! use cxx; |
120 |
+ then |
121 |
+ sed -e 's/addtest_flags(CXXExceptions.*//' \ |
122 |
+ -i Test/CMakeLists.txt || die "test sed failed" |
123 |
+ fi |
124 |
} |
125 |
|
126 |
src_configure() { |
127 |
export CC=clang |
128 |
+ export CXX=clang++ |
129 |
|
130 |
- cd "${GSMAKE_S}" |
131 |
- econf --with-layout=fhs-system |
132 |
-} |
133 |
- |
134 |
-src_compile() { |
135 |
- local gb |
136 |
- use boehm-gc \ |
137 |
- && gb="boehm_gc=yes" \ |
138 |
- || gb="boehm_gc=no" |
139 |
- emake GNUSTEP_MAKEFILES="${GSMAKE_S}" messages=yes ${gb} |
140 |
-} |
141 |
- |
142 |
-src_install() { |
143 |
- emake GNUSTEP_MAKEFILES="${GSMAKE_S}" \ |
144 |
- GNUSTEP_CONFIG_FILE="${GSMAKE_S}"/GNUstep.conf \ |
145 |
- GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \ |
146 |
- messages=yes \ |
147 |
- DESTDIR="${D}" install |
148 |
+ export PREFIX=/usr |
149 |
+ local mycmakeargs=( |
150 |
+ -DGNUSTEP_CONFIG=GNUSTEP_CONFIG-NOTFOUND |
151 |
+ $(cmake-utils_use boehm-gc BOEHM_GC) |
152 |
+ $(cmake-utils_use_enable cxx OBJCXX) |
153 |
+ $(cmake-utils_use test TESTS) |
154 |
+ ) |
155 |
+ cmake-utils_src_configure |
156 |
} |