555088 - Support building freetype2 on other platforms

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Michael Wu [:mwu]]

Attachment: Support building FT2 on other platforms

The in-tree freetype2 currently only builds for a single platform. Other platforms, like Android, should be supported.

Comment 1

[Michael Wu [:mwu]]

Attachment: Support building FT2 on other platforms, v2

Unbitrot patch after bug 553433

Comment 2

[(not currently active) Ted Mielczarek]

Comment on attachment 435236 [details] [diff] [review]
Support building FT2 on other platforms, v2

>diff --git a/configure.in b/configure.in
>--- a/configure.in
>+++ b/configure.in
>@@ -6125,8 +6125,8 @@
>    FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1"
>    FT2_CFLAGS='-I$(topsrcdir)/modules/freetype2/include'
>    CAIRO_FT_CFLAGS='-I$(topsrcdir)/modules/freetype2/include'
>-   FT2_LIBS='$(LIBXUL_DIST)/lib/freetype2.lib'
>-   CAIRO_FT_LIBS='$(LIBXUL_DIST)/lib/freetype2.lib'
>+   FT2_LIBS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)freetype2.$(LIB_SUFFIX)'
>+   CAIRO_FT_LIBS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)freetype2.$(LIB_SUFFIX)'

Please make these '$(call EXPAND_LIBNAME_PATH,freetype2,$(LIBXUL_DIST)/lib)' while you're here.

>diff --git a/modules/freetype2/Makefile.in b/modules/freetype2/Makefile.in
>--- a/modules/freetype2/Makefile.in
>+++ b/modules/freetype2/Makefile.in
>@@ -42,12 +42,12 @@
> 
> include $(DEPTH)/config/autoconf.mk
> 
>-MODULE	= freetype2
>-LIBRARY_NAME	= freetype2
>-GRE_MODULE	= 1
>-LIBXUL_LIBRARY = 1
>-DIST_INSTALL = 1
>-FORCE_STATIC_LIB = 1
>+MODULE	          = freetype2
>+LIBRARY_NAME      = freetype2
>+GRE_MODULE        = 1
>+LIBXUL_LIBRARY    = 1
>+DIST_INSTALL      = 1
>+BUILD_STATIC_LIBS = 1

This is really not right. BUILD_STATIC_LIBS == --enable-static, it's not the same as FORCE_STATIC_LIB.

Comment 3

[Michael Wu [:mwu]]

(In reply to comment #2)
> (From update of attachment 435236 [details] [diff] [review])
> >diff --git a/configure.in b/configure.in
> >--- a/configure.in
> >+++ b/configure.in
> >@@ -6125,8 +6125,8 @@
> >    FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1"
> >    FT2_CFLAGS='-I$(topsrcdir)/modules/freetype2/include'
> >    CAIRO_FT_CFLAGS='-I$(topsrcdir)/modules/freetype2/include'
> >-   FT2_LIBS='$(LIBXUL_DIST)/lib/freetype2.lib'
> >-   CAIRO_FT_LIBS='$(LIBXUL_DIST)/lib/freetype2.lib'
> >+   FT2_LIBS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)freetype2.$(LIB_SUFFIX)'
> >+   CAIRO_FT_LIBS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)freetype2.$(LIB_SUFFIX)'
> 
> Please make these '$(call EXPAND_LIBNAME_PATH,freetype2,$(LIBXUL_DIST)/lib)'
> while you're here.
> 
Ok.

> >diff --git a/modules/freetype2/Makefile.in b/modules/freetype2/Makefile.in
> >--- a/modules/freetype2/Makefile.in
> >+++ b/modules/freetype2/Makefile.in
> >@@ -42,12 +42,12 @@
> > 
> > include $(DEPTH)/config/autoconf.mk
> > 
> >-MODULE	= freetype2
> >-LIBRARY_NAME	= freetype2
> >-GRE_MODULE	= 1
> >-LIBXUL_LIBRARY = 1
> >-DIST_INSTALL = 1
> >-FORCE_STATIC_LIB = 1
> >+MODULE	          = freetype2
> >+LIBRARY_NAME      = freetype2
> >+GRE_MODULE        = 1
> >+LIBXUL_LIBRARY    = 1
> >+DIST_INSTALL      = 1
> >+BUILD_STATIC_LIBS = 1
> 
> This is really not right. BUILD_STATIC_LIBS == --enable-static, it's not the
> same as FORCE_STATIC_LIB.
Looks like we build ok without the change. The android port just happened to use BUILD_STATIC_LIBS before bug 547521 landed.

Comment 4

[Michael Wu [:mwu]]

Attachment: Support building FT2 on other platforms, v3 [Checkin: Comment 5]

Comment 5

[Michael Wu [:mwu]]

http://hg.mozilla.org/mozilla-central/rev/8e7e274d3915

Comment 6

[Serge Gautherie (:sgautherie)]

Attachment: (Bv1-CC) Copy (the useful part of) it to comm-central [Checkin: See comment 8]

Comment 7

[Justin Wood (:Callek)]

Comment on attachment 436237 [details] [diff] [review]
(Bv1-CC) Copy (the useful part of) it to comm-central
[Checkin: See comment 8]

assuming this DOES work just fine on 1.9.2. r+ [if you did not test, or can't you can apply r+ to a 1.9.2 ifdef inserted.]

Comment 8

[Serge Gautherie (:sgautherie)]

Comment on attachment 436237 [details] [diff] [review]
(Bv1-CC) Copy (the useful part of) it to comm-central
[Checkin: See comment 8]


http://hg.mozilla.org/comm-central/rev/6eac7ef88f77
Bv1-CC, with comment 7 suggestion(s).