diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-09-17 13:56:12 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-09-17 19:37:42 +0200 |
| commit | f5b840a3ee14a2086647596246d3491a58bf33bb (patch) | |
| tree | 84b5b61340679be7d7929583090b3463651cdeee /instsetoo_native | |
| parent | bb15aeb0bbd063e557f21c4edde03949c66173fd (diff) | |
goodbye linkoo.. you have served well
This commit:
- removes linkoo and --disable-linkoo option
- removes 'dev-update' make target
- creates --disable-ooenv option
- removes LD_LIBRARY_PATH and PATH settings in ooenv
Change-Id: I9530558531e9cb58b8282754ec8a6c655f190480
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/CustomTarget_setup.mk | 6 | ||||
| -rw-r--r-- | instsetoo_native/Package_setup.mk | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index 8556ff58b059..6f2c647eb6e1 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -12,7 +12,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,instsetoo_native/setup)) $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/setup,\ $(call gb_Helper_get_rcfile,bootstrap) \ $(call gb_Helper_get_rcfile,fundamental) \ - ooenv \ + $(if $(ENABLE_OOENV),ooenv) \ $(if $(filter TRUE,$(DISABLE_PYTHON)),,$(call gb_Helper_get_rcfile,pythonloader.uno)) \ $(call gb_Helper_get_rcfile,uno) \ $(call gb_Helper_get_rcfile,version) \ @@ -69,11 +69,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/ooenv : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) ( \ - echo 'java_path=`$(gb_INSTROOT)/ure/bin/javaldx 2>/dev/null`' && \ - echo 'export LD_LIBRARY_PATH="$(gb_INSTROOT)/program:$$java_path$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}"' && \ echo 'ulimit -c unlimited' && \ - echo 'export PATH="$(gb_INSTROOT)/program:$(gb_INSTROOT)/ure/bin:$$PATH"' && \ - echo 'export GNOME_DISABLE_CRASH_DIALOG=1' && \ echo '# debugging assistance' && \ echo 'export SAL_DISABLE_FLOATGRAB=1' && \ echo 'export G_SLICE=always-malloc' && \ diff --git a/instsetoo_native/Package_setup.mk b/instsetoo_native/Package_setup.mk index 2cd15fcfb8d0..caada4f77655 100644 --- a/instsetoo_native/Package_setup.mk +++ b/instsetoo_native/Package_setup.mk @@ -14,7 +14,7 @@ $(eval $(call gb_Package_set_outdir,instsetoo_native_setup,$(gb_INSTROOT))) $(eval $(call gb_Package_add_files,instsetoo_native_setup,$(gb_PROGRAMDIRNAME),\ $(call gb_Helper_get_rcfile,bootstrap) \ $(call gb_Helper_get_rcfile,fundamental) \ - ooenv \ + $(if $(ENABLE_OOENV),ooenv) \ $(if $(filter TRUE,$(DISABLE_PYTHON)),,$(call gb_Helper_get_rcfile,pythonloader.uno)) \ $(call gb_Helper_get_rcfile,uno) \ $(call gb_Helper_get_rcfile,version) \ |