diff options
| author | jan Iversen <jani@libreoffice.org> | 2017-10-16 20:51:22 +0200 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2017-10-16 20:53:09 +0200 |
| commit | a056bc01bdd0d8bbb5af47a58c2ed86003869c80 (patch) | |
| tree | 27016bd25583e31fb64afb7eddd9d52089d2cd40 | |
| parent | cd5a5c0baecac2832841208034b42724fcfbb49d (diff) | |
iOS workaround for gbuild missout
The prelink library depend on all static libraries,
there are no such gbuild variable, so instead we build
it unconditionally (not a nice hack)
Change-Id: I4946b01cce7c305e901b912b4c81d61fc8466b82
| -rw-r--r-- | ios/CustomTarget_iOS.mk | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/ios/CustomTarget_iOS.mk b/ios/CustomTarget_iOS.mk index e7f37778bf53..737a19404bc5 100644 --- a/ios/CustomTarget_iOS.mk +++ b/ios/CustomTarget_iOS.mk @@ -27,20 +27,13 @@ $(eval $(call gb_CustomTarget_CustomTarget,ios/ios)) $(call gb_CustomTarget_get_target,ios/ios): $(IOSGEN)/$(IOSKIT) -#- Setup directories --------------------------------------------------------- -IOSPREPARE: -ifeq ("$(wildcard $(IOSGEN))","") - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2) - mkdir -p $(IOSGEN) $(IOSRES) $(IOSRES)/services \ - $(IOSRES)/share/config $(IOSRES)/share/filter $(IOSRES)/program \ - $(IOSGEN) $(WORKDIR)/ios; -endif #- Generate xcconfig files --------------------------------------------------- -$(IOSKITXC) $(IOSAPPXC): $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS.mk IOSPREPARE +$(IOSKITXC): $(SRCDIR)/ios/loKit.xcconfig.in $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS.mk $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2) + @mkdir -p $(WORKDIR)/ios sed -e "s'@BUILDDIR@'$(BUILDDIR)'g" \ -e "s'@INSTDIR@'$(INSTDIR)'g" \ -e "s'@SRCDIR@'$(SRC_ROOT)'g" \ @@ -50,6 +43,10 @@ $(IOSKITXC) $(IOSAPPXC): $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_i -e "s'@SYMROOT@'$(WORKDIR)/ios/build'g" \ -e "s'@PRELINK@'`$(SRCDIR)/bin/lo-all-static-libs`'g" \ $(SRCDIR)/ios/loKit.xcconfig.in > $(WORKDIR)/ios/loKit.xcconfig + +$(IOSAPPXC): $(SRCDIR)/ios/loKit.xcconfig.in $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS.mk + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2) + @mkdir -p $(WORKDIR)/ios sed -e "s'@BUILDDIR@'$(BUILDDIR)'g" \ -e "s'@INSTDIR@'$(INSTDIR)'g" \ -e "s'@SRCDIR@'$(SRC_ROOT)'g" \ @@ -59,8 +56,11 @@ $(IOSKITXC) $(IOSAPPXC): $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_i -e "s'@SYMROOT@'$(WORKDIR)/ios/build'g" \ $(SRCDIR)/ios/loApp.xcconfig.in > $(WORKDIR)/ios/loApp.xcconfig -ifeq ("$(wildcard $(IOSRES))","") +$(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS.mk $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2) + mkdir -p $(IOSGEN) $(IOSRES) $(IOSRES)/services \ + $(IOSRES)/share/config $(IOSRES)/share/filter $(IOSRES)/program \ + $(IOSGEN) $(WORKDIR)/ios; # generate file with call declarations $(SRCDIR)/solenv/bin/native-code.py \ @@ -111,11 +111,10 @@ ifeq ("$(wildcard $(IOSRES))","") echo 'AllLanguages=en-US' >> $(IOSRES)/program/versionrc echo 'BuildVersion=' >> $(IOSRES)/program/versionrc echo "buildid=$(BUILDID)" >> $(IOSRES)/program/versionrc -endif #- build --------------------------------------------------------------------- -$(IOSGEN)/$(IOSKIT): $(IOSKITXC) $(IOSAPPXC) IOSPREPARE +$(IOSGEN)/$(IOSKIT): $(IOSKITXC) $(IOSAPPXC) $(IOSGEN)/native-code.h STAT_LIB_DEPEND $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),APP,2) CC=; \ $(call gb_Helper_print_on_error, \ @@ -131,6 +130,8 @@ $(IOSGEN)/$(IOSKIT): $(IOSKITXC) $(IOSAPPXC) IOSPREPARE ) cp $(WORKDIR)/ios/build/*/libLibreOfficeKit.a $(IOSGEN)/$(IOSKIT) +STAT_LIB_DEPEND: + $(INSTDIR)/$(IOSAPP): $(IOSAPPPRJ)/project.pbxproj $(IOSGEN)/$(IOSKIT) |