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

Unified 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 side-by-side diff with in-line comments

Download patch

Index: ports/sdl/nacl.patch

diff --git a/ports/sdl/nacl.patch b/ports/sdl/nacl.patch

new file mode 100644

index 0000000000000000000000000000000000000000..11648798b6c929a2cc59c4f3ef3adb1d0743b01a

--- /dev/null

+++ b/ports/sdl/nacl.patch

@@ -0,0 +1,522 @@

+diff --git a/build-scripts/config.sub b/build-scripts/config.sub

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

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

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

+ #! /bin/sh

+ # Configuration validation subroutine script.

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

+-# Free Software Foundation, Inc.

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

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

+-timestamp='2009-10-07'

++timestamp='2012-02-10'

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

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

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

+ # GNU General Public License for more details.

+ #

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

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

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

+-# 02110-1301, USA.

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

+ #

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

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

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

+ version="\

+ GNU config.sub ($timestamp)

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

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

++Free Software Foundation, Inc.

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

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

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

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

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

+ case $maybe_os in

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

++ knetbsd*-gnu* | netbsd*-gnu* | \

+ kopensolaris*-gnu* | \

+ storm-chaos* | os2-emx* | rtmk-nova*)

+ os=-$maybe_os

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

+ ;;

++ android-linux)

++ os=-linux-android

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

++ ;;

+ *)

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

+ if [ $basic_machine != $1 ]

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

+ os=

+ basic_machine=$1

+ ;;

+- -bluegene*)

+- os=-cnk

++ -bluegene*)

++ os=-cnk

+ ;;

+ -sim | -cisco | -oki | -wec | -winbond)

+ os=

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

+ os=-chorusos

+ basic_machine=$1

+ ;;

+- -chorusrdb)

+- os=-chorusrdb

++ -chorusrdb)

++ os=-chorusrdb

+ basic_machine=$1

+- ;;

++ ;;

+ -hiux*)

+ os=-hiuxwe2

+ ;;

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

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

+ 1750a | 580 \

+ | a29k \

++ | aarch64 | aarch64_be \

+ | am33_2.0 \

+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \

++ | be32 | be64 \

+ | bfin \

+ | c4x | clipper \

+ | d10v | d30v | dlx | dsp16xx \

++ | epiphany \

+ | fido | fr30 | frv \

++ | hexagon \

+ | i370 | i860 | i960 | ia64 \

+ | ip2k | iq2000 \

++ | le32 | le64 \

+ | lm32 \

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

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

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

+ | moxie \

+ | mt \

+ | msp430 \

++ | nds32 | nds32le | nds32be \

+ | nios | nios2 \

+ | ns16k | ns32k \

++ | open8 \

+ | or32 \

+ | pdp10 | pdp11 | pj | pjl \

++ | powerpc | powerpc64 | powerpc64le | powerpcle \

+ | pyramid \

+- | rx \

++ | rl78 | rx \

+ | score \

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

+ | sh64 | sh64le \

+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \

+- | spu | strongarm \

+- | v850 | v850e \

++ | spu \

++ | ubicom32 \

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

+ | we32k \

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

++ | x86 | xc16x | xstormy16 | xtensa \

+ | z8k | z80)

+ basic_machine=$basic_machine-unknown

+ ;;

+- m6811 | m68hc11 | m6812 | m68hc12 | picochip)

+- # Motorola 68HC11/12.

++ c54x)

++ basic_machine=tic54x-unknown

++ ;;

++ c55x)

++ basic_machine=tic55x-unknown

++ ;;

++ c6x)

++ basic_machine=tic6x-unknown

++ ;;

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

+ basic_machine=$basic_machine-unknown

+ os=-none

+ ;;

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

+ basic_machine=mt-unknown

+ ;;

++ strongarm | thumb | xscale)

++ basic_machine=arm-unknown

++ ;;

++ xgate)

++ basic_machine=$basic_machine-unknown

++ os=-none

++ ;;

++ xscaleeb)

++ basic_machine=armeb-unknown

++ ;;

++ xscaleel)

++ basic_machine=armel-unknown

++ ;;

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

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

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

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

+ # Recognize the basic CPU types with company name.

+ 580-* \

+ | a29k-* \

++ | aarch64-* | aarch64_be-* \

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

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

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

+ | avr-* | avr32-* \

++ | be32-* | be64-* \

+ | bfin-* | bs2000-* \

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

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

+ | clipper-* | craynv-* | cydra-* \

+ | d10v-* | d30v-* | dlx-* \

+ | elxsi-* \

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

+ | h8300-* | h8500-* \

++ | hexagon-* \

+ | i*86-* | i860-* | i960-* | ia64-* \

+ | ip2k-* | iq2000-* \

++ | le32-* | le64-* \

+ | lm32-* \

+ | m32c-* | m32r-* | m32rle-* \

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

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

+ | mmix-* \

+ | mt-* \

+ | msp430-* \

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

+ | nios-* | nios2-* \

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

++ | open8-* \

+ | orion-* \

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

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

+ | pyramid-* \

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

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

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

+ | sparclite-* \

+- | tahoe-* | thumb-* \

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

++ | tahoe-* \

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

++ | tile*-* \

+ | tron-* \

+- | v850-* | v850e-* | vax-* \

++ | ubicom32-* \

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

++ | vax-* \

+ | we32k-* \

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

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

+ | xstormy16-* | xtensa*-* \

+ | ymp-* \

+ | z8k-* | z80-*)

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

+ basic_machine=a29k-amd

+ os=-udi

+ ;;

+- abacus)

++ abacus)

+ basic_machine=abacus-unknown

+ ;;

+ adobe68k)

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

+ basic_machine=powerpc-ibm

+ os=-cnk

+ ;;

++ c54x-*)

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

++ ;;

++ c55x-*)

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

++ ;;

++ c6x-*)

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

++ ;;

+ c90)

+ basic_machine=c90-cray

+ os=-unicos

+ ;;

+- cegcc)

++ cegcc)

+ basic_machine=arm-unknown

+ os=-cegcc

+ ;;

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

+ basic_machine=craynv-cray

+ os=-unicosmp

+ ;;

+- cr16)

++ cr16 | cr16-*)

+ basic_machine=cr16-unknown

+ os=-elf

+ ;;

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

+ i370-ibm* | ibm*)

+ basic_machine=i370-ibm

+ ;;

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

+ i*86v32)

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

+ os=-sysv32

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

+ basic_machine=ns32k-utek

+ os=-sysv

+ ;;

+- microblaze)

++ microblaze)

+ basic_machine=microblaze-xilinx

+ ;;

+ mingw32)

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

+ ms1-*)

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

+ ;;

++ msys)

++ basic_machine=i386-pc

++ os=-msys

++ ;;

+ mvs)

+ basic_machine=i370-ibm

+ os=-mvs

+ ;;

++ nacl)

++ basic_machine=le32-unknown

++ os=-nacl

++ ;;

+ ncr3000)

+ basic_machine=i486-ncr

+ os=-sysv4

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

+ np1)

+ basic_machine=np1-gould

+ ;;

++ neo-tandem)

++ basic_machine=neo-tandem

++ ;;

++ nse-tandem)

++ basic_machine=nse-tandem

++ ;;

+ nsr-tandem)

+ basic_machine=nsr-tandem

+ ;;

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

+ ;;

+ power) basic_machine=power-ibm

+ ;;

+- ppc) basic_machine=powerpc-unknown

++ ppc | ppcbe) basic_machine=powerpc-unknown

+ ;;

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

++ ppc-* | ppcbe-*)

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

+ ;;

+ ppcle | powerpclittle | ppc-le | powerpc-little)

+ basic_machine=powerpcle-unknown

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

+ basic_machine=i860-stratus

+ os=-sysv4

+ ;;

++ strongarm-* | thumb-*)

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

++ ;;

+ sun2)

+ basic_machine=m68000-sun

+ ;;

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

+ basic_machine=t90-cray

+ os=-unicos

+ ;;

+- tic54x | c54x*)

+- basic_machine=tic54x-unknown

+- os=-coff

+- ;;

+- tic55x | c55x*)

+- basic_machine=tic55x-unknown

+- os=-coff

+- ;;

+- tic6x | c6x*)

+- basic_machine=tic6x-unknown

+- os=-coff

+- ;;

+ tile*)

+- basic_machine=tile-unknown

++ basic_machine=$basic_machine-unknown

+ os=-linux-gnu

+ ;;

+ tx39)

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

+ xps | xps100)

+ basic_machine=xps100-honeywell

+ ;;

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

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

++ ;;

+ ymp)

+ basic_machine=ymp-cray

+ os=-unicos

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

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

+ then

+ case $os in

+- # First match some system type aliases

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

++ # First match some system type aliases

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

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

++ -auroraux)

++ os=-auroraux

++ ;;

+ -solaris1 | -solaris1.*)

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

+ ;;

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

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

+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\

+- | -kopensolaris* \

++ | -sym* | -kopensolaris* \

+ | -aos* | -aros* \

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

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

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

+ | -chorusos* | -chorusrdb* | -cegcc* \

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

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

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

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

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

+ -opened*)

+ os=-openedition

+ ;;

+- -os400*)

++ -os400*)

+ os=-os400

+ ;;

+ -wince*)

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

+ -sinix*)

+ os=-sysv4

+ ;;

+- -tpf*)

++ -tpf*)

+ os=-tpf

+ ;;

+ -triton*)

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

+ -dicos*)

+ os=-dicos

+ ;;

++ -nacl*)

++ ;;

+ -none)

+ ;;

+ *)

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

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

+ case $basic_machine in

+- score-*)

++ score-*)

+ os=-elf

+ ;;

+- spu-*)

++ spu-*)

+ os=-elf

+ ;;

+ *-acorn)

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

+ arm*-semi)

+ os=-aout

+ ;;

+- c4x-* | tic4x-*)

+- os=-coff

++ c4x-* | tic4x-*)

++ os=-coff

++ ;;

++ tic54x-*)

++ os=-coff

++ ;;

++ tic55x-*)

++ os=-coff

++ ;;

++ tic6x-*)

++ os=-coff

+ ;;

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

+ pdp10-*)

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

+ ;;

+ m68000-sun)

+ os=-sunos3

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

+- # default.

+- # os=-sunos4

+ ;;

+ m68*-cisco)

+ os=-aout

+ ;;

+- mep-*)

++ mep-*)

+ os=-elf

bradn 2015/02/13 02:12:32 So this part isn't really meant to sneak into the

gdeepti 2015/02/13 21:43:56 Done.

+ ;;

+ mips*-cisco)

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

+ *-ibm)

+ os=-aix

+ ;;

+- *-knuth)

++ *-knuth)

+ os=-mmixware

+ ;;

+ *-wec)

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

+--- a/configure.in

++++ b/configure.in

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

+ AC_DEFINE(SDL_VIDEO_DRIVER_NACL)

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

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

+- 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++}"

++ 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++}"

+ SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main"

+ fi

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