You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ji...@apache.org on 2019/02/13 13:35:06 UTC
svn commit: r1853505 - in /openoffice/branches/AOO42X: ./
main/solenv/gbuild/platform/macosx.mk
Author: jim
Date: Wed Feb 13 13:35:06 2019
New Revision: 1853505
URL: http://svn.apache.org/viewvc?rev=1853505&view=rev
Log:
Merge r1853504 from trunk:
Only symlink to jnilib if we are a dylib.
Patch by damjan
Reviewed by: jim
Modified:
openoffice/branches/AOO42X/ (props changed)
openoffice/branches/AOO42X/main/solenv/gbuild/platform/macosx.mk
Propchange: openoffice/branches/AOO42X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 13 13:35:06 2019
@@ -9,4 +9,4 @@
/openoffice/branches/ia2:1417739-1541842
/openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852430,1852438,1852623-1852624,1853175,1853319,1853443-1853444
+/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852430,1852438,1852623-1852624,1853175,1853319,1853443-1853444,1853504
Modified: openoffice/branches/AOO42X/main/solenv/gbuild/platform/macosx.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/solenv/gbuild/platform/macosx.mk?rev=1853505&r1=1853504&r2=1853505&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/solenv/gbuild/platform/macosx.mk (original)
+++ openoffice/branches/AOO42X/main/solenv/gbuild/platform/macosx.mk Wed Feb 13 13:35:06 2019
@@ -318,7 +318,7 @@ $(call gb_Helper_abbreviate_dirs,\
`cat $${DYLIB_FILE}` && \
$(if $(filter Library,$(TARGETTYPE)),\
$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library $(LAYER) $(1) && \
- ln -shf $(1) $(patsubst %.dylib,%.jnilib,$(1)) &&) \
+ $(if $(filter %.dylib,$(1)),ln -shf $(1) $(patsubst %.dylib,%.jnilib,$(1)) &&)) \
rm -f $${DYLIB_FILE})
endef