patch-configure 1.2 KB

12345678910111213141516171819202122232425262728293031323334
  1. $OpenBSD: patch-configure,v 1.1.1.1 2012/08/29 14:32:51 ajacoutot Exp $
  2. Put our CFLAGS, CXXFLAGS, CPPFLAGS and LDFLAGS at the end so that we can
  3. override optimisations...
  4. --- configure.orig Thu May 24 13:31:45 2012
  5. +++ configure Wed Aug 29 08:56:20 2012
  6. @@ -3352,10 +3352,10 @@ $as_echo "$as_me: WARNING: another compiler except for
  7. MYCFLAGS=""
  8. MYCXXFLAGS=""
  9. fi
  10. -test -n "$CFLAGS" && MYCFLAGS="$CFLAGS $MYCFLAGS"
  11. -test -n "$CXXFLAGS" && MYCXXFLAGS="$CXXFLAGS $MYCXXFLAGS"
  12. -test -n "$CPPFLAGS" && MYCPPFLAGS="$CPPFLAGS $MYCPPFLAGS"
  13. -test -n "$LDFLAGS" && MYLDFLAGS="$LDFLAGS $MYLDFLAGS"
  14. +test -n "$CFLAGS" && MYCFLAGS="$MYCFLAGS $CFLAGS"
  15. +test -n "$CXXFLAGS" && MYCXXFLAGS="$MYCXXFLAGS $CXXFLAGS"
  16. +test -n "$CPPFLAGS" && MYCPPFLAGS="$MYCPPFLAGS $CPPFLAGS"
  17. +test -n "$LDFLAGS" && MYLDFLAGS="$MYLDFLAGS $LDFLAGS"
  18. # Byte order
  19. @@ -4554,9 +4554,7 @@ then
  20. MYLIBRARYFILES="$MYLIBRARYFILES libkyotocabinet.dylib"
  21. MYLDLIBPATHENV="DYLD_LIBRARY_PATH"
  22. else
  23. - MYLIBRARYFILES="$MYLIBRARYFILES libkyotocabinet.so.$MYLIBVER.$MYLIBREV.0"
  24. - MYLIBRARYFILES="$MYLIBRARYFILES libkyotocabinet.so.$MYLIBVER"
  25. - MYLIBRARYFILES="$MYLIBRARYFILES libkyotocabinet.so"
  26. + MYLIBRARYFILES="$MYLIBRARYFILES libkyotocabinet.so.${LIBkyotocabinet_VERSION}"
  27. fi
  28. fi