OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

44 lines
1.5 KiB

  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../erlang-otp/wx-CXX.patch
  5. # Copyright (C) 2010 - 2011 The OpenSDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- SDE-COPYRIGHT-NOTE-END ---
  16. Description:
  17. CPP is not a good variable name to choose for defining the C++ compiler,
  18. because it is often used for the C Preprocessor (CPP).
  19. This patch is renaming the CPP variable to CXX, which should be more
  20. standard behavior.
  21. --- otp_src_R14B02/lib/wx/c_src/Makefile.in.orig 2011-04-13 00:45:33.688077834 +0200
  22. +++ otp_src_R14B02/lib/wx/c_src/Makefile.in 2011-04-13 00:46:51.568078177 +0200
  23. @@ -86,8 +86,8 @@
  24. COMMON_CFLAGS = @DEFS@ $(ERL_INCS)
  25. CC = @CC@
  26. -CPP = @CXX@
  27. -LD = $(CPP)
  28. +CXX = @CXX@
  29. +LD = $(CXX)
  30. LDFLAGS = @LDFLAGS@
  31. RESCOMP = @WX_RESCOMP@
  32. @@ -116,7 +116,7 @@
  33. GL_LIBS = @GL_LIBS@
  34. CC_O = $(CC) -c $(CFLAGS) $(WX_CFLAGS) $(COMMON_CFLAGS)
  35. -CPP_O = $(CPP) -c $(CXX_FLAGS) $(WX_CXX_FLAGS) $(COMMON_CFLAGS)
  36. +CPP_O = $(CXX) -c $(CXX_FLAGS) $(WX_CXX_FLAGS) $(COMMON_CFLAGS)
  37. # Targets