Author: jim
Date: Tue Jan 8 20:39:48 2019
New Revision: 1850793
URL: http://svn.apache.org/viewvc?rev=1850793&view=rev
Log:
Bring somewhat up to date... remove reference to 10.4 and allow for newer SDKs
for 4.20.x
Modified:
openoffice/trunk/main/RepositoryFixes.mk
openoffice/trunk/main/configure.ac
Modified: openoffice/trunk/main/RepositoryFixes.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/RepositoryFixes.mk?rev=1850793&r1=1850792&r2=1850793&view=diff
==============================================================================
--- openoffice/trunk/main/RepositoryFixes.mk (original)
+++ openoffice/trunk/main/RepositoryFixes.mk Tue Jan 8 20:39:48 2019
@@ -75,11 +75,7 @@ gb_Library_FILENAMES := $(patsubst store
gb_Library_FILENAMES := $(patsubst
sunjavaplugin:libsunjavaplugin%,sunjavaplugin:sunjavaplugin%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
jurt:libjpipe.dylib%,jurt:libjpipe.jnilib%,$(gb_Library_FILENAMES))
-ifneq ($(MACOSX_DEPLOYMENT_TARGET),10.4) # default to use libc++
gb_Library_FILENAMES := $(patsubst
stl:%,stl:libc++.dylib,$(gb_Library_FILENAMES))
-else # use libstdc++ instead on ancient MacOSX targets
-gb_Library_FILENAMES := $(patsubst
stl:%,stl:libstdc++.dylib,$(gb_Library_FILENAMES))
-endif
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
endif # ifeq ($(OS),MACOSX)
Modified: openoffice/trunk/main/configure.ac
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/configure.ac?rev=1850793&r1=1850792&r2=1850793&view=diff
==============================================================================
--- openoffice/trunk/main/configure.ac (original)
+++ openoffice/trunk/main/configure.ac Tue Jan 8 20:39:48 2019
@@ -3941,7 +3941,7 @@ if test "$_os" = "Darwin"; then
MACOSX_DEPLOYMENT_TARGET=$sdk_target
dnl Why not MacOSX10.9.sdk? It lacks Python.h (!?)
- sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx10.(7|8|10|11)" |
sed -e "s/.*sdk //" | tail -n1`
+ sdk_found=`xcodebuild -showsdks | $EGREP "sdk
macosx10.(7|8|10|11|12|13|14)" | sed -e "s/.*sdk //" | tail -n1`
if test -z "$sdk_found"; then
AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found])
else
