Author: jim Date: Tue Aug 15 15:19:50 2017 New Revision: 1805089 URL: http://svn.apache.org/viewvc?rev=1805089&view=rev Log: Get compiling/building again on osx/macos
Modified: openoffice/trunk/ext_libraries/serf/makefile.mk openoffice/trunk/main/configure.ac openoffice/trunk/main/redland/raptor/makefile.mk Modified: openoffice/trunk/ext_libraries/serf/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/serf/makefile.mk?rev=1805089&r1=1805088&r2=1805089&view=diff ============================================================================== --- openoffice/trunk/ext_libraries/serf/makefile.mk (original) +++ openoffice/trunk/ext_libraries/serf/makefile.mk Tue Aug 15 15:19:50 2017 @@ -108,7 +108,7 @@ BUILD_FLAGS+= -j$(EXTMAXPROCESS) # Serf names its library only with the major number. # We are using minor and micro as well. Fix that here # by creating a copy with the right name. -SERF_ORIGINAL_LIB=.libs/libserf-$(SERF_MAJOR).0.0.0.dylib +SERF_ORIGINAL_LIB=.libs/libserf-$(SERF_MAJOR).0.dylib SERF_FIXED_LIB=.libs/libserf-$(LIBSERFVERSION).0.dylib INSTALL_ACTION=if [ -f "$(SERF_ORIGINAL_LIB)" -a ! -f "$(SERF_FIXED_LIB)" ]; then cp $(SERF_ORIGINAL_LIB) $(SERF_FIXED_LIB); fi .ENDIF Modified: openoffice/trunk/main/configure.ac URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configure.ac?rev=1805089&r1=1805088&r2=1805089&view=diff ============================================================================== --- openoffice/trunk/main/configure.ac (original) +++ openoffice/trunk/main/configure.ac Tue Aug 15 15:19:50 2017 @@ -1148,7 +1148,7 @@ case "$build_os" in CC="`xcrun -f clang` -arch x86_64" fi if test ! -n "$CXX"; then - CXX="`xcrun -f clang++` -arch x86_64 -std=c++11" + CXX="`xcrun -f clang++` -arch x86_64" fi # Don't use OSVERSION until we know no conflicts result from it _darwin_version="`uname -r | $AWK -F . '{ print $1 }'`" @@ -3827,17 +3827,17 @@ dnl ==================================== dnl Checks for a MacOS platform SDK compatible with an OSX 10.7 deployment target dnl =================================================================== if test "$_os" = "Darwin"; then - sdk_target=10.7 + sdk_target=10.9 AC_MSG_CHECKING([checking SDK compatibility with OSX $sdk_target]) sdk_minor=`echo $sdk_target | cut -d"." -f2` - if test "$sdk_minor" -lt "7"; then + if test "$sdk_minor" -lt "9"; then AC_MSG_ERROR([SDK version < 10.7 is not longer supported]) else MACOSX_DEPLOYMENT_TARGET=$sdk_target - sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx10.(7|8|9|10|11|12)" | sed -e "s/.*sdk //" | tail -n1` + sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx10.(9|10|11|12)" | sed -e "s/.*sdk //" | tail -n1` if test -z "$sdk_found"; then AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found]) else Modified: openoffice/trunk/main/redland/raptor/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/redland/raptor/makefile.mk?rev=1805089&r1=1805088&r2=1805089&view=diff ============================================================================== --- openoffice/trunk/main/redland/raptor/makefile.mk (original) +++ openoffice/trunk/main/redland/raptor/makefile.mk Tue Aug 15 15:19:50 2017 @@ -140,7 +140,7 @@ BUILD_DIR=$(CONFIGURE_DIR) OUT2INC+=src/raptor.h src/raptor2.h src/raptor_config.h .IF "$(OS)"=="MACOSX" -OUT2LIB+=src$/.libs$/libraptor2.$(RAPTOR_MAJOR).dylib src$/.libs$/libraptor.dylib +OUT2LIB+=src$/.libs$/libraptor2.$(RAPTOR_MAJOR).dylib src$/.libs$/libraptor2.dylib .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" OUT2LIB+=src$/.libs$/*.a