mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix compilation with internal python on Mac

Browse Source
This commit is contained in:
Christian Lohmaier
2011-06-11 16:53:07 +02:00
parent 7abe7b6221
commit 03604560ce
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pyuno/source/loader/makefile.mk
View File

@@ -85,14 +85,10 @@ $(DLLDEST)$/%.py: %.py
cp $? $@ cp $? $@
.ENDIF # L10N_framework .ENDIF # L10N_framework
ALLTAR : $(MISC)/pythonloader.component $(eq,$(OS),MACOSX $(MISC)/installname_loader $(NULL)) ALLTAR : $(MISC)/pythonloader.component
$(MISC)/pythonloader.component .ERRREMOVE : \ $(MISC)/pythonloader.component .ERRREMOVE : \
$(SOLARENV)/bin/createcomponent.xslt pythonloader.component $(SOLARENV)/bin/createcomponent.xslt pythonloader.component
$(XSLTPROC) --nonet --stringparam uri \ $(XSLTPROC) --nonet --stringparam uri \
'vnd.sun.star.expand:$$OOO_BASE_DIR/program/$(SHL1TARGETN:f)' -o $@ \ 'vnd.sun.star.expand:$$OOO_BASE_DIR/program/$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt pythonloader.component $(SOLARENV)/bin/createcomponent.xslt pythonloader.component
$(MISC)/installname_loader : $(LB)/$(TARGET)$(DLLPOST)
install_name_tool -change $(PYTHON_MAKEINSTALLDIR)/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/OOoPython @loader_path/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/OOoPython $<
touch $@

13
pyuno/source/module/makefile.mk
View File

@@ -90,7 +90,7 @@ SHL1STDLIBS= \
$(PYTHONLIB) \ $(PYTHONLIB) \
$(EXTRA_FRAMEWORK_FLAG) $(EXTRA_FRAMEWORK_FLAG)
SHL1DEPN= SHL1DEPN=$(eq,$(OS),MACOSX $(MISC)/framework_link $(NULL))
SHL1LIBS= $(SLB)$/$(TARGET).lib SHL1LIBS= $(SLB)$/$(TARGET).lib
SHL1IMPLIB= i$(TARGET) SHL1IMPLIB= i$(TARGET)
@@ -121,7 +121,7 @@ $(LB)$/lib$(TARGET).a: $(MISC)$/$(TARGET).def
targetdll=$(LB)$/$(TARGET)$(DLLPOST) targetdll=$(LB)$/$(TARGET)$(DLLPOST)
.ENDIF .ENDIF
ALLTAR : $(eq,$(OS),MACOSX $(MISC)/installname_module $(NULL)) \ ALLTAR : \
$(DLLDEST)$/uno.py \ $(DLLDEST)$/uno.py \
$(DLLDEST)$/unohelper.py \ $(DLLDEST)$/unohelper.py \
$(targetdll) \ $(targetdll) \
@@ -134,11 +134,10 @@ ALLTAR : $(eq,$(OS),MACOSX $(MISC)/installname_module $(NULL)) \
$(DLLDEST)$/%.py: %.py $(DLLDEST)$/%.py: %.py
cp $? $@ cp $? $@
$(MISC)/installname_module : $(LB)/$(DLLPRE)$(TARGET)$(DLLPOST) # make checkdll happy
install_name_tool -change $(PYTHON_MAKEINSTALLDIR)/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/OOoPython @loader_path/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/OOoPython $< $(MISC)/framework_link :
# hack to make checkdll happy $(COMMAND_ECHO)ln -sf $(SOLARLIBDIR)/OOoPython.framework $(LB)/OOoPython.framework
ln -sf $(SOLARLIBDIR)/OOoPython.framework $(LB)/OOoPython.framework @touch $@
touch $@
$(MISC)$/$(PYUNORC) : pyuno $(MISC)$/$(PYUNORC) : pyuno
-rm -f $@ -rm -f $@