diff options
| author | Hanno Meyer-Thurow <h.mth@web.de> | 2011-03-13 16:07:50 +0100 |
|---|---|---|
| committer | Hanno Meyer-Thurow <h.mth@web.de> | 2011-03-14 18:47:10 +0100 |
| commit | ff33fd9d5d5be99bebe6ab34da333fd641af3ed6 (patch) | |
| tree | 28398fdaee71c556fce4e450b5af933f46cd3f6e /instsetoo_native | |
| parent | 66f1625c2f714cf979365a731d9b05be04127187 (diff) | |
Merge Gentoo patches from old build and downstream repositories.
1. Do not add compiler default include and library path: potentially build
against different version of system library than requested by the user.
2. Add a configure option to disable Python2 (PyUNO) bindings. Python3 is
available for more than two years. Noone cares, therefore rest in peace.
Python2 is going to be ditched at some point. Simply do not fail then.
Windows builds need to be updated for BUILD_TYPE: "PYUNO". Or how is it
handled nowadays?
3. Fix sandbox violation in officecfg module: rm /bin/<language>.zip
4. Add a configure option to search only in one place for JVMs, which is quite
interesting for Linux Distributions. Enforce the user to place JVMs in one
base directory.
5. Fix build for libxml-2.7.8 with ICU support.
* config_office-XINC-XLIB-defaults.diff: (1)
* disable-python.diff: (2)
* gentoo-sandbox.diff: (3)
* jvm-search-path.diff: (4)
* libxmlsec_fix_extern_c.diff: (5)
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/util/makefile.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index da4478cb49f5..5911c3fe241d 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -68,12 +68,14 @@ INSTALLDIR=$(OUT) .INCLUDE: target.mk +.IF "$(DISABLE_PYTHON)" != "TRUE" LOCALPYFILES= \ $(BIN)$/uno.py \ $(BIN)$/unohelper.py \ $(BIN)$/pythonloader.py \ $(BIN)$/officehelper.py \ $(BIN)$/mailmerge.py +.ENDIF xxxx: echo $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product LibreOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml @@ -292,12 +294,14 @@ openoffice: .ENDIF # "$(alllangiso)"!="" +.IF "$(DISABLE_PYTHON)" != "TRUE" .IF "$(LOCALPYFILES)"!="" $(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES) .ENDIF # "$(LOCALPYFILES)"!="" $(BIN)$/%.py : $(SOLARSHAREDBIN)$/pyuno$/%.py @$(COPY) $< $@ +.ENDIF # "$(DISABLE_PYTHON)" != "TRUE" $(BIN)$/intro.zip : $(SOLARCOMMONPCKDIR)$/brand$/intro.zip $(COPY) $< $@ |