Sat Nov 9 05:28:35 2013 UTC ()
Fix build on NetBSD/arm, at least on NetBSD/evbearmv6hf-el 6.99.25


(ryoon)
diff -r1.29 -r1.30 pkgsrc/multimedia/libvpx/Makefile
diff -r1.19 -r1.20 pkgsrc/multimedia/libvpx/distinfo
diff -r1.6 -r1.7 pkgsrc/multimedia/libvpx/patches/patch-aa
diff -r1.9 -r1.10 pkgsrc/multimedia/libvpx/patches/patch-ad
cvs diff -r1.29 -r1.30 pkgsrc/multimedia/libvpx/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/libvpx/Makefile 2013/11/07 14:26:38 1.29
+++ pkgsrc/multimedia/libvpx/Makefile 2013/11/09 05:28:35 1.30
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.29 2013/11/07 14:26:38 ryoon Exp $ 1# $NetBSD: Makefile,v 1.30 2013/11/09 05:28:35 ryoon Exp $
2 2
3DISTNAME= libvpx-v1.2.0 3DISTNAME= libvpx-v1.2.0
4PKGNAME= ${DISTNAME:S/-v/-/} 4PKGNAME= ${DISTNAME:S/-v/-/}
5CATEGORIES= multimedia 5CATEGORIES= multimedia
6MASTER_SITES= http://webm.googlecode.com/files/ 6MASTER_SITES= http://webm.googlecode.com/files/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= ryoon@NetBSD.org 9MAINTAINER= ryoon@NetBSD.org
10HOMEPAGE= http://code.google.com/p/webm/ 10HOMEPAGE= http://code.google.com/p/webm/
11COMMENT= On2 VP8 library from Google 11COMMENT= On2 VP8 library from Google
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
@@ -26,26 +26,28 @@ CONFIGURE_ARGS+= --disable-unit-tests @@ -26,26 +26,28 @@ CONFIGURE_ARGS+= --disable-unit-tests
26 26
27.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 27.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
28BUILD_DEPENDS+= yasm-[0-9]*:../../devel/yasm 28BUILD_DEPENDS+= yasm-[0-9]*:../../devel/yasm
29.endif 29.endif
30 30
31REPLACE_BASH= configure \ 31REPLACE_BASH= configure \
32 build/make/configure.sh \ 32 build/make/configure.sh \
33 build/make/version.sh \ 33 build/make/version.sh \
34 build/make/gen_asm_deps.sh \ 34 build/make/gen_asm_deps.sh \
35 build/make/rtcd.sh \ 35 build/make/rtcd.sh \
36 examples/gen_example_text.sh \ 36 examples/gen_example_text.sh \
37 examples/gen_example_code.sh 37 examples/gen_example_code.sh
38 38
 39REPLACE_PERL= build/make/ads2gas.pl
 40
39.if ${OPSYS} == "Darwin" 41.if ${OPSYS} == "Darwin"
40BUILDLINK_TRANSFORM+= rm:-Wl,-Bsymbolic 42BUILDLINK_TRANSFORM+= rm:-Wl,-Bsymbolic
41. if ${MACHINE_ARCH} == "i386" 43. if ${MACHINE_ARCH} == "i386"
42. if !empty(OS_VERSION:M12.*) || !empty(OS_VERSION:M13.*) 44. if !empty(OS_VERSION:M12.*) || !empty(OS_VERSION:M13.*)
43CONFIGURE_ARGS+= --target=x86-darwin12-gcc 45CONFIGURE_ARGS+= --target=x86-darwin12-gcc
44. elif !empty(OS_VERSION:M11.*) 46. elif !empty(OS_VERSION:M11.*)
45CONFIGURE_ARGS+= --target=x86-darwin11-gcc 47CONFIGURE_ARGS+= --target=x86-darwin11-gcc
46. elif !empty(OS_VERSION:M10.*) 48. elif !empty(OS_VERSION:M10.*)
47CONFIGURE_ARGS+= --target=x86-darwin10-gcc 49CONFIGURE_ARGS+= --target=x86-darwin10-gcc
48. elif !empty(OS_VERSION:M9.*) 50. elif !empty(OS_VERSION:M9.*)
49CONFIGURE_ARGS+= --target=x86-darwin9-gcc 51CONFIGURE_ARGS+= --target=x86-darwin9-gcc
50. else 52. else
51CONFIGURE_ARGS+= --target=x86-darwin8-gcc 53CONFIGURE_ARGS+= --target=x86-darwin8-gcc
@@ -62,20 +64,24 @@ CONFIGURE_ARGS+= --target=x86_64-darwin9 @@ -62,20 +64,24 @@ CONFIGURE_ARGS+= --target=x86_64-darwin9
62. endif 64. endif
63. endif 65. endif
64.endif 66.endif
65 67
66.include "../../mk/compiler.mk" 68.include "../../mk/compiler.mk"
67.if !empty(PKGSRC_COMPILER:Mclang) 69.if !empty(PKGSRC_COMPILER:Mclang)
68CXXFLAGS+= -std=c++11 70CXXFLAGS+= -std=c++11
69.endif 71.endif
70 72
71.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "mipsel" 73.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "mipsel"
72CONFIGURE_ARGS+= --target=mips32-linux-gcc 74CONFIGURE_ARGS+= --target=mips32-linux-gcc
73.endif 75.endif
74 76
 77.if !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*)
 78CONFIGURE_ARGS+= --disable-runtime-cpu-detect
 79.endif
 80
75BUILD_TARGET= # none 81BUILD_TARGET= # none
76 82
77post-extract: 83post-extract:
78 ${CP} ${FILESDIR}/strip_fPIC.sh ${WRKSRC} 84 ${CP} ${FILESDIR}/strip_fPIC.sh ${WRKSRC}
79 85
80.include "../../mk/pthread.buildlink3.mk" 86.include "../../mk/pthread.buildlink3.mk"
81.include "../../mk/bsd.pkg.mk" 87.include "../../mk/bsd.pkg.mk"
cvs diff -r1.19 -r1.20 pkgsrc/multimedia/libvpx/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/libvpx/distinfo 2013/09/13 15:00:43 1.19
+++ pkgsrc/multimedia/libvpx/distinfo 2013/11/09 05:28:35 1.20
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: distinfo,v 1.19 2013/09/13 15:00:43 joerg Exp $ 1$NetBSD: distinfo,v 1.20 2013/11/09 05:28:35 ryoon Exp $
2 2
3SHA1 (libvpx-v1.2.0.tar.bz2) = 33fb2df4ee5b06637dc492dafe49425ead117a24 3SHA1 (libvpx-v1.2.0.tar.bz2) = 33fb2df4ee5b06637dc492dafe49425ead117a24
4RMD160 (libvpx-v1.2.0.tar.bz2) = ed43d99dd4a0166baf9caca7a50841ced695eb08 4RMD160 (libvpx-v1.2.0.tar.bz2) = ed43d99dd4a0166baf9caca7a50841ced695eb08
5Size (libvpx-v1.2.0.tar.bz2) = 1715462 bytes 5Size (libvpx-v1.2.0.tar.bz2) = 1715462 bytes
6SHA1 (patch-aa) = 5b18ef2471039e2b3f9ba7818ed9372d03662cdd 6SHA1 (patch-aa) = efd541c9323b8d36272b57bffb1f95251a0a89f5
7SHA1 (patch-ab) = 468131a66c39d9b42080e62f6afa7cfd3657609b 7SHA1 (patch-ab) = 468131a66c39d9b42080e62f6afa7cfd3657609b
8SHA1 (patch-ac) = e177ad5416b50b75fe026377d8033032e0ca63c3 8SHA1 (patch-ac) = e177ad5416b50b75fe026377d8033032e0ca63c3
9SHA1 (patch-ad) = 274dc555219811c72b1f4a3298a0e9b1b300d169 9SHA1 (patch-ad) = 43215b6af634dc04a84e0eae89c10c83e7aff25c
10SHA1 (patch-af) = 3eb0c222433a62d044e712f572000d97b1d635a3 10SHA1 (patch-af) = 3eb0c222433a62d044e712f572000d97b1d635a3
11SHA1 (patch-build_make_gen_asm_deps.sh) = db7f9abcf1bdd1ccb8e48c695de3f2276bb5f891 11SHA1 (patch-build_make_gen_asm_deps.sh) = db7f9abcf1bdd1ccb8e48c695de3f2276bb5f891
12SHA1 (patch-configure) = 72587d9f326040dd50b55e8ea086a05713533cbe 12SHA1 (patch-configure) = 72587d9f326040dd50b55e8ea086a05713533cbe
13SHA1 (patch-test_i420__video__source.h) = e67478f08339c4b7f4cccf96e4798d1972941a7c 13SHA1 (patch-test_i420__video__source.h) = e67478f08339c4b7f4cccf96e4798d1972941a7c
14SHA1 (patch-test_sad__test.cc) = 0b3037ceec806e2b4b42c6be1c6db19a8f2f34a4 14SHA1 (patch-test_sad__test.cc) = 0b3037ceec806e2b4b42c6be1c6db19a8f2f34a4
15SHA1 (patch-test_sixtap__predict__test.cc) = d803819f3e5d282c3159e4410e7fbbd68cd403be 15SHA1 (patch-test_sixtap__predict__test.cc) = d803819f3e5d282c3159e4410e7fbbd68cd403be
cvs diff -r1.6 -r1.7 pkgsrc/multimedia/libvpx/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/multimedia/libvpx/patches/Attic/patch-aa 2013/09/11 15:50:32 1.6
+++ pkgsrc/multimedia/libvpx/patches/Attic/patch-aa 2013/11/09 05:28:35 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.6 2013/09/11 15:50:32 ryoon Exp $ 1$NetBSD: patch-aa,v 1.7 2013/11/09 05:28:35 ryoon Exp $
2 2
3--- build/make/Makefile.orig 2013-09-04 18:49:22.000000000 +0000 3--- build/make/Makefile.orig 2013-09-04 18:49:22.000000000 +0000
4+++ build/make/Makefile 4+++ build/make/Makefile
5@@ -110,7 +110,7 @@ $(BUILD_PFX)%.c.d: %.c 5@@ -110,7 +110,7 @@ $(BUILD_PFX)%.c.d: %.c
6  6
7 $(BUILD_PFX)%.c.o: %.c 7 $(BUILD_PFX)%.c.o: %.c
8 $(if $(quiet),@echo " [CC] $@") 8 $(if $(quiet),@echo " [CC] $@")
9- $(qexec)$(CC) $(INTERNAL_CFLAGS) $(CFLAGS) -c -o $@ $< 9- $(qexec)$(CC) $(INTERNAL_CFLAGS) $(CFLAGS) -c -o $@ $<
10+ $(qexec)${LIBTOOL} --mode=compile $(CC) $(INTERNAL_CFLAGS) $(CFLAGS) -c -o $@ $< 10+ $(qexec)${LIBTOOL} --mode=compile $(CC) $(INTERNAL_CFLAGS) $(CFLAGS) -c -o $@ $<
11  11
12 $(BUILD_PFX)%.cc.d: %.cc 12 $(BUILD_PFX)%.cc.d: %.cc
13 $(if $(quiet),@echo " [DEP] $@") 13 $(if $(quiet),@echo " [DEP] $@")
14@@ -119,7 +119,7 @@ $(BUILD_PFX)%.cc.d: %.cc 14@@ -119,7 +119,7 @@ $(BUILD_PFX)%.cc.d: %.cc
@@ -20,91 +20,101 @@ $NetBSD: patch-aa,v 1.6 2013/09/11 15:50 @@ -20,91 +20,101 @@ $NetBSD: patch-aa,v 1.6 2013/09/11 15:50
20  20
21 $(BUILD_PFX)%.asm.d: %.asm 21 $(BUILD_PFX)%.asm.d: %.asm
22 $(if $(quiet),@echo " [DEP] $@") 22 $(if $(quiet),@echo " [DEP] $@")
23@@ -129,7 +129,8 @@ $(BUILD_PFX)%.asm.d: %.asm 23@@ -129,7 +129,8 @@ $(BUILD_PFX)%.asm.d: %.asm
24  24
25 $(BUILD_PFX)%.asm.o: %.asm 25 $(BUILD_PFX)%.asm.o: %.asm
26 $(if $(quiet),@echo " [AS] $@") 26 $(if $(quiet),@echo " [AS] $@")
27- $(qexec)$(AS) $(ASFLAGS) -o $@ $< 27- $(qexec)$(AS) $(ASFLAGS) -o $@ $<
28+ $(qexec)${LIBTOOL} --mode=compile --tag=CC sh strip_fPIC.sh \ 28+ $(qexec)${LIBTOOL} --mode=compile --tag=CC sh strip_fPIC.sh \
29+ $(AS) $(ASFLAGS) -o $@ $< 29+ $(AS) $(ASFLAGS) -o $@ $<
30  30
31 $(BUILD_PFX)%.s.d: %.s 31 $(BUILD_PFX)%.s.d: %.s
32 $(if $(quiet),@echo " [DEP] $@") 32 $(if $(quiet),@echo " [DEP] $@")
33@@ -211,13 +212,15 @@ define linker_template 33@@ -139,7 +140,8 @@ $(BUILD_PFX)%.s.d: %.s
 34
 35 $(BUILD_PFX)%.s.o: %.s
 36 $(if $(quiet),@echo " [AS] $@")
 37- $(qexec)$(AS) $(ASFLAGS) -o $@ $<
 38+ $(qexec)${LIBTOOL} --mode=compile --tag=CC sh strip_fPIC.sh \
 39+ $(AS) $(ASFLAGS) -o $@ $<
 40
 41 .PRECIOUS: %.c.S
 42 %.c.S: CFLAGS += -DINLINE_ASM
 43@@ -211,13 +213,15 @@ define linker_template
34 $(1): $(filter-out -%,$(2)) 44 $(1): $(filter-out -%,$(2))
35 $(1): 45 $(1):
36 $(if $(quiet),@echo " [LD] $$@") 46 $(if $(quiet),@echo " [LD] $$@")
37- $(qexec)$$(LD) $$(strip $$(INTERNAL_LDFLAGS) $$(LDFLAGS) -o $$@ $(2) $(3) $$(extralibs)) 47- $(qexec)$$(LD) $$(strip $$(INTERNAL_LDFLAGS) $$(LDFLAGS) -o $$@ $(2) $(3) $$(extralibs))
38+ $(qexec)${LIBTOOL} --mode=link $(CC) $(LDFLAGS) -o $$@ \ 48+ $(qexec)${LIBTOOL} --mode=link $(CC) $(LDFLAGS) -o $$@ \
39+ $$(filter-out -lvpx,$(2)) libvpx.la $$(extralibs) 49+ $$(filter-out -lvpx,$(2)) libvpx.la $$(extralibs)
40 endef 50 endef
41 define linkerxx_template 51 define linkerxx_template
42 $(1): $(filter-out -%,$(2)) 52 $(1): $(filter-out -%,$(2))
43 $(1): 53 $(1):
44 $(if $(quiet),@echo " [LD] $$@") 54 $(if $(quiet),@echo " [LD] $$@")
45- $(qexec)$$(CXX) $$(strip $$(INTERNAL_LDFLAGS) $$(LDFLAGS) -o $$@ $(2) $(3) $$(extralibs)) 55- $(qexec)$$(CXX) $$(strip $$(INTERNAL_LDFLAGS) $$(LDFLAGS) -o $$@ $(2) $(3) $$(extralibs))
46+ $(qexec)${LIBTOOL} --mode=link ${CXX} $(LDFLAGS) -o $$@ \ 56+ $(qexec)${LIBTOOL} --mode=link ${CXX} $(LDFLAGS) -o $$@ \
47+ $$(filter-out -lvpx,$(2)) libvpx.la $$(extralibs) 57+ $$(filter-out -lvpx,$(2)) libvpx.la $$(extralibs)
48 endef 58 endef
49 # make-3.80 has a bug with expanding large input strings to the eval function, 59 # make-3.80 has a bug with expanding large input strings to the eval function,
50 # which was triggered in some cases by the following component of 60 # which was triggered in some cases by the following component of
51@@ -230,8 +233,12 @@ endef 61@@ -230,8 +234,12 @@ endef
52 define install_map_template 62 define install_map_template
53 $(DIST_DIR)/$(1): $(2) 63 $(DIST_DIR)/$(1): $(2)
54 $(if $(quiet),@echo " [INSTALL] $$@") 64 $(if $(quiet),@echo " [INSTALL] $$@")
55- $(qexec)mkdir -p $$(dir $$@) 65- $(qexec)mkdir -p $$(dir $$@)
56- $(qexec)cp -p $$< $$@ 66- $(qexec)cp -p $$< $$@
57+ $(qexec)${BSD_INSTALL_DATA} -d -m 755 $$(dir $$@) 67+ $(qexec)${BSD_INSTALL_DATA} -d -m 755 $$(dir $$@)
58+ $$(if $$(filter %.a,$$<), \ 68+ $$(if $$(filter %.a,$$<), \
59+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} -c $$(patsubst %.a,%.la,$$<) $$(dir $$@), \ 69+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} -c $$(patsubst %.a,%.la,$$<) $$(dir $$@), \
60+ $$(if $$(filter %.h %.pc,$$<), \ 70+ $$(if $$(filter %.h %.pc,$$<), \
61+ ${BSD_INSTALL_DATA} -c -m 644 $$< $$(dir $$@), \ 71+ ${BSD_INSTALL_DATA} -c -m 644 $$< $$(dir $$@), \
62+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} -c -s $$< $$(dir $$@))) 72+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} -c -s $$< $$(dir $$@)))
63 endef 73 endef
64  74
65 define archive_template 75 define archive_template
66@@ -240,7 +247,9 @@ define archive_template 76@@ -240,7 +248,9 @@ define archive_template
67 # for creating them. 77 # for creating them.
68 $(1): 78 $(1):
69 $(if $(quiet),@echo " [AR] $$@") 79 $(if $(quiet),@echo " [AR] $$@")
70- $(qexec)$$(AR) $$(ARFLAGS) $$@ $$? 80- $(qexec)$$(AR) $$(ARFLAGS) $$@ $$?
71+ $(qexec)${LIBTOOL} --mode=link $(CC) $(LDFLAGS) -Wl,-Bsymbolic -o $$(patsubst %.a,%.la,$$@) \ 81+ $(qexec)${LIBTOOL} --mode=link $(CC) $(LDFLAGS) -Wl,-Bsymbolic -o $$(patsubst %.a,%.la,$$@) \
72+ $$(patsubst %.o,%.lo,$$?) -rpath $(PREFIX)/lib $$(extralibs) \ 82+ $$(patsubst %.o,%.lo,$$?) -rpath $(PREFIX)/lib $$(extralibs) \
73+ -version-info $(VERSION_MAJOR):$(VERSION_MINOR):$(VERSION_PATCH) 83+ -version-info $(VERSION_MAJOR):$(VERSION_MINOR):$(VERSION_PATCH)
74 endef 84 endef
75  85
76 define so_template 86 define so_template
77@@ -317,20 +326,20 @@ clean:: 87@@ -317,20 +327,20 @@ clean::
78 rm -f .bins .install-bins $(BINS) 88 rm -f .bins .install-bins $(BINS)
79  89
80 LIBS=$(call enabled,LIBS) 90 LIBS=$(call enabled,LIBS)
81-.libs: $(LIBS) 91-.libs: $(LIBS)
82+dot.libs: $(LIBS) 92+dot.libs: $(LIBS)
83 @touch $@ 93 @touch $@
84-$(foreach lib,$(filter %_g.a,$(LIBS)),$(eval $(call archive_template,$(lib)))) 94-$(foreach lib,$(filter %_g.a,$(LIBS)),$(eval $(call archive_template,$(lib))))
85+$(foreach lib,$(filter %.a,$(LIBS)),$(eval $(call archive_template,$(lib)))) 95+$(foreach lib,$(filter %.a,$(LIBS)),$(eval $(call archive_template,$(lib))))
86 $(foreach lib,$(filter %so.$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH),$(LIBS)),$(eval $(call so_template,$(lib)))) 96 $(foreach lib,$(filter %so.$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH),$(LIBS)),$(eval $(call so_template,$(lib))))
87  97
88 INSTALL-LIBS=$(call cond_enabled,CONFIG_INSTALL_LIBS,INSTALL-LIBS) 98 INSTALL-LIBS=$(call cond_enabled,CONFIG_INSTALL_LIBS,INSTALL-LIBS)
89 ifeq ($(MAKECMDGOALS),dist) 99 ifeq ($(MAKECMDGOALS),dist)
90 INSTALL-LIBS+=$(call cond_enabled,CONFIG_INSTALL_LIBS,DIST-LIBS) 100 INSTALL-LIBS+=$(call cond_enabled,CONFIG_INSTALL_LIBS,DIST-LIBS)
91 endif 101 endif
92-.install-libs: .libs $(addprefix $(DIST_DIR)/,$(INSTALL-LIBS)) 102-.install-libs: .libs $(addprefix $(DIST_DIR)/,$(INSTALL-LIBS))
93+.install-libs: dot.libs $(addprefix $(DIST_DIR)/,$(INSTALL-LIBS)) 103+.install-libs: dot.libs $(addprefix $(DIST_DIR)/,$(INSTALL-LIBS))
94 @touch $@ 104 @touch $@
95  105
96 clean:: 106 clean::
97- rm -f .libs .install-libs $(LIBS) 107- rm -f .libs .install-libs $(LIBS)
98+ rm -f dot.libs .install-libs $(LIBS) 108+ rm -f dot.libs .install-libs $(LIBS)
99  109
100 ifeq ($(CONFIG_EXTERNAL_BUILD),yes) 110 ifeq ($(CONFIG_EXTERNAL_BUILD),yes)
101 PROJECTS=$(call enabled,PROJECTS) 111 PROJECTS=$(call enabled,PROJECTS)
102@@ -380,7 +389,7 @@ ifeq ($(CONFIG_EXTERNAL_BUILD),yes) 112@@ -380,7 +390,7 @@ ifeq ($(CONFIG_EXTERNAL_BUILD),yes)
103 BUILD_TARGETS += .projects 113 BUILD_TARGETS += .projects
104 INSTALL_TARGETS += .install-projects 114 INSTALL_TARGETS += .install-projects
105 endif 115 endif
106-BUILD_TARGETS += .docs .libs .bins 116-BUILD_TARGETS += .docs .libs .bins
107+BUILD_TARGETS += .docs dot.libs .bins 117+BUILD_TARGETS += .docs dot.libs .bins
108 INSTALL_TARGETS += .install-docs .install-srcs .install-libs .install-bins 118 INSTALL_TARGETS += .install-docs .install-srcs .install-libs .install-bins
109 all: $(BUILD_TARGETS) 119 all: $(BUILD_TARGETS)
110 install:: $(INSTALL_TARGETS) 120 install:: $(INSTALL_TARGETS)
cvs diff -r1.9 -r1.10 pkgsrc/multimedia/libvpx/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/multimedia/libvpx/patches/Attic/patch-ad 2013/09/11 15:50:32 1.9
+++ pkgsrc/multimedia/libvpx/patches/Attic/patch-ad 2013/11/09 05:28:35 1.10
@@ -1,29 +1,38 @@ @@ -1,29 +1,38 @@
1$NetBSD: patch-ad,v 1.9 2013/09/11 15:50:32 ryoon Exp $ 1$NetBSD: patch-ad,v 1.10 2013/11/09 05:28:35 ryoon Exp $
2 2
3*BSD and qnx are identified as linux. 3*BSD and qnx are identified as linux.
4Add another SDK path on Mac OS X. 4Add another SDK path on Mac OS X.
5 5
6--- build/make/configure.sh.orig 2013-09-04 18:49:22.000000000 +0000 6--- build/make/configure.sh.orig 2013-09-04 18:49:22.000000000 +0000
7+++ build/make/configure.sh 7+++ build/make/configure.sh
8@@ -645,7 +645,7 @@ process_common_toolchain() { 8@@ -645,7 +645,7 @@ process_common_toolchain() {
9 [ -z "$tgt_isa" ] && tgt_isa=x86 9 [ -z "$tgt_isa" ] && tgt_isa=x86
10 tgt_os=win32 10 tgt_os=win32
11 ;; 11 ;;
12- *linux*|*bsd*) 12- *linux*|*bsd*)
13+ *linux*|*bsd*|*qnx6*) 13+ *linux*|*bsd*|*qnx6*)
14 tgt_os=linux 14 tgt_os=linux
15 ;; 15 ;;
16 *solaris2.10) 16 *solaris2.10)
 17@@ -775,7 +775,7 @@ process_common_toolchain() {
 18
 19 case ${tgt_cc} in
 20 gcc)
 21- CROSS=${CROSS:-arm-none-linux-gnueabi-}
 22+# CROSS=${CROSS:-arm-none-linux-gnueabi-}
 23 link_with_cc=gcc
 24 setup_gnu_toolchain
 25 arch_int=${tgt_isa##armv}
17@@ -960,8 +960,6 @@ process_common_toolchain() { 26@@ -960,8 +960,6 @@ process_common_toolchain() {
18 check_add_cflags -mips32r2 -mdspr2 27 check_add_cflags -mips32r2 -mdspr2
19 disable fast_unaligned 28 disable fast_unaligned
20 fi 29 fi
21- check_add_cflags -march=${tgt_isa} 30- check_add_cflags -march=${tgt_isa}
22- check_add_asflags -march=${tgt_isa} 31- check_add_asflags -march=${tgt_isa}
23 check_add_asflags -KPIC 32 check_add_asflags -KPIC
24 ;; 33 ;;
25 ppc*) 34 ppc*)
26@@ -1160,10 +1158,29 @@ EOF 35@@ -1160,10 +1158,29 @@ EOF
27 case ${toolchain} in 36 case ${toolchain} in
28 *-win*-vs*);; 37 *-win*-vs*);;
29 *-android-gcc);; 38 *-android-gcc);;