ports/sdl/nacl.patch - Issue 907563002: Simplify cli_main

Side by Side Diff: ports/sdl/nacl.patch

Issue 907563002: Simplify cli_main (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master

Patch Set: Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

OLD	NEW
(Empty)
	1 diff --git a/build-scripts/config.sub b/build-scripts/config.sub

	2 --- a/build-scripts/config.sub

	3 +++ b/build-scripts/config.sub

	4 @@ -1,10 +1,10 @@

	5 #! /bin/sh

	6 # Configuration validation subroutine script.

	7 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,

	8 -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009

	9 -# Free Software Foundation, Inc.

	10 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,

	11 +# 2011, 2012 Free Software Foundation, Inc.

	12

	13 -timestamp='2009-10-07'

	14 +timestamp='2012-02-10'

	15

	16 # This file is (in principle) common to ALL GNU software.

	17 # The presence of a machine in this file suggests that SOME GNU software

	18 @@ -21,9 +21,7 @@ timestamp='2009-10-07'

	19 # GNU General Public License for more details.

	20 #

	21 # You should have received a copy of the GNU General Public License

	22 -# along with this program; if not, write to the Free Software

	23 -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA

	24 -# 02110-1301, USA.

	25 +# along with this program; if not, see <http://www.gnu.org/licenses/>.

	26 #

	27 # As a special exception to the GNU General Public License, if you

	28 # distribute this file as part of a program that contains a

	29 @@ -75,8 +73,9 @@ Report bugs and patches to <config-patches@gnu.org>."

	30 version="\

	31 GNU config.sub ($timestamp)

	32

	33 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,

	34 -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

	35 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,

	36 +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012

	37 +Free Software Foundation, Inc.

	38

	39 This is free software; see the source for copying conditions. There is NO

	40 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

	41 @@ -123,13 +122,18 @@ esac

	42 # Here we must recognize all the valid KERNEL-OS combinations.

	43 maybe_os=`echo $1 \| sed 's/^$.$-$[^-]-[^-]*$$/\2/'`

	44 case $maybe_os in

	45 - nto-qnx* \| linux-gnu* \| linux-dietlibc \| linux-newlib* \| linux-uclibc* \| \

	46 - uclinux-uclibc* \| uclinux-gnu* \| kfreebsd-gnu \| knetbsd-gnu \| netbsd-gnu \| \

	47 + nto-qnx* \| linux-gnu* \| linux-android* \| linux-dietlibc \| linux-newlib* \| \

	48 + linux-uclibc* \| uclinux-uclibc* \| uclinux-gnu* \| kfreebsd-gnu \| \

	49 + knetbsd-gnu \| netbsd-gnu \| \

	50 kopensolaris-gnu \| \

	51 storm-chaos* \| os2-emx* \| rtmk-nova*)

	52 os=-$maybe_os

	53 basic_machine=`echo $1 \| sed 's/^$.$-$[^-]-[^-]*$$/\1/'`

	54 ;;

	55 + android-linux)

	56 + os=-linux-android

	57 + basic_machine=`echo $1 \| sed 's/^$.$-$[^-]-[^-]*$$/\1/'`-unknown

	58 + ;;

	59 *)

	60 basic_machine=`echo $1 \| sed 's/-[^-]*$//'`

	61 if [ $basic_machine != $1 ]

	62 @@ -156,8 +160,8 @@ case $os in

	63 os=

	64 basic_machine=$1

	65 ;;

	66 - -bluegene*)

	67 - os=-cnk

	68 + -bluegene*)

	69 + os=-cnk

	70 ;;

	71 -sim \| -cisco \| -oki \| -wec \| -winbond)

	72 os=

	73 @@ -173,10 +177,10 @@ case $os in

	74 os=-chorusos

	75 basic_machine=$1

	76 ;;

	77 - -chorusrdb)

	78 - os=-chorusrdb

	79 + -chorusrdb)

	80 + os=-chorusrdb

	81 basic_machine=$1

	82 - ;;

	83 + ;;

	84 -hiux*)

	85 os=-hiuxwe2

	86 ;;

	87 @@ -245,17 +249,22 @@ case $basic_machine in

	88 # Some are omitted here because they have special meanings below.

	89 1750a \| 580 \

	90 \| a29k \

	91 + \| aarch64 \| aarch64_be \

	92 \| alpha \| alphaev[4-8] \| alphaev56 \| alphaev6[78] \| alphapca5[67] \

	93 \| alpha64 \| alpha64ev[4-8] \| alpha64ev56 \| alpha64ev6[78] \| alpha64pca5[ 67] \

	94 \| am33_2.0 \

	95 \| arc \| arm \| arm[bl]e \| arme[lb] \| armv[2345] \| armv[345][lb] \| avr \| a vr32 \

	96 + \| be32 \| be64 \

	97 \| bfin \

	98 \| c4x \| clipper \

	99 \| d10v \| d30v \| dlx \| dsp16xx \

	100 + \| epiphany \

	101 \| fido \| fr30 \| frv \

	102 \| h8300 \| h8500 \| hppa \| hppa1.[01] \| hppa2.0 \| hppa2.0[nw] \| hppa64 \

	103 + \| hexagon \

	104 \| i370 \| i860 \| i960 \| ia64 \

	105 \| ip2k \| iq2000 \

	106 + \| le32 \| le64 \

	107 \| lm32 \

	108 \| m32c \| m32r \| m32rle \| m68000 \| m68k \| m88k \

	109 \| maxq \| mb \| microblaze \| mcore \| mep \| metag \

	110 @@ -281,28 +290,39 @@ case $basic_machine in

	111 \| moxie \

	112 \| mt \

	113 \| msp430 \

	114 + \| nds32 \| nds32le \| nds32be \

	115 \| nios \| nios2 \

	116 \| ns16k \| ns32k \

	117 + \| open8 \

	118 \| or32 \

	119 \| pdp10 \| pdp11 \| pj \| pjl \

	120 - \| powerpc \| powerpc64 \| powerpc64le \| powerpcle \| ppcbe \

	121 + \| powerpc \| powerpc64 \| powerpc64le \| powerpcle \

	122 \| pyramid \

	123 - \| rx \

	124 + \| rl78 \| rx \

	125 \| score \

	126 \| sh \| sh[1234] \| sh[24]a \| sh[24]aeb \| sh[23]e \| sh[34]eb \| sheb \| shbe \| shle \| sh[1234]le \| sh3ele \

	127 \| sh64 \| sh64le \

	128 \| sparc \| sparc64 \| sparc64b \| sparc64v \| sparc86x \| sparclet \| sparclit e \

	129 \| sparcv8 \| sparcv9 \| sparcv9b \| sparcv9v \

	130 - \| spu \| strongarm \

	131 - \| tahoe \| thumb \| tic4x \| tic80 \| tron \

	132 - \| v850 \| v850e \

	133 + \| spu \

	134 + \| tahoe \| tic4x \| tic54x \| tic55x \| tic6x \| tic80 \| tron \

	135 + \| ubicom32 \

	136 + \| v850 \| v850e \| v850e1 \| v850e2 \| v850es \| v850e2v3 \

	137 \| we32k \

	138 - \| x86 \| xc16x \| xscale \| xscalee[bl] \| xstormy16 \| xtensa \

	139 + \| x86 \| xc16x \| xstormy16 \| xtensa \

	140 \| z8k \| z80)

	141 basic_machine=$basic_machine-unknown

	142 ;;

	143 - m6811 \| m68hc11 \| m6812 \| m68hc12 \| picochip)

	144 - # Motorola 68HC11/12.

	145 + c54x)

	146 + basic_machine=tic54x-unknown

	147 + ;;

	148 + c55x)

	149 + basic_machine=tic55x-unknown

	150 + ;;

	151 + c6x)

	152 + basic_machine=tic6x-unknown

	153 + ;;

	154 + m6811 \| m68hc11 \| m6812 \| m68hc12 \| m68hcs12x \| picochip)

	155 basic_machine=$basic_machine-unknown

	156 os=-none

	157 ;;

	158 @@ -312,6 +332,21 @@ case $basic_machine in

	159 basic_machine=mt-unknown

	160 ;;

	161

	162 + strongarm \| thumb \| xscale)

	163 + basic_machine=arm-unknown

	164 + ;;

	165 + xgate)

	166 + basic_machine=$basic_machine-unknown

	167 + os=-none

	168 + ;;

	169 + xscaleeb)

	170 + basic_machine=armeb-unknown

	171 + ;;

	172 +

	173 + xscaleel)

	174 + basic_machine=armel-unknown

	175 + ;;

	176 +

	177 # We use `pc' rather than `unknown'

	178 # because (1) that's what they normally are, and

	179 # (2) the word "unknown" tends to confuse beginning users.

	180 @@ -326,21 +361,25 @@ case $basic_machine in

	181 # Recognize the basic CPU types with company name.

	182 580-* \

	183 \| a29k-* \

	184 + \| aarch64-* \| aarch64_be-* \

	185 \| alpha-* \| alphaev[4-8]-* \| alphaev56-* \| alphaev6[78]-* \

	186 \| alpha64-* \| alpha64ev[4-8]-* \| alpha64ev56-* \| alpha64ev6[78]-* \

	187 \| alphapca5[67]-* \| alpha64pca5[67]-* \| arc-* \

	188 \| arm-* \| armbe-* \| armle-* \| armeb-* \| armv- \

	189 \| avr-* \| avr32-* \

	190 + \| be32-* \| be64-* \

	191 \| bfin-* \| bs2000-* \

	192 - \| c[123]* \| c30-* \| [cjt]90-* \| c4x-* \| c54x-* \| c55x-* \| c6x-* \

	193 + \| c[123]* \| c30-* \| [cjt]90-* \| c4x-* \

	194 \| clipper-* \| craynv-* \| cydra-* \

	195 \| d10v-* \| d30v-* \| dlx-* \

	196 \| elxsi-* \

	197 \| f30[01]-* \| f700-* \| fido-* \| fr30-* \| frv-* \| fx80-* \

	198 \| h8300-* \| h8500-* \

	199 \| hppa-* \| hppa1.[01]-* \| hppa2.0-* \| hppa2.0[nw]-* \| hppa64-* \

	200 + \| hexagon-* \

	201 \| i86- \| i860-* \| i960-* \| ia64-* \

	202 \| ip2k-* \| iq2000-* \

	203 + \| le32-* \| le64-* \

	204 \| lm32-* \

	205 \| m32c-* \| m32r-* \| m32rle-* \

	206 \| m68000-* \| m680[012346]0-* \| m68360-* \| m683?2-* \| m68k-* \

	207 @@ -366,24 +405,29 @@ case $basic_machine in

	208 \| mmix-* \

	209 \| mt-* \

	210 \| msp430-* \

	211 + \| nds32-* \| nds32le-* \| nds32be-* \

	212 \| nios-* \| nios2-* \

	213 \| none-* \| np1-* \| ns16k-* \| ns32k-* \

	214 + \| open8-* \

	215 \| orion-* \

	216 \| pdp10-* \| pdp11-* \| pj-* \| pjl-* \| pn-* \| power-* \

	217 - \| powerpc-* \| powerpc64-* \| powerpc64le-* \| powerpcle-* \| ppcbe-* \

	218 + \| powerpc-* \| powerpc64-* \| powerpc64le-* \| powerpcle-* \

	219 \| pyramid-* \

	220 - \| romp-* \| rs6000-* \| rx-* \

	221 + \| rl78-* \| romp-* \| rs6000-* \| rx-* \

	222 \| sh-* \| sh[1234]-* \| sh[24]a-* \| sh[24]aeb-* \| sh[23]e-* \| sh[34]eb-* \| sheb-* \| shbe-* \

	223 \| shle-* \| sh[1234]le-* \| sh3ele-* \| sh64-* \| sh64le-* \

	224 \| sparc-* \| sparc64-* \| sparc64b-* \| sparc64v-* \| sparc86x-* \| sparclet- * \

	225 \| sparclite-* \

	226 - \| sparcv8-* \| sparcv9-* \| sparcv9b-* \| sparcv9v-* \| strongarm-* \| sv1-* \| sx?-* \

	227 - \| tahoe-* \| thumb-* \

	228 - \| tic30-* \| tic4x-* \| tic54x-* \| tic55x-* \| tic6x-* \| tic80-* \| tile-* \

	229 + \| sparcv8-* \| sparcv9-* \| sparcv9b-* \| sparcv9v-* \| sv1-* \| sx?-* \

	230 + \| tahoe-* \

	231 + \| tic30-* \| tic4x-* \| tic54x-* \| tic55x-* \| tic6x-* \| tic80-* \

	232 + \| tile- \

	233 \| tron-* \

	234 - \| v850-* \| v850e-* \| vax-* \

	235 + \| ubicom32-* \

	236 + \| v850-* \| v850e-* \| v850e1-* \| v850es-* \| v850e2-* \| v850e2v3-* \

	237 + \| vax-* \

	238 \| we32k-* \

	239 - \| x86-* \| x86_64-* \| xc16x-* \| xps100-* \| xscale-* \| xscalee[bl]-* \

	240 + \| x86-* \| x86_64-* \| xc16x-* \| xps100-* \

	241 \| xstormy16-* \| xtensa- \

	242 \| ymp-* \

	243 \| z8k-* \| z80-*)

	244 @@ -408,7 +452,7 @@ case $basic_machine in

	245 basic_machine=a29k-amd

	246 os=-udi

	247 ;;

	248 - abacus)

	249 + abacus)

	250 basic_machine=abacus-unknown

	251 ;;

	252 adobe68k)

	253 @@ -478,11 +522,20 @@ case $basic_machine in

	254 basic_machine=powerpc-ibm

	255 os=-cnk

	256 ;;

	257 + c54x-*)

	258 + basic_machine=tic54x-`echo $basic_machine \| sed 's/^[^-]*-//'`

	259 + ;;

	260 + c55x-*)

	261 + basic_machine=tic55x-`echo $basic_machine \| sed 's/^[^-]*-//'`

	262 + ;;

	263 + c6x-*)

	264 + basic_machine=tic6x-`echo $basic_machine \| sed 's/^[^-]*-//'`

	265 + ;;

	266 c90)

	267 basic_machine=c90-cray

	268 os=-unicos

	269 ;;

	270 - cegcc)

	271 + cegcc)

	272 basic_machine=arm-unknown

	273 os=-cegcc

	274 ;;

	275 @@ -514,7 +567,7 @@ case $basic_machine in

	276 basic_machine=craynv-cray

	277 os=-unicosmp

	278 ;;

	279 - cr16)

	280 + cr16 \| cr16-*)

	281 basic_machine=cr16-unknown

	282 os=-elf

	283 ;;

	284 @@ -672,7 +725,6 @@ case $basic_machine in

	285 i370-ibm* \| ibm*)

	286 basic_machine=i370-ibm

	287 ;;

	288 -# I'm not sure what "Sysv32" means. Should this be sysv3.2?

	289 i*86v32)

	290 basic_machine=`echo $1 \| sed -e 's/86.*/86-pc/'`

	291 os=-sysv32

	292 @@ -730,7 +782,7 @@ case $basic_machine in

	293 basic_machine=ns32k-utek

	294 os=-sysv

	295 ;;

	296 - microblaze)

	297 + microblaze)

	298 basic_machine=microblaze-xilinx

	299 ;;

	300 mingw32)

	301 @@ -769,10 +821,18 @@ case $basic_machine in

	302 ms1-*)

	303 basic_machine=`echo $basic_machine \| sed -e 's/ms1-/mt-/'`

	304 ;;

	305 + msys)

	306 + basic_machine=i386-pc

	307 + os=-msys

	308 + ;;

	309 mvs)

	310 basic_machine=i370-ibm

	311 os=-mvs

	312 ;;

	313 + nacl)

	314 + basic_machine=le32-unknown

	315 + os=-nacl

	316 + ;;

	317 ncr3000)

	318 basic_machine=i486-ncr

	319 os=-sysv4

	320 @@ -837,6 +897,12 @@ case $basic_machine in

	321 np1)

	322 basic_machine=np1-gould

	323 ;;

	324 + neo-tandem)

	325 + basic_machine=neo-tandem

	326 + ;;

	327 + nse-tandem)

	328 + basic_machine=nse-tandem

	329 + ;;

	330 nsr-tandem)

	331 basic_machine=nsr-tandem

	332 ;;

	333 @@ -919,9 +985,10 @@ case $basic_machine in

	334 ;;

	335 power) basic_machine=power-ibm

	336 ;;

	337 - ppc) basic_machine=powerpc-unknown

	338 + ppc \| ppcbe) basic_machine=powerpc-unknown

	339 ;;

	340 - ppc-) basic_machine=powerpc-`echo $basic_machine \| sed 's/^[^-]-//'`

	341 + ppc-* \| ppcbe-*)

	342 + basic_machine=powerpc-`echo $basic_machine \| sed 's/^[^-]*-//'`

	343 ;;

	344 ppcle \| powerpclittle \| ppc-le \| powerpc-little)

	345 basic_machine=powerpcle-unknown

	346 @@ -1015,6 +1082,9 @@ case $basic_machine in

	347 basic_machine=i860-stratus

	348 os=-sysv4

	349 ;;

	350 + strongarm-* \| thumb-*)

	351 + basic_machine=arm-`echo $basic_machine \| sed 's/^[^-]*-//'`

	352 + ;;

	353 sun2)

	354 basic_machine=m68000-sun

	355 ;;

	356 @@ -1071,20 +1141,8 @@ case $basic_machine in

	357 basic_machine=t90-cray

	358 os=-unicos

	359 ;;

	360 - tic54x \| c54x*)

	361 - basic_machine=tic54x-unknown

	362 - os=-coff

	363 - ;;

	364 - tic55x \| c55x*)

	365 - basic_machine=tic55x-unknown

	366 - os=-coff

	367 - ;;

	368 - tic6x \| c6x*)

	369 - basic_machine=tic6x-unknown

	370 - os=-coff

	371 - ;;

	372 tile*)

	373 - basic_machine=tile-unknown

	374 + basic_machine=$basic_machine-unknown

	375 os=-linux-gnu

	376 ;;

	377 tx39)

	378 @@ -1154,6 +1212,9 @@ case $basic_machine in

	379 xps \| xps100)

	380 basic_machine=xps100-honeywell

	381 ;;

	382 + xscale-* \| xscalee[bl]-*)

	383 + basic_machine=`echo $basic_machine \| sed 's/^xscale/arm/'`

	384 + ;;

	385 ymp)

	386 basic_machine=ymp-cray

	387 os=-unicos

	388 @@ -1251,9 +1312,12 @@ esac

	389 if [ x"$os" != x"" ]

	390 then

	391 case $os in

	392 - # First match some system type aliases

	393 - # that might get confused with valid system types.

	394 + # First match some system type aliases

	395 + # that might get confused with valid system types.

	396 # -solaris* is a basic system type, with this one exception.

	397 + -auroraux)

	398 + os=-auroraux

	399 + ;;

	400 -solaris1 \| -solaris1.*)

	401 os=`echo $os \| sed -e 's\|solaris1\|sunos4\|'`

	402 ;;

	403 @@ -1275,8 +1339,8 @@ case $os in

	404 # -sysv* is not here because it comes later, after sysvr4.

	405 -gnu* \| -bsd* \| -mach* \| -minix* \| -genix* \| -ultrix* \| -irix* \

	406 \| -vms \| -sco* \| -esix* \| -isc* \| -aix* \| -cnk* \| -sunos \| -suno s[34]*\

	407 - \| -hpux* \| -unos* \| -osf* \| -luna* \| -dgux* \| -solaris* \| -sym* \

	408 - \| -kopensolaris* \

	409 + \| -hpux* \| -unos* \| -osf* \| -luna* \| -dgux* \| -auroraux* \| -solari s* \

	410 + \| -sym* \| -kopensolaris* \

	411 \| -amigaos* \| -amigados* \| -msdos* \| -newsos* \| -unicos* \| -aof* \

	412 \| -aos* \| -aros* \

	413 \| -nindy* \| -vxsim* \| -vxworks* \| -ebmon* \| -hms* \| -mvs* \

	414 @@ -1288,8 +1352,9 @@ case $os in

	415 \| -ptx* \| -coff* \| -ecoff* \| -winnt* \| -domain* \| -vsta* \

	416 \| -udi* \| -eabi* \| -lites* \| -ieee* \| -go32* \| -aux* \

	417 \| -chorusos* \| -chorusrdb* \| -cegcc* \

	418 - \| -cygwin* \| -pe* \| -psos* \| -moss* \| -proelf* \| -rtems* \

	419 - \| -mingw32* \| -linux-gnu* \| -linux-newlib* \| -linux-uclibc* \

	420 + \| -cygwin* \| -msys* \| -pe* \| -psos* \| -moss* \| -proelf* \| -rtems* \

	421 + \| -mingw32* \| -linux-gnu* \| -linux-android* \

	422 + \| -linux-newlib* \| -linux-uclibc* \

	423 \| -uxpv* \| -beos* \| -mpeix* \| -udk* \

	424 \| -interix* \| -uwin* \| -mks* \| -rhapsody* \| -darwin* \| -opened* \

	425 \| -openstep* \| -oskit* \| -conix* \| -pw32* \| -nonstopux* \

	426 @@ -1336,7 +1401,7 @@ case $os in

	427 -opened*)

	428 os=-openedition

	429 ;;

	430 - -os400*)

	431 + -os400*)

	432 os=-os400

	433 ;;

	434 -wince*)

	435 @@ -1385,7 +1450,7 @@ case $os in

	436 -sinix*)

	437 os=-sysv4

	438 ;;

	439 - -tpf*)

	440 + -tpf*)

	441 os=-tpf

	442 ;;

	443 -triton*)

	444 @@ -1430,6 +1495,8 @@ case $os in

	445 -dicos*)

	446 os=-dicos

	447 ;;

	448 + -nacl*)

	449 + ;;

	450 -none)

	451 ;;

	452 *)

	453 @@ -1452,10 +1519,10 @@ else

	454 # system, and we'll never get to this point.

	455

	456 case $basic_machine in

	457 - score-*)

	458 + score-*)

	459 os=-elf

	460 ;;

	461 - spu-*)

	462 + spu-*)

	463 os=-elf

	464 ;;

	465 *-acorn)

	466 @@ -1467,8 +1534,17 @@ case $basic_machine in

	467 arm*-semi)

	468 os=-aout

	469 ;;

	470 - c4x-* \| tic4x-*)

	471 - os=-coff

	472 + c4x-* \| tic4x-*)

	473 + os=-coff

	474 + ;;

	475 + tic54x-*)

	476 + os=-coff

	477 + ;;

	478 + tic55x-*)

	479 + os=-coff

	480 + ;;

	481 + tic6x-*)

	482 + os=-coff

	483 ;;

	484 # This must come before the *-dec entry.

	485 pdp10-*)

	486 @@ -1488,14 +1564,11 @@ case $basic_machine in

	487 ;;

	488 m68000-sun)

	489 os=-sunos3

	490 - # This also exists in the configure program, but was not the

	491 - # default.

	492 - # os=-sunos4

	493 ;;

	494 m68*-cisco)

	495 os=-aout

	496 ;;

	497 - mep-*)

	498 + mep-*)

	499 os=-elf
	bradn 2015/02/13 02:12:32 So this part isn't really meant to sneak into the So this part isn't really meant to sneak into the patch. Either manually delete it, or when you run updatepatch, be sure to git stash transitory things and checkout the prior rev. gdeepti 2015/02/13 21:43:56 Done. Show quoted text On 2015/02/13 02:12:32, bradn wrote: > So this part isn't really meant to sneak into the patch. > Either manually delete it, or when you run updatepatch, be sure to git stash > transitory things and checkout the prior rev. Done.
	500 ;;

	501 mips*-cisco)

	502 @@ -1522,7 +1595,7 @@ case $basic_machine in

	503 *-ibm)

	504 os=-aix

	505 ;;

	506 - *-knuth)

	507 + *-knuth)

	508 os=-mmixware

	509 ;;

	510 *-wec)

	511 diff --git a/configure.in b/configure.in

	512 --- a/configure.in

	513 +++ b/configure.in

	514 @@ -921,7 +921,7 @@ AC_HELP_STRING([--enable-naclvideo], [enable the nacl video driver [[default=yes

	515 AC_DEFINE(SDL_VIDEO_DRIVER_NACL)

	516 SOURCES="$SOURCES $srcdir/src/video/nacl/*.c"

	517 EXTRA_LDFLAGS="-lppapi_simple -l${NACL_CPP_LIB:-stdc++} $EXTRA_LDFLAGS"

	518 - SDL_LIBS="-Wl,-unacl_main -Wl,-undefined=PSUserCreateInstance -lSDLmain $SDL_LIBS -lppapi_gles2 -lcli_main -ltar -lppapi_simple -lnacl_io -lppapi_cpp - lppapi -lm -l${NACL_CPP_LIB:-stdc++}"

	519 + SDL_LIBS="-Wl,-unacl_main -Wl,-undefined=PSUserCreateInstance -lSDLmain $SDL_LIBS -lppapi_gles2 -lcli_main -lnacl_spawn -ltar -lppapi_simple -lnacl_io -lppapi_cpp -lppapi -lm -l${NACL_CPP_LIB:-stdc++}"

	520 SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main"

	521 fi

	522

OLD	NEW

« ports/python-static/nacl.patch ('K') | « ports/python-static/nacl.patch ('k') | ports/tcl/build.sh » ('j') | ports/tcl/build.sh » ('J')