Merge pull request #3201 from glennw/fc-platform-fixup

Unify fontconfig source code so that one branch builds on both linux + android

5 files changed, 29 insertions, 35 deletions

diff --git a/.gitmodules b/.gitmodules
index b41827f5e4d..d3f8d9d55c4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -61,10 +61,6 @@
 [submodule "src/platform/linux/rust-xlib"]
 	path = src/platform/linux/rust-xlib
 	url = https://github.com/servo/rust-xlib.git
-[submodule "src/platform/linux/fontconfig"]
-	path = src/platform/linux/fontconfig
-	url = https://github.com/servo/fontconfig.git
-	ignore = dirty
 [submodule "src/support/skia/skia"]
 	path = src/support/skia/skia
 	url = https://github.com/servo/skia.git
@@ -86,9 +82,6 @@
 [submodule "src/support/png/libpng"]
 	path = src/support/png/libpng
 	url = https://github.com/servo/libpng.git
-[submodule "src/platform/android/fontconfig"]
-	path = src/platform/android/fontconfig
-	url = https://github.com/servo/fontconfig.git
 [submodule "src/platform/android/libexpat"]
 	path = src/platform/android/libexpat
 	url = https://github.com/servo/libexpat.git
@@ -127,3 +120,6 @@
 [submodule "src/support/ssl/rust-openssl"]
 	path = src/support/ssl/rust-openssl
 	url = https://github.com/servo/rust-openssl.git
+[submodule "src/platform/fontconfig/fontconfig"]
+	path = src/platform/fontconfig/fontconfig
+	url = https://github.com/servo/fontconfig.git
diff --git a/configure b/configure
index 7d4edd15223..8b97b7e0263 100755
--- a/configure
+++ b/configure
@@ -411,7 +411,7 @@ case ${TARGET_OSTYPE} in
         probe CFG_CXX              arm-linux-androideabi-g++
         probe CFG_LD               arm-linux-androideabi-ld
         probe CFG_AR               arm-linux-androideabi-ar
-        probe CFG_RANLIB	       arm-linux-androideabi-ranlib
+        probe CFG_RANLIB           arm-linux-androideabi-ranlib
 
         export PATH=${OLD_PATH}
         ;;
@@ -426,7 +426,7 @@ case ${TARGET_OSTYPE} in
         fi
         probe CFG_LD               ld
         probe CFG_AR               ar
-        probe CFG_RANLIB	   ranlib
+        probe CFG_RANLIB       ranlib
         CFG_RUSTC_FLAGS=""
         ;;
 esac
@@ -560,7 +560,7 @@ if [ $CFG_OSTYPE = "unknown-linux-gnu" ]
 then
 CFG_SUBMODULES="\
     platform/linux/rust-xlib \
-    platform/linux/fontconfig \
+    platform/fontconfig/fontconfig \
     support/glfw/glfw \
     support/glfw/glfw-rs \
     platform/linux/rust-fontconfig \
@@ -576,7 +576,7 @@ CFG_SUBMODULES="\
     support/egl/rust-egl \
     platform/android/libexpat \
     platform/android/libfreetype2 \
-    platform/android/fontconfig \
+    platform/fontconfig/fontconfig \
     platform/linux/rust-fontconfig \
     platform/linux/rust-freetype \
     ${CFG_SUBMODULES}"
@@ -665,7 +665,7 @@ for i in ${CFG_SUBMODULES}
 do
     if [ -d ${CFG_BUILD_DIR}src/${i} ]
     then
-	cd ${CFG_BUILD_DIR}src/${i}
+    cd ${CFG_BUILD_DIR}src/${i}
     fi
     CONFIGURE_SCRIPT="${CFG_SRC_DIR}src/${i}/configure"
     CONFIGURE_ARGS=""
@@ -682,33 +682,31 @@ do
             CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-sysroot=${CFG_ANDROID_CROSS_PATH}/sysroot"
             CONFIGURE_ARGS="${CONFIGURE_ARGS} --without-zlib"
             ;;
-        platform/linux/fontconfig)
+        platform/fontconfig/fontconfig)
             CONFIGURE_SCRIPT="${CFG_SRC_DIR}src/${i}/autogen.sh"
-            CONFIGURE_ARGS="${CONFIGURE_ARGS} --sysconfdir=/etc"
-            CONFIGURE_ARGS="${CONFIGURE_ARGS} --localstatedir=/var"
-            CONFIGURE_ARGS="${CONFIGURE_ARGS} --disable-docs"
-            CONFIGURE_ARGS="${CONFIGURE_ARGS} --disable-shared" # work around Rust #12557
-            if [ -f /etc/redhat-release ]; then
-                # Some RedHat-based distros (including our CentOS 6 build machines) are missing
-                # pkg-config files for expat: https://bugzilla.redhat.com/show_bug.cgi?id=833338
-                CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-expat=/usr"
+            if [ ${CFG_OSTYPE} = "linux-androideabi" ]; then
+                CONFIGURE_ARGS="${CONFIGURE_ARGS} --host=arm-linux-androideabi"
+                CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-arch=arm"
+                CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-expat-includes=${CFG_SRC_DIR}src/platform/android/libexpat/expat/lib"
+                CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-expat-lib=${CFG_BUILD_DIR}src/platform/android/libexpat/.libs"
+                CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-sysroot=${CFG_ANDROID_CROSS_PATH}/sysroot"
+                CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-cache-dir=${CFG_ANDROID_RESOURCE_PATH}/.fccache"
+                CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-confdir=${CFG_ANDROID_RESOURCE_PATH}/.fcconfig"
+                CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-default-fonts=${CFG_ANDROID_FONT_PATH}"
+            else
+                CONFIGURE_ARGS="${CONFIGURE_ARGS} --sysconfdir=/etc"
+                CONFIGURE_ARGS="${CONFIGURE_ARGS} --localstatedir=/var"
+                CONFIGURE_ARGS="${CONFIGURE_ARGS} --disable-docs"
+                CONFIGURE_ARGS="${CONFIGURE_ARGS} --disable-shared" # work around Rust #12557
+                if [ -f /etc/redhat-release ]; then
+                    # Some RedHat-based distros (including our CentOS 6 build machines) are missing
+                    # pkg-config files for expat: https://bugzilla.redhat.com/show_bug.cgi?id=833338
+                    CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-expat=/usr"
+                fi
             fi
             # --enable-debug isn't supported by fontconfig
             ENABLE_DEBUG=
             ;;
-        platform/android/fontconfig)
-            CONFIGURE_SCRIPT="${CFG_SRC_DIR}src/${i}/autogen.sh"
-            CONFIGURE_ARGS="${CONFIGURE_ARGS} --host=arm-linux-androideabi"
-            CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-arch=arm"
-            CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-expat-includes=${CFG_SRC_DIR}src/platform/android/libexpat/expat/lib"
-            CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-expat-lib=${CFG_BUILD_DIR}src/platform/android/libexpat/.libs"
-            CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-sysroot=${CFG_ANDROID_CROSS_PATH}/sysroot"
-            CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-cache-dir=${CFG_ANDROID_RESOURCE_PATH}/.fccache"
-            CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-confdir=${CFG_ANDROID_RESOURCE_PATH}/.fcconfig"
-            CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-default-fonts=${CFG_ANDROID_FONT_PATH}"
-            # --enable-debug isn't supported by fontconfig
-            ENABLE_DEBUG=
-            ;;
         support/spidermonkey/mozjs)
             # needed because Spidermonkey configure is in non-standard location
             CONFIGURE_SCRIPT="${CFG_SRC_DIR}src/${i}/js/src/configure"
@@ -764,7 +762,7 @@ do
     fi
 
     if [ -f ${CONFIGURE_SCRIPT} ]; then
-	(sh -c "${EXTRA_CONFIGURE_ARGS} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}") || exit $?
+    (sh -c "${EXTRA_CONFIGURE_ARGS} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}") || exit $?
     fi
 done
 
diff --git a/src/platform/android/fontconfig b/src/platform/android/fontconfig
deleted file mode 160000
-Subproject f3975a21cdea6c05a395107e849e1f28ce12e0b
diff --git a/src/platform/fontconfig/fontconfig b/src/platform/fontconfig/fontconfig
new file mode 160000
+Subproject 23161fabaa1505bfc21cf663be9447f4e720cb7
diff --git a/src/platform/linux/fontconfig b/src/platform/linux/fontconfig
deleted file mode 160000
-Subproject 0450af3d92f1fb4f269cc64e58647871a5bf728