diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-12-21 23:11:38 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-12-22 09:07:47 +0000 |
| commit | 7a6efedd9eb4dea9abc9d1fd1f6362092ce01f78 (patch) | |
| tree | afd5a476a2bb5c6aabcfbbc62fde5f3ac5e76dea /hyphen | |
| parent | 80a11f0d43309f336d9ca4723f06b8e49ac1d7d7 (diff) | |
split hyphen patch to isolate android support
Diffstat (limited to 'hyphen')
| -rw-r--r-- | hyphen/hyphen-2.7.1.patch | 20 | ||||
| -rw-r--r-- | hyphen/hyphen-android.patch | 20 | ||||
| -rw-r--r-- | hyphen/makefile.mk | 3 |
3 files changed, 22 insertions, 21 deletions
diff --git a/hyphen/hyphen-2.7.1.patch b/hyphen/hyphen-2.7.1.patch index 50b7d5ad3244..0e8eafa8f9c2 100644 --- a/hyphen/hyphen-2.7.1.patch +++ b/hyphen/hyphen-2.7.1.patch @@ -1,23 +1,3 @@ ---- misc/hyphen-2.7.1/config.sub -+++ misc/build/hyphen-2.7.1/config.sub -@@ -120,7 +120,7 @@ - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os -@@ -1215,7 +1215,7 @@ - | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ -+ | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ --- misc/hyphen-2.7.1/Makefile.am 2010-07-19 11:23:17.000000000 +0200 +++ misc/build/hyphen-2.7.1/Makefile.am 2010-12-02 10:15:44.390625000 +0100 @@ -25,14 +25,13 @@ diff --git a/hyphen/hyphen-android.patch b/hyphen/hyphen-android.patch new file mode 100644 index 000000000000..b49c4a06006b --- /dev/null +++ b/hyphen/hyphen-android.patch @@ -0,0 +1,20 @@ +--- misc/hyphen-2.7.1/config.sub ++++ misc/build/hyphen-2.7.1/config.sub +@@ -120,7 +120,7 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ ++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os +@@ -1215,7 +1215,7 @@ + | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ++ | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk index 1cb1a10ed96f..d82c4b161bf7 100644 --- a/hyphen/makefile.mk +++ b/hyphen/makefile.mk @@ -44,7 +44,8 @@ ADDITIONAL_FILES += makefile.mk PATCH_FILES= \ hyphen-2.7.1.patch \ hyphen-2.7.1-read-charset.patch \ - hyphen-2.7.1-2.8.3.patch + hyphen-2.7.1-2.8.3.patch \ + hyphen-android.patch .IF "$(GUI)"=="UNX" CONFIGURE_DIR=$(BUILD_DIR) |