Bug 1252980 - Link the geckolib into libxul and define MOZ_STYLO if --with-servo=PATH is passed. r=gps
authorBobby Holley <bobbyholley@gmail.com>
Fri, 13 Nov 2015 22:37:58 -0800
changeset 322900 b4f60d9123df8d93f001893923fc6191b0e09b37
parent 322899 624b22ec6462b2c64934c193c3a5592becc2dc96
child 322901 77a8ffe34d9485e4d9a2aa363dcf01ea1a73c819
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1252980
milestone47.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1252980 - Link the geckolib into libxul and define MOZ_STYLO if --with-servo=PATH is passed. r=gps
old-configure.in
toolkit/library/moz.build
--- a/old-configure.in
+++ b/old-configure.in
@@ -7585,16 +7585,37 @@ MOZ_ARG_DISABLE_BOOL(mozril-geoloc,
     DISABLE_MOZ_RIL_GEOLOC=1,
     DISABLE_MOZ_RIL_GEOLOC= )
 if test -n "$DISABLE_MOZ_RIL_GEOLOC"; then
    AC_DEFINE(DISABLE_MOZ_RIL_GEOLOC)
 fi
 AC_SUBST(DISABLE_MOZ_RIL_GEOLOC)
 
 dnl ========================================================
+dnl = Use the Servo Style System for Gecko.
+dnl =
+dnl = This linkage setup is temporary, and for experimental
+dnl = purposes. We will vendor servo and integrate the build
+dnl = systems before actually shipping anything.
+dnl ========================================================
+MOZ_ARG_WITH_STRING(servo,
+[  --with-servo=SERVO_TARGET_DIR
+                Absolute path of the target directory where libgeckoservo can
+                be found. This is generally servo_src_dir/target/release.
+                Passing this flag enables experimental integration with the
+                servo style system],
+  SERVO_TARGET_DIR=$withval,
+  SERVO_TARGET_DIR=)
+if test -n "$SERVO_TARGET_DIR"; then
+   MOZ_SERVO_LIBS="-L${SERVO_TARGET_DIR} -lgeckoservo"
+   AC_DEFINE(MOZ_STYLO)
+   AC_SUBST_LIST(MOZ_SERVO_LIBS)
+fi
+
+dnl ========================================================
 dnl =
 dnl = Misc. Options
 dnl =
 dnl ========================================================
 MOZ_ARG_HEADER(Misc. Options)
 
 dnl ========================================================
 dnl update xterm title
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -207,16 +207,17 @@ if CONFIG['MOZ_B2G_CAMERA'] and CONFIG['
 
 if CONFIG['OS_ARCH'] == 'Linux' and CONFIG['OS_TARGET'] != 'Android':
     OS_LIBS += [
         'rt',
     ]
 
 OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS']
 OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
+OS_LIBS += CONFIG['MOZ_SERVO_LIBS']
 
 if CONFIG['MOZ_NATIVE_JPEG']:
     OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
 
 if CONFIG['MOZ_NATIVE_PNG']:
     OS_LIBS += CONFIG['MOZ_PNG_LIBS']
 
 if CONFIG['MOZ_NATIVE_HUNSPELL']: