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

Gentoo Archives: gentoo-commits

From: "Fabian Groffen (grobian)" <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-devel/binutils-apple/files: binutils-apple-3.1.1-libtool-ranlib.patch binutils-apple-3.1.2-as-Makefile.patch binutils-apple-3.1.1-as.patch Makefile binutils-apple-3.1.1-no-headers.patch binutils-apple-3.1.1-no-efi-man.patch binutils-apple-3.1.1-ranlib.patch binutils-apple-3.1.1-no-oss-dir.patch binutils-apple-3.1.1-testsuite.patch binutils-apple-3.1.1-as-dir.patch binutils-apple-3.1.1-nmedit.patch
Date: Sun, 21 Jun 2009 10:06:55
Message-Id: E1MIJwq-0005w8-P3@stork.gentoo.org
1 grobian 09/06/21 10:06:52
2
3 Added: binutils-apple-3.1.1-libtool-ranlib.patch
4 binutils-apple-3.1.2-as-Makefile.patch
5 binutils-apple-3.1.1-as.patch Makefile
6 binutils-apple-3.1.1-no-headers.patch
7 binutils-apple-3.1.1-no-efi-man.patch
8 binutils-apple-3.1.1-ranlib.patch
9 binutils-apple-3.1.1-no-oss-dir.patch
10 binutils-apple-3.1.1-testsuite.patch
11 binutils-apple-3.1.1-as-dir.patch
12 binutils-apple-3.1.1-nmedit.patch
13 Log:
14 add sys-devel/binutils-apple from Gentoo Prefix tree
15 (Portage version: 2.1.6.13/cvs/Linux x86_64)
16
17 Revision Changes Path
18 1.1 sys-devel/binutils-apple/files/binutils-apple-3.1.1-libtool-ranlib.patch
19
20 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/binutils-apple/files/binutils-apple-3.1.1-libtool-ranlib.patch?rev=1.1&view=markup
21 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/binutils-apple/files/binutils-apple-3.1.1-libtool-ranlib.patch?rev=1.1&content-type=text/plain
22
23 Index: binutils-apple-3.1.1-libtool-ranlib.patch
24 ===================================================================
25 match "ranlib" at the back of the string, such that <CHOST>-ranlib also
26 works correctly
27
28 --- cctools-698/misc/libtool.c
29 +++ cctools-698/misc/libtool.c
30 @@ -336,8 +336,9 @@
31 p++;
32 else
33 p = argv[0];
34 - if(strncmp(p, "ranlib", sizeof("ranlib") - 1) == 0)
35 - cmd_flags.ranlib = TRUE;
36 + if ((i = strlen(p)) >= sizeof("ranlib") - 1 &&
37 + strcmp(p + (i - (sizeof("ranlib") - 1)), "ranlib") == 0)
38 + cmd_flags.ranlib = TRUE;
39
40 /* The default is to used long names */
41 cmd_flags.use_long_names = TRUE;
42
43
44
45 1.1 sys-devel/binutils-apple/files/binutils-apple-3.1.2-as-Makefile.patch
46
47 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/binutils-apple/files/binutils-apple-3.1.2-as-Makefile.patch?rev=1.1&view=markup
48 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/binutils-apple/files/binutils-apple-3.1.2-as-Makefile.patch?rev=1.1&content-type=text/plain
49
50 Index: binutils-apple-3.1.2-as-Makefile.patch
51 ===================================================================
52 --- as/Makefile
53 +++ as/Makefile
54 @@ -343,7 +343,7 @@
55 makeUser.o $(LIBSTUFF_DIR) $(LIBSTUFF)
56 $(CC) $(CFLAGS) $(RC_CFLAGS) -o $(SYMROOT)/as $(SYMROOT)/as.private.o
57
58 -makeUser.c messages.c: make.h
59 +makeUser.c ../messages.c: make.h
60
61 make.h makeUser.c: make.defs
62 $(MIG) $(MIG_FLAGS) $(SRCROOT)/make.defs
63
64
65
66 1.1 sys-devel/binutils-apple/files/binutils-apple-3.1.1-as.patch
67
68 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/binutils-apple/files/binutils-apple-3.1.1-as.patch?rev=1.1&view=markup
69 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/binutils-apple/files/binutils-apple-3.1.1-as.patch?rev=1.1&content-type=text/plain
70
71 Index: binutils-apple-3.1.1-as.patch
72 ===================================================================
73 make building for obsolete architectures optional.
74
75 --- cctools-698/as/Makefile
76 +++ cctools-698/as/Makefile
77 @@ -1,3 +1,4 @@
78 +BUILD_OBSOLETE_ARCH = yes
79 RC_OS = macos
80 export USE_APPLE_PB_SUPPORT = all
81 OFLAG = -Os
82 @@ -31,26 +32,34 @@
83 SYMROOT = .
84 OBJROOT = .
85 SYM_DIRS = $(SYMROOT)/driver_dir \
86 - $(SYMROOT)/a68_dir \
87 - $(SYMROOT)/a88_dir \
88 $(SYMROOT)/a386_dir \
89 $(SYMROOT)/ax86_64_dir \
90 $(SYMROOT)/appc_dir \
91 - $(SYMROOT)/appc64_dir \
92 + $(SYMROOT)/appc64_dir
93 +
94 +ifeq "yes" "$(BUILD_OBSOLETE_ARCH)"
95 +SYM_DIRS += \
96 + $(SYMROOT)/a68_dir \
97 + $(SYMROOT)/a88_dir \
98 $(SYMROOT)/a860_dir \
99 $(SYMROOT)/ahppa_dir \
100 $(SYMROOT)/asparc_dir
101 +endif
102
103 OFILE_DIRS = $(OBJROOT)/driver_dir \
104 - $(OBJROOT)/a68_dir \
105 - $(OBJROOT)/a88_dir \
106 $(OBJROOT)/a386_dir \
107 $(OBJROOT)/ax86_64_dir \
108 $(OBJROOT)/appc_dir \
109 - $(OBJROOT)/appc64_dir \
110 + $(OBJROOT)/appc64_dir
111 +
112 +ifeq "yes" "$(BUILD_OBSOLETE_ARCH)"
113 +OFILE_DIRS += \
114 + $(OBJROOT)/a68_dir \
115 + $(OBJROOT)/a88_dir \
116 $(OBJROOT)/a860_dir \
117 $(OBJROOT)/ahppa_dir \
118 $(OBJROOT)/asparc_dir
119 +endif
120
121 BINDIR = /bin
122 USRBINDIR = /usr/bin
123 @@ -109,9 +118,13 @@
124 OBJS_hppa = $(CFILES_hppa:.c=.o)
125 OBJS_sparc = $(CFILES_sparc:.c=.o)
126
127 -all: $(OFILE_DIRS) $(SYM_DIRS) driver_build a68_build a88_build a386_build \
128 - ax86_64_build a860_build appc_build appc64_build ahppa_build \
129 - $(A_BUILD) asparc_build
130 +all: $(OFILE_DIRS) $(SYM_DIRS) driver_build a386_build \
131 + ax86_64_build appc_build appc64_build \
132 + $(A_BUILD)
133 +
134 +ifeq "yes" "$(BUILD_OBSOLETE_ARCH)"
135 +all: a68_build a88_build a860_build ahppa_build asparc_build
136 +endif
137
138 all_test: a68_test a88_test a860_test a386_test appc_test ahppa_test
139
140 @@ -414,12 +427,14 @@
141 $(MKDIRS) $(DSTROOT)$(LIBDIR)/ppc64
142 install -c -s -m 555 $(SYMROOT)/appc64_dir/as \
143 $(DSTROOT)$(LIBDIR)/ppc64/as
144 +ifeq "yes" "$(BUILD_OBSOLETE_ARCH)"
145 $(MKDIRS) $(DSTROOT)$(LOCLIBDIR)/m68k
146 install -c -s -m 555 $(SYMROOT)/a68_dir/as \
147 $(DSTROOT)$(LOCLIBDIR)/m68k/as
148 $(MKDIRS) $(DSTROOT)$(LOCLIBDIR)/sparc
149 install -c -s -m 555 $(SYMROOT)/asparc_dir/as \
150 $(DSTROOT)$(LOCLIBDIR)/sparc/as
151 +endif
152
153 nextstep_install: common_install
154 $(MKDIRS) $(DSTROOT)$(BINDIR)
155 @@ -439,6 +454,7 @@
156 $(DSTROOT)$(LOCLIBDIR)/ppc/as
157
158 common_install:
159 +ifeq "yes" "$(BUILD_OBSOLETE_ARCH)"
160 $(MKDIRS) $(DSTROOT)$(LOCLIBDIR)/m88k
161 install -c -s -m 555 $(SYMROOT)/a88_dir/as \
162 $(DSTROOT)$(LOCLIBDIR)/m88k/as
163 @@ -448,6 +464,7 @@
164 $(MKDIRS) $(DSTROOT)$(LOCLIBDIR)/i860
165 install -s -m 555 $(SYMROOT)/a860_dir/as \
166 $(DSTROOT)$(LOCLIBDIR)/i860/as
167 +endif
168
169 $(OFILE_DIRS) $(SYM_DIRS):
170 $(MKDIRS) $@
171
172
173
174 1.1 sys-devel/binutils-apple/files/Makefile
175
176 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/binutils-apple/files/Makefile?rev=1.1&view=markup
177 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/binutils-apple/files/Makefile?rev=1.1&content-type=text/plain
178
179 Index: Makefile
180 ===================================================================
181 all: ld64 rebase
182
183 build_test: machocheck ObjectDump
184
185 ld64: debugline.o Options.o ld.o version.o
186 $(CXX) $(LDFLAGS) -o $@ $^
187
188 machocheck: machochecker.o
189 $(CXX) $(LDFLAGS) -o $@ $^
190
191 ObjectDump: ObjectDump.o debugline.o
192 $(CXX) $(LDFLAGS) -o $@ $^
193
194
195
196 1.1 sys-devel/binutils-apple/files/binutils-apple-3.1.1-no-headers.patch
197
198 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/binutils-apple/files/binutils-apple-3.1.1-no-headers.patch?rev=1.1&view=markup
199 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/binutils-apple/files/binutils-apple-3.1.1-no-headers.patch?rev=1.1&content-type=text/plain
200
201 Index: binutils-apple-3.1.1-no-headers.patch
202 ===================================================================
203 get rid of libraries, includes, and obsolete manpages
204
205 --- cctools-698/Makefile
206 +++ cctools-698/Makefile
207 @@ -170,7 +170,9 @@
208 DSTROOT=$$DSTROOT install_tools lib_ofiles_install; \
209 fi
210
211 -install_tools: installhdrs
212 +install_tools: installhdrs install_all_but_headers
213 +
214 +install_all_but_headers:
215 @if [ $(SRCROOT) ]; \
216 then \
217 CWD=`pwd`; cd "$(DSTROOT)"; DSTROOT=`pwd`; cd "$$CWD"; \
218
219
220
221 1.1 sys-devel/binutils-apple/files/binutils-apple-3.1.1-no-efi-man.patch
222
223 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/binutils-apple/files/binutils-apple-3.1.1-no-efi-man.patch?rev=1.1&view=markup
224 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/binutils-apple/files/binutils-apple-3.1.1-no-efi-man.patch?rev=1.1&content-type=text/plain
225
226 Index: binutils-apple-3.1.1-no-efi-man.patch
227 ===================================================================
228 don't install efi's manpages since we don't install efi
229
230 --- cctools-698/man/Makefile
231 +++ cctools-698/man/Makefile
232 @@ -27,14 +27,21 @@
233 MANL3 = libsyminfo.3 redo_prebinding.3
234
235 INSTALL_FILES = Makefile $(COMMON_MAN1) $(OTHER_MAN1) $(MAN3) $(MAN5) $(MANL) \
236 - $(MANL3) $(DYLD_MAN1) $(DYLD_MAN3) $(DYLD_MANL3) $(EFI1) notes
237 + $(MANL3) $(DYLD_MAN1) $(DYLD_MAN3) $(DYLD_MANL3) notes
238 +
239 +ifeq "$(EFITOOLS)" "efitools"
240 + INSTALL_FILES += $(EFI1)
241 +endif
242
243 MANDIR = /usr/share/man
244 LOCMANDIR = /usr/local/man
245 EFIMANDIR = /usr/local/efi/share/man
246 DSTDIRS = $(DSTROOT)$(MANDIR)/man1 $(DSTROOT)$(MANDIR)/man3 \
247 $(DSTROOT)$(MANDIR)/man5 $(DSTROOT)$(LOCMANDIR)/man1 \
248 - $(DSTROOT)$(LOCMANDIR)/man3 $(DSTROOT)$(EFIMANDIR)/man1
249 + $(DSTROOT)$(LOCMANDIR)/man3
250 +ifeq "$(EFITOOLS)" "efitools"
251 + DSTDIR += $(DSTROOT)$(EFIMANDIR)/man1
252 +endif
253
254 install: $(DSTDIRS) $(COMMON_MAN1) $(OTHER_MAN1) $(MAN3) $(MAN5) $(MANL) \
255 $(RC_OS) $(MANL3)
256 @@ -51,7 +58,9 @@
257 install -c -m 444 $(MAN5) $(DSTROOT)$(MANDIR)/man5
258 install -c -m 444 $(MANL) $(DSTROOT)$(LOCMANDIR)/man1
259 install -c -m 444 $(MANL3) $(DSTROOT)$(LOCMANDIR)/man3
260 +ifeq "$(EFITOOLS)" "efitools"
261 install -c -m 444 $(EFI1) $(DSTROOT)$(EFIMANDIR)/man1
262 +endif
263 if [ $(OLD_DYLD_STUFF) ]; \
264 then \
265 install -c -m 444 $(DYLD_MANL3) $(DSTROOT)$(LOCMANDIR)/man3;\
266
267
268
269 1.1 sys-devel/binutils-apple/files/binutils-apple-3.1.1-ranlib.patch
270
271 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/binutils-apple/files/binutils-apple-3.1.1-ranlib.patch?rev=1.1&view=markup
272 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/binutils-apple/files/binutils-apple-3.1.1-ranlib.patch?rev=1.1&content-type=text/plain
273
274 Index: binutils-apple-3.1.1-ranlib.patch
275 ===================================================================
276 run ranlib before installation so we needn't touch permissions
277
278 --- cctools-698/libmacho/Makefile
279 +++ cctools-698/libmacho/Makefile
280 @@ -316,29 +316,29 @@
281 $(MKDIRS) $(DSTROOT)$(SYSTEMDIR)
282 if [ $(SRCROOT) = . ]; \
283 then \
284 + ranlib dtmp_obj/libmacho.a; \
285 install -c -m 444 dtmp_obj/libmacho.a \
286 $(DSTROOT)$(SYSTEMDIR)/libmacho.a; \
287 - ranlib $(DSTROOT)$(SYSTEMDIR)/libmacho.a; \
288 (cd $(DSTROOT)$(SYSTEMDIR) ; \
289 rm -f libmacho_debug.a ; ln -s libmacho.a libmacho_debug.a); \
290 + ranlib ptmp_obj/libmacho_pg.a; \
291 install -c -m 444 ptmp_obj/libmacho_pg.a \
292 $(DSTROOT)$(SYSTEMDIR)/libmacho_profile.a; \
293 - ranlib $(DSTROOT)$(SYSTEMDIR)/libmacho_profile.a; \
294 + ranlib otmp_obj/libmacho_static.a; \
295 install -c -m 444 otmp_obj/libmacho_static.a \
296 $(DSTROOT)$(SYSTEMDIR)/libmacho_static.a; \
297 - ranlib $(DSTROOT)$(SYSTEMDIR)/libmacho_static.a; \
298 else \
299 + ranlib $(SYMROOT)/libmacho.a; \
300 install -c -m 444 $(SYMROOT)/libmacho.a \
301 $(DSTROOT)$(SYSTEMDIR)/libmacho.a; \
302 - ranlib $(DSTROOT)$(SYSTEMDIR)/libmacho.a; \
303 (cd $(DSTROOT)$(SYSTEMDIR) ; \
304 rm -f libmacho_debug.a ; ln -s libmacho.a libmacho_debug.a); \
305 + ranlib $(SYMROOT)/libmacho_pg.a; \
306 install -c -m 444 $(SYMROOT)/libmacho_pg.a \
307 $(DSTROOT)$(SYSTEMDIR)/libmacho_profile.a; \
308 - ranlib $(DSTROOT)$(SYSTEMDIR)/libmacho_profile.a; \
309 + ranlib $(SYMROOT)/libmacho_static.a; \
310 install -c -m 444 $(SYMROOT)/libmacho_static.a \
311 $(DSTROOT)$(SYSTEMDIR)/libmacho_static.a; \
312 - ranlib $(DSTROOT)$(SYSTEMDIR)/libmacho_static.a; \
313 fi
314
315 teflon_lib_ofiles_install nextstep_lib_ofiles_install:
316 --- cctools-698/cbtlibs/Makefile
317 +++ cctools-698/cbtlibs/Makefile
318 @@ -80,9 +80,9 @@
319
320 lib_ofiles_install: lib_ofiles
321 $(MKDIRS) $(DSTROOT)$(LOCLIBDIR)
322 + ranlib $(SYMROOT)/libsyminfo.a
323 install -p -c -m 444 $(SYMROOT)/libsyminfo.a \
324 $(DSTROOT)$(LOCLIBDIR)/libsyminfo.a
325 - ranlib $(DSTROOT)$(LOCLIBDIR)/libsyminfo.a
326
327 -include $(OFILE_DIR)/Makedep
328
329
330
331
332 1.1 sys-devel/binutils-apple/files/binutils-apple-3.1.1-no-oss-dir.patch
333
334 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/binutils-apple/files/binutils-apple-3.1.1-no-oss-dir.patch?rev=1.1&view=markup
335 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/binutils-apple/files/binutils-apple-3.1.1-no-oss-dir.patch?rev=1.1&content-type=text/plain
336
337 Index: binutils-apple-3.1.1-no-oss-dir.patch
338 ===================================================================
339 don't create an OpenSource dir
340
341 --- cctools-698/as/Makefile
342 +++ cctools-698/as/Makefile
343 @@ -408,12 +408,6 @@
344 $(MKDIRS) $(DSTROOT)$(USRBINDIR)
345 install -c -s -m 555 $(SYMROOT)/driver_dir/driver \
346 $(DSTROOT)$(USRBINDIR)/as
347 - $(MKDIRS) $(DSTROOT)/usr/local/OpenSourceVersions/
348 - install -c -s -m 444 $(SRCROOT)/cctools.plist \
349 - $(DSTROOT)/usr/local/OpenSourceVersions/cctools.plist
350 - $(MKDIRS) $(DSTROOT)/usr/local/OpenSourceLicenses/
351 - install -c -s -m 444 $(SRCROOT)/COPYING \
352 - $(DSTROOT)/usr/local/OpenSourceLicenses/cctools.txt
353 $(MKDIRS) $(DSTROOT)$(LIBDIR)/ppc
354 install -c -s -m 555 $(SYMROOT)/appc_dir/as \
355 $(DSTROOT)$(LIBDIR)/ppc/as
356
357
358
359 1.1 sys-devel/binutils-apple/files/binutils-apple-3.1.1-testsuite.patch
360
361 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/binutils-apple/files/binutils-apple-3.1.1-testsuite.patch?rev=1.1&view=markup
362 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/binutils-apple/files/binutils-apple-3.1.1-testsuite.patch?rev=1.1&content-type=text/plain
363
364 Index: binutils-apple-3.1.1-testsuite.patch
365 ===================================================================
366 fix the test suite so it is even usable
367
368 --- ld64-85.2.2/unit-tests/test-cases/commons-alignment/Makefile
369 +++ ld64-85.2.2/unit-tests/test-cases/commons-alignment/Makefile
370 @@ -29,9 +29,9 @@
371
372 all:
373 ${CC} ${CCFLAGS} foo.s -c -o foo.o
374 - nm -m foo.o | grep '(alignment 2^6)' | ${FAIL_IF_EMPTY}
375 + nm -m foo.o | fgrep '(alignment 2^6)' | ${FAIL_IF_EMPTY}
376 ${LD} foo.o -r -o foo2.o
377 - nm -m foo2.o | grep '(alignment 2^6)' | ${PASS_IFF_STDIN}
378 + nm -m foo2.o | fgrep '(alignment 2^6)' | ${PASS_IFF_STDIN}
379
380 clean:
381 rm -rf foo.o foo2.o
382 --- ld64-85.2.2/unit-tests/test-cases/order_file/Makefile
383 +++ ld64-85.2.2/unit-tests/test-cases/order_file/Makefile
384 @@ -33,7 +33,7 @@
385 run: all
386
387 all:
388 - as -arch ${ARCH} -L extra.s -o extra.o
389 + as -L extra.s -o extra.o
390 ${CC} ${CCFLAGS} main.c extra.o -o main1 -Wl,-order_file -Wl,main1.order
391 ${FAIL_IF_BAD_MACHO} main1
392 nm -n -g -j main1 | grep "_main" > main1.nm
393 @@ -44,7 +44,7 @@
394 nm -n -j main2 | egrep '^_[a-z]+[0-9]$$' > main2.nm
395 ${PASS_IFF} diff main2.nm main2.expected
396
397 - ${CC} -arch ${ARCH} -c main.c -o main.o
398 + ${CC} -c main.c -o main.o
399 ${CC} ${CCFLAGS} main.o extra.o -o main3 -Wl,-order_file -Wl,main3.order
400 ${FAIL_IF_BAD_MACHO} main3
401 nm -n -g -j main3 | grep "_main" > main3.nm
402 --- ld64-85.2.2/unit-tests/test-cases/16-byte-alignment/Makefile
403 +++ ld64-85.2.2/unit-tests/test-cases/16-byte-alignment/Makefile
404 @@ -30,13 +30,13 @@
405 run: all
406
407 all:
408 - ${FAIL_IF_ERROR} ${CC} ${CCFLAGS} -arch ${ARCH} -c -O2 tl_test2.c -o tl_test2-${ARCH}.o
409 + ${FAIL_IF_ERROR} ${CC} ${CCFLAGS} -c -O2 tl_test2.c -o tl_test2-${ARCH}.o
410
411 # verify that the alignment is correct in the .o
412 ObjectDump -only _ai -align -no_content tl_test2-${ARCH}.o|${FAIL_IF_ERROR} grep '\<0 mod 16\>' >/dev/null
413
414 # now verify the executable
415 - ${FAIL_IF_ERROR} ${CC} ${CCFLAGS} -arch ${ARCH} -O2 tl_test2-${ARCH}.o -o tl_test2-${ARCH}
416 + ${FAIL_IF_ERROR} ${CC} ${CCFLAGS} -O2 tl_test2-${ARCH}.o -o tl_test2-${ARCH}
417 ${FAIL_IF_ERROR} sh -c "nm tl_test2-${ARCH}|grep '0 D _ai\>' >/dev/null"
418 ${PASS_IFF_GOOD_MACHO} tl_test2-${ARCH}
419
420 --- ld64-85.2.2/unit-tests/test-cases/eh-strip-test/Makefile
421 +++ ld64-85.2.2/unit-tests/test-cases/eh-strip-test/Makefile
422 @@ -27,7 +27,7 @@
423
424
425 all:
426 - ${FAIL_IF_ERROR} $(CXX) main.cxx -arch ${ARCH} -o main
427 + ${FAIL_IF_ERROR} $(CXX) main.cxx -o main
428 ${FAIL_IF_ERROR} nm -j main | grep '\.eh$$'| ${FAIL_IF_STDIN}
429 ${PASS_IFF_GOOD_MACHO} main
430 clean:
431 --- ld64-85.2.2/unit-tests/test-cases/strip-test2/Makefile
432 +++ ld64-85.2.2/unit-tests/test-cases/strip-test2/Makefile
433 @@ -50,10 +50,10 @@
434
435
436 all:
437 - $(CXX) main.cxx -arch ${ARCH} -o main
438 + $(CXX) main.cxx -o main
439 ${FAIL_IF_BAD_MACHO} main
440 ${FAIL_IF_ERROR} nm -j main >main-no-strip.nm
441 - $(CXX) main.cxx -arch ${ARCH} -o main
442 + $(CXX) main.cxx -o main
443 ${FAIL_IF_BAD_MACHO} main
444
445 # Make sure there are no symbols in the stripped file that aren't
446 --- ld64-85.2.2/unit-tests/test-cases/literals-coalesce/Makefile
447 +++ ld64-85.2.2/unit-tests/test-cases/literals-coalesce/Makefile
448 @@ -32,7 +32,7 @@
449
450 all:
451 ${CC} ${ASMFLAGS} literals.s -c -o literals-${ARCH}.o
452 - ${FAIL_IF_ERROR} ${OBJECTDUMP} literals-${ARCH}.o | grep 'name:'| uniq -c | grep -v '^ [1|2]' | ${FAIL_IF_STDIN}
453 + ${FAIL_IF_ERROR} ${OBJECTDUMP} literals-${ARCH}.o | grep 'name:'| uniq -c | grep -v '^ *[1|2]' | ${FAIL_IF_STDIN}
454 ${LD} -arch ${ARCH} -r literals-${ARCH}.o -o literals-r-${ARCH}.o
455 ${FAIL_IF_ERROR} ${OBJECTDUMP} literals-r-${ARCH}.o | grep 'name:' | uniq -d | ${PASS_IFF_EMPTY}
456
457 --- ld64-85.2.2/unit-tests/test-cases/stabs-coalesce/Makefile
458 +++ ld64-85.2.2/unit-tests/test-cases/stabs-coalesce/Makefile
459 @@ -38,7 +38,7 @@
460 ${FAIL_IF_BAD_MACHO} stabs-hello-${ARCH}
461 nm -ap stabs-hello-${ARCH} | grep FUN | grep _Z3fooi | wc -l > stabs-hello-foo-count
462 echo " 1" > one
463 - ${PASS_IFF} diff stabs-hello-foo-count one
464 + ${PASS_IFF} diff -w stabs-hello-foo-count one
465
466 hello.o : hello.cxx
467 ${CXX} ${CCXXFLAGS} -gstabs+ -gused hello.cxx -c -o $@
468
469
470
471 1.1 sys-devel/binutils-apple/files/binutils-apple-3.1.1-as-dir.patch
472
473 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/binutils-apple/files/binutils-apple-3.1.1-as-dir.patch?rev=1.1&view=markup
474 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/binutils-apple/files/binutils-apple-3.1.1-as-dir.patch?rev=1.1&content-type=text/plain
475
476 Index: binutils-apple-3.1.1-as-dir.patch
477 ===================================================================
478 handles the libexecdir for as and other fixes
479
480 --- cctools-698/as/driver.c
481 +++ cctools-698/as/driver.c
482 @@ -27,6 +27,9 @@
483 char **envp)
484 {
485 const char *LIB =
486 +#ifdef ASLIBEXECDIR
487 + ASLIBEXECDIR;
488 +#else
489 #if defined(__OPENSTEP__) || defined(__HERA__) || \
490 defined(__GONZO_BUNSEN_BEAKER__) || defined(__KODIAK__)
491 "/usr/libexec/";
492 @@ -40,6 +42,7 @@
493 #else
494 "/usr/local/libexec/gcc/darwin/";
495 #endif
496 +#endif
497 const char *AS = "/as";
498
499 int i;
500 @@ -170,7 +170,11 @@
501 }
502
503 }
504 +#ifndef ASLIBEXECDIR
505 as = makestr(prefix, LIB, arch_name, AS, NULL);
506 +#else
507 + as = makestr(LIB, arch_name, AS, NULL);
508 +#endif
509
510 /*
511 * If this assembler exist try to run it else print an error message.
512 @@ -182,6 +182,9 @@
513 else
514 exit(1);
515 }
516 +#ifdef ASLIBEXECDIR
517 + as_local = "";
518 +#else
519 as_local = makestr(prefix, LOCALLIB, arch_name, AS, NULL);
520 if(access(as_local, F_OK) == 0){
521 argv[0] = as_local;
522 @@ -193,6 +198,8 @@
523 exit(1);
524 }
525 else{
526 +#endif
527 + {
528 printf("%s: assembler (%s or %s) for architecture %s not "
529 "installed\n", progname, as, as_local, arch_name);
530 arch_flags = get_arch_flags();
531 @@ -183,6 +190,7 @@
532 printf("%s for architecture %s\n", as, arch_flags[i].name);
533 count++;
534 }
535 +#ifndef ASLIBEXECDIR
536 else{
537 as_local = makestr(LOCALLIB, arch_flags[i].name, AS, NULL);
538 if(access(as_local, F_OK) == 0){
539 @@ -193,6 +201,7 @@
540 count++;
541 }
542 }
543 +#endif
544 }
545 if(count == 0)
546 printf("%s: no assemblers installed\n", progname);
547
548
549
550 1.1 sys-devel/binutils-apple/files/binutils-apple-3.1.1-nmedit.patch
551
552 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/binutils-apple/files/binutils-apple-3.1.1-nmedit.patch?rev=1.1&view=markup
553 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/binutils-apple/files/binutils-apple-3.1.1-nmedit.patch?rev=1.1&content-type=text/plain
554
555 Index: binutils-apple-3.1.1-nmedit.patch
556 ===================================================================
557 don't create a symlink to nmedit from the dir nmedit is in
558
559 --- cctools-698/misc/Makefile
560 +++ cctools-698/misc/Makefile
561 @@ -427,8 +427,10 @@
562 install -c -s -m 555 $(SYMROOT)/redo_prebinding.NEW \
563 $(DSTROOT)$(USRBINDIR)/redo_prebinding
564 install -c -s -m 555 $(SYMROOT)/nmedit.NEW $(DSTROOT)$(USRBINDIR)/nmedit
565 +ifneq "$(USRBINDIR)" "$(LOCBINDIR)"
566 (cd $(DSTROOT)$(LOCBINDIR); rm -f nmedit; \
567 ln -s $(USRBINDIR)/nmedit nmedit)
568 +endif
569 install -c -s -m 555 $(SYMROOT)/install_name_tool.NEW \
570 $(DSTROOT)$(USRBINDIR)/install_name_tool
571 install -c -s -m 555 $(SYMROOT)/codesign_allocate.NEW \
Report Message
Find on MARC Find on Google Groups