← Back to branch summary

~jbicha/firefox/update-dependencies

« back to all changes in this revision

Viewing changes to debian/build/rules.mk

  • Committer: Rico Tzschichholz
  • Date: 2017-11-14 11:59:37 UTC
  • Revision ID: ricotz@ubuntu.com-20171114115937-eec02juysofd8419
* New upstream release from the beta channel (FIREFOX_58_0b3_BUILD2)
* Adapt to upstream and use ./mach
  - debian/build/rules.mk
* Install EmojiOneMozilla.ttf (LP: #1644021)
  - debian/firefox.install.in
* Update patches
  - debian/patches/allow-lockPref-everywhere.patch
  - debian/patches/revert-upstream-search-engine-changes.patch
* Update revert-upstream-search-engine-changes.patch to ensure we keep the
  region overrides for non-Google plugins
* Update AppArmor profile

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/build/rules.mk
36
36
$(error "Need to set MOZ_BRANDING_DIR")
37
37
endif
38
38
 
39
 
DEB_MAKE_MAKEFILE               := client.mk
 
39
DEB_BUILD_DIR                   := $(MOZ_OBJDIR)
40
40
# Without this, CDBS passes CFLAGS and CXXFLAGS options to client.mk, which breaks the build
41
41
DEB_MAKE_EXTRA_ARGS             :=
42
42
# These normally come from autotools.mk, which we no longer include (because we
43
43
# don't want to run configure)
44
 
DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp
45
 
DEB_MAKE_CLEAN_TARGET   := cleansrcdir
 
44
DEB_MAKE_INSTALL_TARGET :=
46
45
# Prevent some files from being cleaned to avoid build failures
47
46
DEB_CLEAN_EXCLUDE               := Cargo.toml.orig
48
47
# Don't save debug symbols in firefox-dbg (rely on pkg-create-dbgsym to create
264
263
                $(MAKE) langpack-$* BASE_MERGE=$(CURDIR)/debian/l10n-mergedirs REAL_LOCALE_MERGEDIR=$(CURDIR)/debian/l10n-mergedirs/$* || exit 1;
265
264
        @touch $@
266
265
 
 
266
common-configure-arch common-configure-indep:: common-configure-impl
 
267
common-configure-impl:: debian/stamp-mach-configure
 
268
debian/stamp-mach-configure:
 
269
        $(CURDIR)/mach configure && $(CURDIR)/mach build-backend
 
270
        touch $@
 
271
clean::
 
272
        rm -f debian/stamp-mach-configure
 
273
 
267
274
#common-build-arch:: make-langpack-xpis make-testsuite run-tests
268
275
common-build-arch:: make-langpack-xpis
269
276
 
279
286
        echo "app:Provides=$(subst $(subst $(MOZ_APP_NAME),,$(MOZ_PKG_NAME)),,$*)" >> debian/$*.substvars
280
287
endif
281
288
 
282
 
common-install-arch common-install-indep::
 
289
common-install-arch common-install-indep:: common-install-impl
 
290
common-install-impl:: debian/stamp-mach-install
 
291
debian/stamp-mach-install:
 
292
        DESTDIR=$(CURDIR)/debian/tmp $(CURDIR)/mach install
283
293
        $(foreach dir,$(MOZ_LIBDIR) $(MOZ_INCDIR) $(MOZ_IDLDIR) $(MOZ_SDKDIR), \
284
294
                if [ -d debian/tmp/$(dir)-$(MOZ_VERSION) ]; \
285
295
                then \
286
296
                        mv debian/tmp/$(dir)-$(MOZ_VERSION) debian/tmp/$(dir); \
287
297
                fi; )
 
298
        touch $@
 
299
clean::
 
300
        rm -f debian/stamp-mach-install
288
301
 
289
302
#common-install-arch:: install-testsuite
290
303