04b8b4fbbb
In the spirit of 12759f67a3, change
external lib's config.sub to eat the arm-unknown-linux-androideabi
host os string. Also, permit shared libs again - seems Android can
handle those.
Added dictionaries to cross-build-toolset - idxdict is needed.
Should build up to sfx2 - some residual static lib issues there,
and in raptor.
92 lines
3.3 KiB
Diff
92 lines
3.3 KiB
Diff
--- 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 @@
|
|
|
|
hyphen.us3:
|
|
cp -f $(srcdir)/hyphen.tex hyphen.us
|
|
- patch < $(srcdir)/hyphen.patch
|
|
+ $(GNUPATCH) < $(srcdir)/hyphen.patch
|
|
$(srcdir)/tbhyphext.sh <$(srcdir)/tbhyphext.tex >hyphen.us2
|
|
cat hyphen.us hyphen.us2 | $(AWK) -f $(srcdir)/lig.awk >hyphen.us3
|
|
cat $(srcdir)/ligpatch.txt >>hyphen.us3
|
|
|
|
-hyph_en_US.dic: hyphen.us3
|
|
- perl $(srcdir)/substrings.pl hyphen.us3 hyphen.us4 UTF-8 2 3 >/dev/null
|
|
- cat hyphen.us4 | $(SED) -f $(srcdir)/ooopatch.sed >hyph_en_US.dic
|
|
+hyph_en_US.dic:
|
|
+ @echo "hyph_en_US.txt distributed with Hyphen library"
|
|
|
|
clean-local:
|
|
rm -rf hyphen.us* hyph_en_US.dic
|
|
--- misc/hyphen-2.7.1/Makefile.in 2010-12-01 02:31:29.000000000 +0100
|
|
+++ misc/build/hyphen-2.7.1/Makefile.in 2010-12-02 10:17:16.546875000 +0100
|
|
@@ -940,14 +940,13 @@
|
|
|
|
hyphen.us3:
|
|
cp -f $(srcdir)/hyphen.tex hyphen.us
|
|
- patch < $(srcdir)/hyphen.patch
|
|
+ $(GNUPATCH) < $(srcdir)/hyphen.patch
|
|
$(srcdir)/tbhyphext.sh <$(srcdir)/tbhyphext.tex >hyphen.us2
|
|
cat hyphen.us hyphen.us2 | $(AWK) -f $(srcdir)/lig.awk >hyphen.us3
|
|
cat $(srcdir)/ligpatch.txt >>hyphen.us3
|
|
|
|
-hyph_en_US.dic: hyphen.us3
|
|
- perl $(srcdir)/substrings.pl hyphen.us3 hyphen.us4 UTF-8 2 3 >/dev/null
|
|
- cat hyphen.us4 | $(SED) -f $(srcdir)/ooopatch.sed >hyph_en_US.dic
|
|
+hyph_en_US.dic:
|
|
+ @echo "hyph_en_US.txt distributed with Hyphen library"
|
|
|
|
clean-local:
|
|
rm -rf hyphen.us* hyph_en_US.dic
|
|
--- misc/hyphen-2.7.1/makefile.mk 2010-12-02 10:35:40.265625000 +0100
|
|
+++ misc/build/hyphen-2.7.1/makefile.mk 2010-12-02 10:25:45.750000000 +0100
|
|
@@ -1 +1,28 @@
|
|
-dummy
|
|
+PRJ = ..$/..$/..$/..
|
|
+
|
|
+PRJNAME = hyphen
|
|
+TARGET = hyphen
|
|
+CFLAGSCALL=gsd
|
|
+
|
|
+USE_DEFFILE=TRUE
|
|
+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
|
|
+UWINAPILIB=
|
|
+
|
|
+.INCLUDE : settings.mk
|
|
+
|
|
+# --- Files --------------------------------------------------------
|
|
+
|
|
+# !! not to be compiled because those belong to a stand alone programs: !!
|
|
+# $(SLO)$/createfp.obj\
|
|
+# $(SLO)$/testtextcat.obj
|
|
+
|
|
+SLOFILES= \
|
|
+ $(SLO)$/hyphen.obj\
|
|
+ $(SLO)$/hnjalloc.obj
|
|
+
|
|
+# --- Targets ------------------------------------------------------
|
|
+
|
|
+ALL: ALLTAR
|
|
+
|
|
+.INCLUDE : target.mk
|
|
+
|