patch-shobj-conf.diff 1.8 KB

1234567891011121314151617181920212223242526272829303132333435363738394041
  1. --- support/shobj-conf.orig 2009-10-29 00:20:21.000000000 +1100
  2. +++ support/shobj-conf 2011-03-24 13:43:03.000000000 +1100
  3. @@ -157,19 +157,19 @@
  4. ;;
  5. # Darwin/MacOS X
  6. -darwin[89]*|darwin10*)
  7. +darwin[89]*|darwin1[0-9]*)
  8. SHOBJ_STATUS=supported
  9. SHLIB_STATUS=supported
  10. SHOBJ_CFLAGS='-fno-common'
  11. - SHOBJ_LD='MACOSX_DEPLOYMENT_TARGET=10.3 ${CC}'
  12. + SHOBJ_LD='${CC}'
  13. SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)'
  14. SHLIB_LIBSUFF='dylib'
  15. - SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup -arch_only `/usr/bin/arch`'
  16. - SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
  17. + SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup'
  18. + SHLIB_XLDFLAGS='-dynamiclib -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
  19. SHLIB_LIBS='-lncurses' # see if -lcurses works on MacOS X 10.1
  20. ;;
  21. @@ -186,11 +186,11 @@
  22. SHLIB_LIBSUFF='dylib'
  23. case "${host_os}" in
  24. - darwin[789]*|darwin10*) SHOBJ_LDFLAGS=''
  25. - SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
  26. + darwin[789]*|darwin1[0-9]*) SHOBJ_LDFLAGS=''
  27. + SHLIB_XLDFLAGS='-dynamiclib -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
  28. ;;
  29. *) SHOBJ_LDFLAGS='-dynamic'
  30. - SHLIB_XLDFLAGS='-arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
  31. + SHLIB_XLDFLAGS='-install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
  32. ;;
  33. esac