001-no_cpp.patch 4.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154
  1. diff -u --recursive --new-file vips-7.42.1-vanilla/configure.ac vips-7.42.1/configure.ac
  2. --- vips-7.42.1-vanilla/configure.ac 2014-12-29 17:45:59.576995574 -0500
  3. +++ vips-7.42.1/configure.ac 2014-12-29 17:59:03.698808601 -0500
  4. @@ -264,7 +264,6 @@
  5. AC_PROG_AWK
  6. AC_PROG_CC
  7. AC_PROG_CC_STDC
  8. -AC_PROG_CXX
  9. AC_C_CONST
  10. AC_C_RESTRICT
  11. AC_PROG_RANLIB
  12. @@ -272,19 +271,6 @@
  13. AC_PROG_LN_S
  14. AM_WITH_DMALLOC
  15. -# vips_PROG_CXX_WORKS
  16. -# Check whether the C++ compiler works.
  17. -AC_DEFUN([vips_PROG_CXX_WORKS],
  18. - [AC_REQUIRE([AC_PROG_CXX])dnl
  19. - AC_CACHE_CHECK([whether the C++ compiler works],
  20. - [vips_cv_prog_cxx_works],
  21. - [AC_LANG_PUSH([C++])
  22. - AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
  23. - [vips_cv_prog_cxx_works=yes],
  24. - [vips_cv_prog_cxx_works=no])
  25. - AC_LANG_POP([C++])])
  26. -])
  27. -
  28. # option to build without C++
  29. # handy for some embedded applications
  30. # also, including C++ source causes link problems on some
  31. @@ -292,24 +278,8 @@
  32. AC_ARG_ENABLE(cxx,
  33. AS_HELP_STRING([--enable-cxx], [build C++ components (default: test)]))
  34. -if test x"$enable_cxx" != x"no"; then
  35. - vips_PROG_CXX_WORKS
  36. - if test x"$vips_cv_prog_cxx_works" = x"yes"; then
  37. - AC_DEFINE(ENABLE_CXX,1,[build C++ components])
  38. - AM_CONDITIONAL(ENABLE_CXX, true)
  39. - # need -lstdc++ for (eg.) the C++ format loaders
  40. - # this gets added to vips.pc to help mingw and friends link programs
  41. - # using libvips
  42. - if test x"$vips_needs_stdcpp" != x"no"; then
  43. - VIPS_CXX_LIBS="-lstdc++"
  44. - fi
  45. - enable_cxx=yes
  46. - fi
  47. -fi
  48. -
  49. if test x"$enable_cxx" != x"yes"; then
  50. AM_CONDITIONAL(ENABLE_CXX, false)
  51. - VIPS_CXX_LIBS=""
  52. enable_cxx=no
  53. fi
  54. @@ -817,7 +787,6 @@
  55. AC_SUBST(VIPS_CFLAGS)
  56. AC_SUBST(VIPS_INCLUDES)
  57. AC_SUBST(VIPS_LIBS)
  58. -AC_SUBST(VIPS_CXX_LIBS)
  59. AC_SUBST(PACKAGES_USED)
  60. AC_SUBST(EXTRA_LIBS_USED)
  61. @@ -850,12 +819,6 @@
  62. libvips/create/Makefile
  63. libvips/resample/Makefile
  64. libvips/video/Makefile
  65. - libvipsCC/include/Makefile
  66. - libvipsCC/include/vips/Makefile
  67. - libvipsCC/Makefile
  68. - cplusplus/include/Makefile
  69. - cplusplus/include/vips/Makefile
  70. - cplusplus/Makefile
  71. tools/Makefile
  72. tools/batch_crop
  73. tools/batch_image_convert
  74. @@ -866,7 +829,6 @@
  75. test/Makefile
  76. test/variables.sh
  77. swig/Makefile
  78. - swig/vipsCC/Makefile
  79. man/Makefile
  80. doc/Makefile
  81. doc/reference/Makefile
  82. diff -u --recursive --new-file vips-7.42.1-vanilla/libvips/Makefile.am vips-7.42.1/libvips/Makefile.am
  83. --- vips-7.42.1-vanilla/libvips/Makefile.am 2014-12-29 17:45:59.590996100 -0500
  84. +++ vips-7.42.1/libvips/Makefile.am 2014-12-29 17:59:32.053375826 -0500
  85. @@ -33,14 +33,6 @@
  86. # empty means default to C linking
  87. libvips_la_SOURCES =
  88. -# if we have C++ components enabled, make sure we link the top-level with c++
  89. -#
  90. -# sadly the if/endif isn't enough to stop automake detecting a c++ link even
  91. -# when c++ is disabled ... comment out this line if you have linking problems
  92. -if ENABLE_CXX
  93. -nodist_EXTRA_libvips_la_SOURCES = resample/dummy2.cc
  94. -endif
  95. -
  96. # DLLs need dependant libs there too ... put @VIPS_LIBS@ at the end
  97. libvips_la_LIBADD = \
  98. resample/libresample.la \
  99. diff -u --recursive --new-file vips-7.42.1-vanilla/libvips/resample/Makefile.am vips-7.42.1/libvips/resample/Makefile.am
  100. --- vips-7.42.1-vanilla/libvips/resample/Makefile.am 2014-12-29 17:45:59.591996138 -0500
  101. +++ vips-7.42.1/libvips/resample/Makefile.am 2014-12-29 18:01:57.107188019 -0500
  102. @@ -1,30 +1,3 @@
  103. -# only build the C++ stuff if ENABLE_CXX
  104. -# you'd think we could just define a couple of variables, but that seems to
  105. -# confuse libtool and make it link the library with g++
  106. -# instead, have two completely different paths
  107. -if ENABLE_CXX
  108. -
  109. -libresample_la_SOURCES = \
  110. - affine.c \
  111. - quadratic.c \
  112. - resample.c \
  113. - similarity.c \
  114. - resize.c \
  115. - presample.h \
  116. - shrink.c \
  117. - interpolate.c \
  118. - transform.c \
  119. - bicubic.cpp \
  120. - lbb.cpp \
  121. - nohalo.cpp \
  122. - vsqbs.cpp \
  123. - templates.h
  124. -
  125. -EXTRA_DIST = \
  126. - dummy2.cc
  127. -
  128. -else
  129. -
  130. libresample_la_SOURCES = \
  131. resample.c \
  132. similarity.c \
  133. @@ -36,16 +9,6 @@
  134. quadratic.c \
  135. transform.c
  136. -EXTRA_DIST = \
  137. - dummy2.cc \
  138. - bicubic.cpp \
  139. - lbb.cpp \
  140. - nohalo.cpp \
  141. - vsqbs.cpp \
  142. - templates.h
  143. -
  144. -endif
  145. -
  146. noinst_LTLIBRARIES = libresample.la
  147. AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@