Bug 1633142 - fix build bustage 2020-04-25: Variable DEFINES is defined in /builds/worker/checkouts/gecko/comm/calendar/base/backend/libical/build/Makefile.in. It should only be defined in moz.build files. rs=bustage-fix
authorMagnus Melin <mkmelin+mozilla@iki.fi>
Sat, 25 Apr 2020 14:42:02 +0300
changeset 38043 cb1266d16fcfdfc2a971656d32e2d3b7b7ab4741
parent 38042 96658057d800c7cae75607dd70525f489302a44c
child 38044 6301c1c36be285b447012da86123d0f5493ffe25
push id2595
push userclokep@gmail.com
push dateMon, 04 May 2020 19:02:04 +0000
treeherdercomm-beta@f53913797371 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs1633142
Bug 1633142 - fix build bustage 2020-04-25: Variable DEFINES is defined in /builds/worker/checkouts/gecko/comm/calendar/base/backend/libical/build/Makefile.in. It should only be defined in moz.build files. rs=bustage-fix
calendar/base/backend/libical/build/Makefile.in
calendar/libical/src/libical/Makefile.in
--- a/calendar/base/backend/libical/build/Makefile.in
+++ b/calendar/base/backend/libical/build/Makefile.in
@@ -1,8 +1,6 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Ensure that we don't embed a manifest referencing the CRT
 EMBED_MANIFEST_AT =
-
-DEFINES += -DSHARED_LIBRARY=$(SHARED_LIBRARY)
--- a/calendar/libical/src/libical/Makefile.in
+++ b/calendar/libical/src/libical/Makefile.in
@@ -30,23 +30,16 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEFINES += -DHAVE_CONFIG_H
-DEFINES += -DHAVE_SNPRINTF
-
-ifneq (,$(filter BeOS Darwin OpenVMS NetBSD FreeBSD,$(OS_ARCH)))
-DEFINES	+= -D__USE_BSD=1
-endif
-
 include $(moztopsrcdir)/config/rules.mk
 
 ######################################################################
 #
 # Generate files that are automatically generated (*.h.in and *.c.in)
 # and ical.h
 #