mirror of the now-defunct rocklinux.org
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.

81 lines
4.6 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/stf/deva/libstdc++.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. --- Deva/examples/Makefile.orig 2004-08-30 00:02:12.000000000 +0200
  20. +++ Deva/examples/Makefile 2004-08-30 00:08:40.000000000 +0200
  21. @@ -12,46 +13,46 @@
  22. all: ${APS}
  23. ${DBIN}/DEVA_listTest: DEVA_listTest.o
  24. - ${CXX} ${CXXFLAG} DEVA_listTest.o -o ${DBIN}/DEVA_listTest ${LIBDIR} -ldeva_kernel
  25. + ${CXX} ${CXXFLAG} DEVA_listTest.o -o ${DBIN}/DEVA_listTest ${LIBDIR} -ldeva_kernel ${LIBSTDCXX}
  26. ${DBIN}/DEVA_dictionaryTest: DEVA_dictionaryTest.o
  27. - ${CXX} ${CXXFLAG} DEVA_dictionaryTest.o -o ${DBIN}/DEVA_dictionaryTest ${LIBDIR} -ldeva_kernel
  28. + ${CXX} ${CXXFLAG} DEVA_dictionaryTest.o -o ${DBIN}/DEVA_dictionaryTest ${LIBDIR} -ldeva_kernel ${LIBSTDCXX}
  29. ${DBIN}/DEVA_paramsTest: DEVA_paramsTest.o
  30. - ${CXX} ${CXXFLAG} DEVA_paramsTest.o -o ${DBIN}/DEVA_paramsTest ${LIBDIR} -ldeva_kernel -ldeva_comms
  31. + ${CXX} ${CXXFLAG} DEVA_paramsTest.o -o ${DBIN}/DEVA_paramsTest ${LIBDIR} -ldeva_kernel -ldeva_comms ${LIBSTDCXX}
  32. ${DBIN}/DEVA_pathTest: DEVA_pathTest.o
  33. - ${CXX} ${CXXFLAG} DEVA_pathTest.o -o ${DBIN}/DEVA_pathTest ${LIBDIR} -ldeva_kernel
  34. + ${CXX} ${CXXFLAG} DEVA_pathTest.o -o ${DBIN}/DEVA_pathTest ${LIBDIR} -ldeva_kernel ${LIBSTDCXX}
  35. ${DBIN}/DEVA_CRCtest: DEVA_CRCtest.o
  36. - ${CXX} ${CXXFLAG} DEVA_CRCtest.o -o ${DBIN}/DEVA_CRCtest ${LIBDIR} -ldeva_kernel
  37. + ${CXX} ${CXXFLAG} DEVA_CRCtest.o -o ${DBIN}/DEVA_CRCtest ${LIBDIR} -ldeva_kernel ${LIBSTDCXX}
  38. ${DBIN}/DEVA_threadListTest: DEVA_threadListTest.o
  39. - ${CXX} ${CXXFLAG} DEVA_threadListTest.o -o ${DBIN}/DEVA_threadListTest ${LIBDIR} -ldeva_kernel -lpthread
  40. + ${CXX} ${CXXFLAG} DEVA_threadListTest.o -o ${DBIN}/DEVA_threadListTest ${LIBDIR} -ldeva_kernel ${LIBSTDCXX} -lpthread
  41. ${DBIN}/DEVA_nameTest: DEVA_nameTest.o
  42. - ${CXX} ${CXXFLAG} DEVA_nameTest.o -o ${DBIN}/DEVA_nameTest ${LIBDIR} -ldeva_comms -ldeva_kernel
  43. + ${CXX} ${CXXFLAG} DEVA_nameTest.o -o ${DBIN}/DEVA_nameTest ${LIBDIR} -ldeva_comms -ldeva_kernel ${LIBSTDCXX}
  44. ${DBIN}/DEVA_msgTest: DEVA_msgTest.o
  45. - ${CXX} ${CXXFLAG} DEVA_msgTest.o -o ${DBIN}/DEVA_msgTest ${LIBDIR} -ldeva_comms -ldeva_kernel
  46. + ${CXX} ${CXXFLAG} DEVA_msgTest.o -o ${DBIN}/DEVA_msgTest ${LIBDIR} -ldeva_comms -ldeva_kernel ${LIBSTDCXX}
  47. ${DBIN}/DEVA_server: DEVA_server.o
  48. - ${CXX} ${CXXFLAG} DEVA_server.o -o ${DBIN}/DEVA_server ${LIBDIR} -ldeva_server -ldeva_comms -L${MAV_HOME}/lib -lmaverik -ldeva_kernel -lpthread ${DYNAMIC}
  49. + ${CXX} ${CXXFLAG} DEVA_server.o -o ${DBIN}/DEVA_server ${LIBDIR} -ldeva_server -ldeva_comms -L${MAV_HOME}/lib -lmaverik -ldeva_kernel ${LIBSTDCXX} -lpthread ${DYNAMIC}
  50. ${DBIN}/DEVA_client: DEVA_client.o
  51. - ${CXX} ${CXXFLAGS} DEVA_client.o -o ${DBIN}/DEVA_client ${LIBDIR} -ldeva_viewer -L${MAV_HOME}/lib -lmaverik -ldeva_client -ldeva_comms -ldeva_kernel ${DYNAMIC}
  52. + ${CXX} ${CXXFLAGS} DEVA_client.o -o ${DBIN}/DEVA_client ${LIBDIR} -ldeva_viewer -L${MAV_HOME}/lib -lmaverik -ldeva_client -ldeva_comms -ldeva_kernel ${LIBSTDCXX} ${DYNAMIC}
  53. ${DBIN}/DEVA_consoleBasic: DEVA_consoleBasic.o
  54. - ${CXX} ${CXXFLAG} DEVA_consoleBasic.o -o ${DBIN}/DEVA_consoleBasic ${LIBDIR} -ldeva_client -ldeva_comms -ldeva_kernel
  55. + ${CXX} ${CXXFLAG} DEVA_consoleBasic.o -o ${DBIN}/DEVA_consoleBasic ${LIBDIR} -ldeva_client -ldeva_comms -ldeva_kernel ${LIBSTDCXX}
  56. ${DBIN}/DEVA_console: DEVA_console.o
  57. - ${CXX} ${CXXFLAG} DEVA_console.o -o ${DBIN}/DEVA_console ${LIBDIR} -ldeva_client -ldeva_comms -ldeva_kernel -lreadline -ltermcap
  58. + ${CXX} ${CXXFLAG} DEVA_console.o -o ${DBIN}/DEVA_console ${LIBDIR} -ldeva_client -ldeva_comms -ldeva_kernel ${LIBSTDCXX} -lreadline -ltermcap
  59. ${DBIN}/DEVA_viewer: DEVA_viewer.o
  60. - ${CXX} ${CXXFLAG} DEVA_viewer.o -o ${DBIN}/DEVA_viewer ${LIBDIR} -ldeva_viewer -ldeva_client -ldeva_comms -ldeva_kernel
  61. + ${CXX} ${CXXFLAG} DEVA_viewer.o -o ${DBIN}/DEVA_viewer ${LIBDIR} -ldeva_viewer -ldeva_client -ldeva_comms -ldeva_kernel ${LIBSTDCXX}