| 1 |
commit: b1153343b2b76dc5478c5db5d28542696162414c |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 11 13:42:08 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 11 13:45:19 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1153343 |
| 7 |
|
| 8 |
dev-embedded/scratchbox2: Remove last-rited pkg |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/639844 |
| 11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-embedded/scratchbox2/Manifest | 1 - |
| 14 |
.../files/scratchbox2-2.0-as-needed.patch | 22 ------ |
| 15 |
.../scratchbox2/files/scratchbox2-2.0-gentoo.patch | 88 ---------------------- |
| 16 |
.../files/scratchbox2-2.0-glibc-2.10.patch | 39 ---------- |
| 17 |
.../files/scratchbox2-2.0-use-system-lua.patch | 77 ------------------- |
| 18 |
dev-embedded/scratchbox2/metadata.xml | 8 -- |
| 19 |
dev-embedded/scratchbox2/scratchbox2-2.0-r1.ebuild | 60 --------------- |
| 20 |
profiles/package.mask | 4 - |
| 21 |
8 files changed, 299 deletions(-) |
| 22 |
|
| 23 |
diff --git a/dev-embedded/scratchbox2/Manifest b/dev-embedded/scratchbox2/Manifest |
| 24 |
deleted file mode 100644 |
| 25 |
index 14d3039a9af..00000000000 |
| 26 |
--- a/dev-embedded/scratchbox2/Manifest |
| 27 |
+++ /dev/null |
| 28 |
@@ -1 +0,0 @@ |
| 29 |
-DIST sbox2-2.0.tar.bz2 371402 BLAKE2B bbcf4c88e963275a387eac23480e8aaacc2ad41f3af7cb90ebb61cb0e9f37a0a871c4ee16db7945271fc008db97af288ae9e88fd65d4239c1255abe1e5d2fa5f SHA512 f440c848fc08e825d6dbd978987941a71c087902de152238c31f7d529f5b2256c94aaf1085b5775aa7d66022e5bc83ff8f09bd90a55b32632d60342cd258d209 |
| 30 |
|
| 31 |
diff --git a/dev-embedded/scratchbox2/files/scratchbox2-2.0-as-needed.patch b/dev-embedded/scratchbox2/files/scratchbox2-2.0-as-needed.patch |
| 32 |
deleted file mode 100644 |
| 33 |
index eaffc158f9f..00000000000 |
| 34 |
--- a/dev-embedded/scratchbox2/files/scratchbox2-2.0-as-needed.patch |
| 35 |
+++ /dev/null |
| 36 |
@@ -1,22 +0,0 @@ |
| 37 |
-diff --git a/utils/Makefile b/utils/Makefile |
| 38 |
-index cf9b6c4..6f715d3 100644 |
| 39 |
---- a/utils/Makefile |
| 40 |
-+++ b/utils/Makefile |
| 41 |
-@@ -6,7 +6,7 @@ $(D)/sb2-show: CFLAGS := $(CFLAGS) -Wall -W -Werror \ |
| 42 |
- -I$(SRCDIR)/include |
| 43 |
- |
| 44 |
- $(D)/sb2-show.o: preload/exported.h |
| 45 |
--$(D)/sb2-show: preload/libsb2.$(SHLIBEXT) $(D)/sb2-show.o |
| 46 |
-+$(D)/sb2-show: $(D)/sb2-show.o preload/libsb2.$(SHLIBEXT) |
| 47 |
- $(MKOUTPUTDIR) |
| 48 |
- $(P)LD |
| 49 |
- $(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ |
| 50 |
-@@ -25,7 +25,7 @@ $(D)/sb2-interp-wrapper: CFLAGS := $(CFLAGS) -Wall -W -Werror \ |
| 51 |
- -I$(SRCDIR)/preload -Ipreload/ $(PROTOTYPEWARNINGS) \ |
| 52 |
- -I$(SRCDIR)/include |
| 53 |
- |
| 54 |
--$(D)/sb2-interp-wrapper: preload/libsb2.$(SHLIBEXT) $(D)/sb2-interp-wrapper.o |
| 55 |
-+$(D)/sb2-interp-wrapper: $(D)/sb2-interp-wrapper.o preload/libsb2.$(SHLIBEXT) |
| 56 |
- $(MKOUTPUTDIR) |
| 57 |
- $(P)LD |
| 58 |
- $(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -ldl |
| 59 |
|
| 60 |
diff --git a/dev-embedded/scratchbox2/files/scratchbox2-2.0-gentoo.patch b/dev-embedded/scratchbox2/files/scratchbox2-2.0-gentoo.patch |
| 61 |
deleted file mode 100644 |
| 62 |
index 32dcdd1e2e3..00000000000 |
| 63 |
--- a/dev-embedded/scratchbox2/files/scratchbox2-2.0-gentoo.patch |
| 64 |
+++ /dev/null |
| 65 |
@@ -1,88 +0,0 @@ |
| 66 |
-diff --git a/Makefile b/Makefile |
| 67 |
-index 23a13b3..c5b26cc 100644 |
| 68 |
---- a/Makefile |
| 69 |
-+++ b/Makefile |
| 70 |
-@@ -59,7 +59,6 @@ subdirs = luaif preload utils |
| 71 |
- |
| 72 |
- -include config.mak |
| 73 |
- |
| 74 |
--CFLAGS += -O2 -g -Wall -W |
| 75 |
- CFLAGS += -I$(OBJDIR)/include -I$(SRCDIR)/include |
| 76 |
- CFLAGS += -I$(SRCDIR)/luaif/lua-5.1.4/src |
| 77 |
- CFLAGS += -D_GNU_SOURCE=1 -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 |
| 78 |
-@@ -145,6 +144,9 @@ install-noarch: regular |
| 79 |
- else install -d -m 755 $(prefix)/share/man/man1 ; \ |
| 80 |
- fi |
| 81 |
- $(Q)echo "$(PACKAGE_VERSION)" > $(prefix)/share/scratchbox2/version |
| 82 |
-+ $(Q)install -c -m 755 $(OBJDIR)/utils/sb2-show $(prefix)/bin/sb2-show |
| 83 |
-+ $(Q)install -c -m 755 $(OBJDIR)/utils/sb2-monitor $(prefix)/bin/sb2-monitor |
| 84 |
-+ $(Q)install -c -m 755 $(OBJDIR)/utils/sb2-interp-wrapper $(prefix)/bin/sb2-interp-wrapper |
| 85 |
- $(Q)install -c -m 755 $(SRCDIR)/utils/sb2 $(prefix)/bin/sb2 |
| 86 |
- $(Q)install -c -m 755 $(SRCDIR)/utils/sb2-init $(prefix)/bin/sb2-init |
| 87 |
- $(Q)install -c -m 755 $(SRCDIR)/utils/sb2-config $(prefix)/bin/sb2-config |
| 88 |
-@@ -210,10 +212,10 @@ install-noarch: regular |
| 89 |
- ifeq ($(MACH),x86_64) |
| 90 |
- install: install-multilib |
| 91 |
- else |
| 92 |
--install: do-install |
| 93 |
-+install: install-singlelib |
| 94 |
- endif |
| 95 |
- |
| 96 |
--do-install: install-noarch |
| 97 |
-+install-singlelib: install-noarch |
| 98 |
- $(P)INSTALL |
| 99 |
- @if [ -d $(prefix)/lib ] ; \ |
| 100 |
- then echo "$(prefix)/lib present" ; \ |
| 101 |
-@@ -221,9 +223,6 @@ do-install: install-noarch |
| 102 |
- fi |
| 103 |
- $(Q)install -d -m 755 $(prefix)/lib/libsb2 |
| 104 |
- $(Q)install -c -m 755 $(OBJDIR)/preload/libsb2.$(SHLIBEXT) $(prefix)/lib/libsb2/libsb2.so.$(PACKAGE_VERSION) |
| 105 |
-- $(Q)install -c -m 755 $(OBJDIR)/utils/sb2-show $(prefix)/bin/sb2-show |
| 106 |
-- $(Q)install -c -m 755 $(OBJDIR)/utils/sb2-monitor $(prefix)/bin/sb2-monitor |
| 107 |
-- $(Q)install -c -m 755 $(OBJDIR)/utils/sb2-interp-wrapper $(prefix)/bin/sb2-interp-wrapper |
| 108 |
- ifeq ($(OS),Linux) |
| 109 |
- $(Q)/sbin/ldconfig -n $(prefix)/lib/libsb2 |
| 110 |
- endif |
| 111 |
-@@ -232,9 +231,9 @@ multilib_prefix=$(prefix) |
| 112 |
- |
| 113 |
- install-multilib: multilib |
| 114 |
- @$(MAKE) -C obj-32 --include-dir=.. -f ../Makefile SRCDIR=.. do-install-multilib bitness=32 |
| 115 |
-- @$(MAKE) -C obj-64 --include-dir=.. -f ../Makefile SRCDIR=.. do-install |
| 116 |
-+ @$(MAKE) -C obj-64 --include-dir=.. -f ../Makefile SRCDIR=.. do-install-multilib bitness=64 |
| 117 |
- |
| 118 |
--do-install-multilib: |
| 119 |
-+do-install-multilib: install-noarch |
| 120 |
- $(P)INSTALL |
| 121 |
- @if [ -d $(multilib_prefix)/lib$(bitness) ] ; \ |
| 122 |
- then echo "$(prefix)/lib$(bitness) present" ; \ |
| 123 |
-diff --git a/utils/Makefile b/utils/Makefile |
| 124 |
-index cf9b6c4..79304fc 100644 |
| 125 |
---- a/utils/Makefile |
| 126 |
-+++ b/utils/Makefile |
| 127 |
-@@ -1,7 +1,7 @@ |
| 128 |
- # beware of namespace collisions, all subdir makefiles are included |
| 129 |
- # into the top-level Makefile |
| 130 |
- |
| 131 |
--$(D)/sb2-show: CFLAGS := $(CFLAGS) -Wall -W -Werror \ |
| 132 |
-+$(D)/sb2-show: CFLAGS := $(CFLAGS) -Wall -W \ |
| 133 |
- -I$(SRCDIR)/preload -Ipreload/ $(PROTOTYPEWARNINGS) \ |
| 134 |
- -I$(SRCDIR)/include |
| 135 |
- |
| 136 |
-@@ -12,7 +12,7 @@ $(D)/sb2-show: preload/libsb2.$(SHLIBEXT) $(D)/sb2-show.o |
| 137 |
- $(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ |
| 138 |
- |
| 139 |
- |
| 140 |
--$(D)/sb2-monitor: CFLAGS := $(CFLAGS) -Wall -W -Werror \ |
| 141 |
-+$(D)/sb2-monitor: CFLAGS := $(CFLAGS) -Wall -W \ |
| 142 |
- -I$(SRCDIR)/preload -Ipreload/ $(PROTOTYPEWARNINGS) \ |
| 143 |
- -I$(SRCDIR)/include |
| 144 |
- |
| 145 |
-@@ -21,7 +21,7 @@ $(D)/sb2-monitor: $(D)/sb2-monitor.o |
| 146 |
- $(P)LD |
| 147 |
- $(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ |
| 148 |
- |
| 149 |
--$(D)/sb2-interp-wrapper: CFLAGS := $(CFLAGS) -Wall -W -Werror \ |
| 150 |
-+$(D)/sb2-interp-wrapper: CFLAGS := $(CFLAGS) -Wall -W \ |
| 151 |
- -I$(SRCDIR)/preload -Ipreload/ $(PROTOTYPEWARNINGS) \ |
| 152 |
- -I$(SRCDIR)/include |
| 153 |
- |
| 154 |
|
| 155 |
diff --git a/dev-embedded/scratchbox2/files/scratchbox2-2.0-glibc-2.10.patch b/dev-embedded/scratchbox2/files/scratchbox2-2.0-glibc-2.10.patch |
| 156 |
deleted file mode 100644 |
| 157 |
index c5ec6aea434..00000000000 |
| 158 |
--- a/dev-embedded/scratchbox2/files/scratchbox2-2.0-glibc-2.10.patch |
| 159 |
+++ /dev/null |
| 160 |
@@ -1,39 +0,0 @@ |
| 161 |
-diff --git a/preload/interface.master b/preload/interface.master |
| 162 |
-index 55a9481..4ba22b2 100644 |
| 163 |
---- a/preload/interface.master |
| 164 |
-+++ b/preload/interface.master |
| 165 |
-@@ -406,20 +406,34 @@ WRAP: int rmdir(const char *pathname) : \ |
| 166 |
- |
| 167 |
- #ifdef HAVE_SCANDIR |
| 168 |
- #ifdef HAVE_LINUX_SCANDIR |
| 169 |
-+#if _POSIX_C_SOURCE == 200809L |
| 170 |
-+WRAP: int scandir(const char *dir, struct dirent ***namelist, \ |
| 171 |
-+ SCANDIR_TYPE_ARG3, \ |
| 172 |
-+ int(*compar)(const struct dirent **, const struct dirent **)) : \ |
| 173 |
-+ map(dir) hardcode_param(3,filter) |
| 174 |
-+#else |
| 175 |
- WRAP: int scandir(const char *dir, struct dirent ***namelist, \ |
| 176 |
- SCANDIR_TYPE_ARG3, int(*compar)(const void *, const void *)) : \ |
| 177 |
- map(dir) hardcode_param(3,filter) |
| 178 |
- #endif |
| 179 |
-+#endif |
| 180 |
- #ifdef HAVE_OSX_SCANDIR |
| 181 |
- WRAP: int scandir(const char *dirname, struct dirent ***namelist, int (*select)(struct dirent *), int (*compar)(const void *, const void *)): map(dirname) |
| 182 |
- #endif |
| 183 |
- #endif |
| 184 |
- #ifdef HAVE_SCANDIR64 |
| 185 |
-+#if _POSIX_C_SOURCE == 200809L |
| 186 |
-+WRAP: int scandir64(const char *dir, struct dirent64 ***namelist, \ |
| 187 |
-+ int(*filter)(const struct dirent64 *), \ |
| 188 |
-+ int(*compar)(const struct dirent64 **, const struct dirent64 **)) : \ |
| 189 |
-+ map(dir) |
| 190 |
-+#else |
| 191 |
- WRAP: int scandir64(const char *dir, struct dirent64 ***namelist, \ |
| 192 |
- int(*filter)(const struct dirent64 *), \ |
| 193 |
- int(*compar)(const void *, const void *)) : \ |
| 194 |
- map(dir) |
| 195 |
- #endif |
| 196 |
-+#endif |
| 197 |
- #ifdef HAVE_SETXATTR |
| 198 |
- #ifdef HAVE_LINUX_XATTRS |
| 199 |
- WRAP: int setxattr(const char *path, const char *name, const void *value, \ |
| 200 |
|
| 201 |
diff --git a/dev-embedded/scratchbox2/files/scratchbox2-2.0-use-system-lua.patch b/dev-embedded/scratchbox2/files/scratchbox2-2.0-use-system-lua.patch |
| 202 |
deleted file mode 100644 |
| 203 |
index d4c231c74db..00000000000 |
| 204 |
--- a/dev-embedded/scratchbox2/files/scratchbox2-2.0-use-system-lua.patch |
| 205 |
+++ /dev/null |
| 206 |
@@ -1,77 +0,0 @@ |
| 207 |
-diff --git a/Makefile b/Makefile |
| 208 |
-index c5b26cc..da48ea0 100644 |
| 209 |
---- a/Makefile |
| 210 |
-+++ b/Makefile |
| 211 |
-@@ -60,7 +60,7 @@ subdirs = luaif preload utils |
| 212 |
- -include config.mak |
| 213 |
- |
| 214 |
- CFLAGS += -I$(OBJDIR)/include -I$(SRCDIR)/include |
| 215 |
--CFLAGS += -I$(SRCDIR)/luaif/lua-5.1.4/src |
| 216 |
-+# CFLAGS += -I$(SRCDIR)/luaif/lua-5.1.4/src |
| 217 |
- CFLAGS += -D_GNU_SOURCE=1 -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 |
| 218 |
- CFLAGS += -DSCRATCHBOX_ROOT="$(prefix)" |
| 219 |
- CFLAGS += $(MACH_CFLAG) |
| 220 |
-@@ -103,10 +103,7 @@ regular: .configure .version |
| 221 |
- @$(MAKE) -f $(SRCDIR)/Makefile --include-dir=$(SRCDIR) SRCDIR=$(SRCDIR) do-all |
| 222 |
- |
| 223 |
- multilib: |
| 224 |
-- @mkdir -p obj-32 |
| 225 |
-- @mkdir -p obj-64 |
| 226 |
-- @$(MAKE) MACH_CFLAG=-m32 -C obj-32 --include-dir=.. -f ../Makefile SRCDIR=.. regular |
| 227 |
-- @$(MAKE) MACH_CFLAG=-m64 -C obj-64 --include-dir=.. -f ../Makefile SRCDIR=.. regular |
| 228 |
-+ @$(MAKE) MACH_CFLAG=-m64 regular |
| 229 |
- |
| 230 |
- |
| 231 |
- gcc_bins = addr2line ar as cc c++ c++filt cpp g++ gcc gcov gdb gdbtui gprof ld nm objcopy objdump ranlib rdi-stub readelf run size strings strip |
| 232 |
-@@ -230,8 +227,7 @@ endif |
| 233 |
- multilib_prefix=$(prefix) |
| 234 |
- |
| 235 |
- install-multilib: multilib |
| 236 |
-- @$(MAKE) -C obj-32 --include-dir=.. -f ../Makefile SRCDIR=.. do-install-multilib bitness=32 |
| 237 |
-- @$(MAKE) -C obj-64 --include-dir=.. -f ../Makefile SRCDIR=.. do-install-multilib bitness=64 |
| 238 |
-+ @$(MAKE) do-install-multilib bitness=64 |
| 239 |
- |
| 240 |
- do-install-multilib: install-noarch |
| 241 |
- $(P)INSTALL |
| 242 |
-diff --git a/luaif/Makefile b/luaif/Makefile |
| 243 |
-index 28e8885..5e1af6f 100644 |
| 244 |
---- a/luaif/Makefile |
| 245 |
-+++ b/luaif/Makefile |
| 246 |
-@@ -5,7 +5,7 @@ objs := $(D)/luaif.o $(D)/sb_log.o $(D)/paths.o $(D)/argvenvp.o |
| 247 |
- $(D)/sb_log.o: preload/exported.h |
| 248 |
- |
| 249 |
- luaif/libluaif.a: $(objs) |
| 250 |
--luaif/libluaif.a: override CFLAGS := $(CFLAGS) -O2 -g -fPIC -Wall -W -I$(SRCDIR)/$(LUASRC) -I$(OBJDIR)/preload -I$(SRCDIR)/preload |
| 251 |
-+luaif/libluaif.a: override CFLAGS := $(CFLAGS) -O2 -g -fPIC -Wall -W -I$(OBJDIR)/preload -I$(SRCDIR)/preload |
| 252 |
- luaif/libluaif.a: override LDFLAGS := $(LDFLAGS) |
| 253 |
- luaif/libluaif.a: override LIBS := |
| 254 |
- |
| 255 |
-@@ -24,5 +24,5 @@ luaif/liblua.a: override CFLAGS := -O2 -g -fPIC -Wall -W $(CFLAGS) |
| 256 |
- luaif/liblua.a: override LDFLAGS := $(LDFLAGS) |
| 257 |
- luaif/liblua.a: override LIBS := |
| 258 |
- |
| 259 |
--targets := $(targets) $(D)/libluaif.a $(D)/liblua.a |
| 260 |
-+targets := $(targets) $(D)/libluaif.a |
| 261 |
- |
| 262 |
-diff --git a/preload/Makefile b/preload/Makefile |
| 263 |
-index 9f785ba..5094dbc 100644 |
| 264 |
---- a/preload/Makefile |
| 265 |
-+++ b/preload/Makefile |
| 266 |
-@@ -8,7 +8,7 @@ LIBSB2_LDFLAGS = -Wl,-soname=$(LIBSB2_SONAME) \ |
| 267 |
- # DO NOT add any libraries that depend on libpthread to |
| 268 |
- # LIBSB2_LIBS or LIBS!! see the comments in luaif.c. |
| 269 |
- |
| 270 |
--LIBSB2_LIBS = |
| 271 |
-+LIBSB2_LIBS = -llua |
| 272 |
- SHLIBEXT = so |
| 273 |
- else |
| 274 |
- LIBSB2_LIBS = |
| 275 |
-@@ -17,7 +17,7 @@ endif |
| 276 |
- |
| 277 |
- |
| 278 |
- $(D)/libsb2.$(SHLIBEXT): $(call O,$(objs)) |
| 279 |
--$(D)/libsb2.$(SHLIBEXT): luaif/libluaif.a luaif/liblua.a |
| 280 |
-+$(D)/libsb2.$(SHLIBEXT): luaif/libluaif.a |
| 281 |
- $(D)/libsb2.$(SHLIBEXT): CFLAGS := $(CFLAGS) -fPIC -Wall -W \ |
| 282 |
- -I$(SRCDIR)/preload -Ipreload/ $(PROTOTYPEWARNINGS) |
| 283 |
- $(D)/libsb2.$(SHLIBEXT): LDFLAGS := $(LDFLAGS) $(LIBSB2_LDFLAGS) |
| 284 |
|
| 285 |
diff --git a/dev-embedded/scratchbox2/metadata.xml b/dev-embedded/scratchbox2/metadata.xml |
| 286 |
deleted file mode 100644 |
| 287 |
index e248196b07c..00000000000 |
| 288 |
--- a/dev-embedded/scratchbox2/metadata.xml |
| 289 |
+++ /dev/null |
| 290 |
@@ -1,8 +0,0 @@ |
| 291 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 292 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 293 |
-<pkgmetadata> |
| 294 |
- <maintainer type="project"> |
| 295 |
- <email>embedded@g.o</email> |
| 296 |
- <name>Embedded Gentoo</name> |
| 297 |
- </maintainer> |
| 298 |
-</pkgmetadata> |
| 299 |
|
| 300 |
diff --git a/dev-embedded/scratchbox2/scratchbox2-2.0-r1.ebuild b/dev-embedded/scratchbox2/scratchbox2-2.0-r1.ebuild |
| 301 |
deleted file mode 100644 |
| 302 |
index 9fd9257fb6c..00000000000 |
| 303 |
--- a/dev-embedded/scratchbox2/scratchbox2-2.0-r1.ebuild |
| 304 |
+++ /dev/null |
| 305 |
@@ -1,60 +0,0 @@ |
| 306 |
-# Copyright 1999-2017 Gentoo Foundation |
| 307 |
-# Distributed under the terms of the GNU General Public License v2 |
| 308 |
- |
| 309 |
-EAPI="2" |
| 310 |
- |
| 311 |
-inherit autotools eutils multilib toolchain-funcs |
| 312 |
- |
| 313 |
-MY_PN="${PN/cratch}" |
| 314 |
-MY_P="${MY_PN}-${PV}" |
| 315 |
- |
| 316 |
-DESCRIPTION="A cross-compilation toolkit for embedded Linux application development" |
| 317 |
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/sbox2" |
| 318 |
-SRC_URI="https://cgit.freedesktop.org/${MY_PN}/snapshot/${MY_P}.tar.bz2" |
| 319 |
- |
| 320 |
-LICENSE="LGPL-2.1" |
| 321 |
-SLOT="0" |
| 322 |
-KEYWORDS="~amd64 ~x86" |
| 323 |
-IUSE="" |
| 324 |
- |
| 325 |
-DEPEND=">=dev-lang/lua-5.1.4" |
| 326 |
-RDEPEND="${DEPEND}" |
| 327 |
- |
| 328 |
-S="${WORKDIR}/${MY_P}" |
| 329 |
- |
| 330 |
-src_prepare() { |
| 331 |
- epatch "${FILESDIR}/${P}-glibc-2.10.patch" |
| 332 |
- epatch "${FILESDIR}/${P}-gentoo.patch" |
| 333 |
- # bug 296552 |
| 334 |
- epatch "${FILESDIR}/${P}-use-system-lua.patch" |
| 335 |
- # bug 296550 |
| 336 |
- epatch "${FILESDIR}/${P}-as-needed.patch" |
| 337 |
- |
| 338 |
- sed -e "s/^\(CC = \).*/\1$(tc-getCC)/" \ |
| 339 |
- -e "s/^\(CXX = \).*/\1$(tc-getCXX)/" \ |
| 340 |
- -e "s/^\(LD = \).*/\1$(tc-getLD)/" \ |
| 341 |
- -i Makefile || die "sed Makefile failed" |
| 342 |
- |
| 343 |
- eautoreconf |
| 344 |
-} |
| 345 |
- |
| 346 |
-src_compile() { |
| 347 |
- emake prefix="${D}/usr" || die "emake failed" |
| 348 |
-} |
| 349 |
- |
| 350 |
-src_install() { |
| 351 |
- emake prefix="${D}/usr" install || die "emake install failed" |
| 352 |
- |
| 353 |
- # List all the multilib libdirs |
| 354 |
- local libdirs= |
| 355 |
- for libdir in $(get_all_libdirs); do |
| 356 |
- libdirs="${libdirs}:/usr/${libdir}/libsb2" |
| 357 |
- done |
| 358 |
- |
| 359 |
- cat <<-EOF > "${T}/55scratchbox2" |
| 360 |
- LDPATH=${libdirs:1} |
| 361 |
- EOF |
| 362 |
- doenvd "${T}/55scratchbox2" || die "doenvd failed" |
| 363 |
- |
| 364 |
- dodoc AUTHORS README TODO || die "dodoc failed" |
| 365 |
-} |
| 366 |
|
| 367 |
diff --git a/profiles/package.mask b/profiles/package.mask |
| 368 |
index 519ee16418b..f97e77c0437 100644 |
| 369 |
--- a/profiles/package.mask |
| 370 |
+++ b/profiles/package.mask |
| 371 |
@@ -205,10 +205,6 @@ app-emulation/vpcs |
| 372 |
# Fails to build with current glibc (#638840). Removal in a month. |
| 373 |
sys-devel/heirloom-devtools |
| 374 |
|
| 375 |
-# Pacho Ramos <pacho@g.o> (11 Nov 2018) |
| 376 |
-# Fails to build for a long time (#639844). Removal in a month. |
| 377 |
-dev-embedded/scratchbox2 |
| 378 |
- |
| 379 |
# Pacho Ramos <pacho@g.o> (11 Nov 2018) |
| 380 |
# Fails to build (#662000), not compatible with kernel-4, use kernel driver rtsx_pci |
| 381 |
# instead. Removal in a month. |
Archives