Chromium Code Reviews| Index: tools/linux_dist_support/debian/rules |
| =================================================================== |
| --- tools/linux_dist_support/debian/rules (revision 38346) |
| +++ tools/linux_dist_support/debian/rules (working copy) |
| @@ -9,16 +9,22 @@ |
| PARALLEL_JOBS := 1 |
| endif |
| -DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) |
| ifeq (amd64,$(DEB_HOST_ARCH_CPU)) |
| BUILD_TYPE += ReleaseX64 |
| +ARCH += x64 |
| else |
| ifeq (i386,$(DEB_HOST_ARCH_CPU)) |
| BUILD_TYPE += ReleaseIA32 |
| +ARCH += ia32 |
| else |
| -$(warning unsupported target arch $(DEB_HOST_ARCH_CPU) - continuing anyway) |
| +ifeq (arm,$(DEB_HOST_ARCH_CPU)) |
| +BUILD_TYPE += ReleaseXARM |
|
Søren Gjesse
2014/08/05 15:20:29
ReleaseXARM -> ReleaseARM (no X right?)
zra
2014/08/14 20:42:53
Changed to detect whether we are doing a cross-bui
|
| +ARCH += arm |
| +else |
| +$(error unsupported target arch '$(DEB_HOST_ARCH_CPU)') |
| endif |
| endif |
| +endif |
| # Verbose? |
| ifeq (1,$(DH_VERBOSE)) |
| @@ -40,12 +46,18 @@ |
| GYP_GENERATORS=make python dart/tools/gyp_dart.py all |
| override_dh_auto_build: |
| - make -C dart -j$(PARALLEL_JOBS) \ |
| - BUILDTYPE=$(BUILD_TYPE) $(BUILD_ARGS) create_sdk |
| + cd dart; \ |
| + python tools/build.py -v -m release -a $(ARCH) $(TOOLCHAIN) create_sdk; \ |
|
Søren Gjesse
2014/08/05 15:20:29
As this is a Makefile all indentation should be TA
zra
2014/08/14 20:42:53
Done.
|
| + cd .. |
| # Building the Dart SDK will already strip all binaries. |
| override_dh_strip: |
| +# This override allows us to ignore spurious missing library errors when |
| +# cross-compiling. |
| +override_dh_shlibdeps: |
| + dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info |
|
ricow1
2014/07/30 12:47:06
I don't know if we shoujld use tabs like you do ab
Søren Gjesse
2014/08/05 15:20:30
Use TABs in Makefiles.
zra
2014/08/14 20:42:53
Done.
zra
2014/08/14 20:42:53
Done.
|
| + |
| override_dh_auto_install: |
| mkdir -p debian/tmp/out |
| cp -R dart/out/$(BUILD_TYPE)/dart-sdk debian/tmp/out |